From 3098a7d9536232893d990b13fdecd19fc93f44d5 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sun, 17 Jan 2021 17:18:11 +0800
Subject: [PATCH] Broadcast FriendAddEvent on acceptNewFriendRequest

---
 .../src/commonMain/kotlin/event/events/friend.kt         | 3 ++-
 mirai-core/src/commonMain/kotlin/MiraiImpl.kt            | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mirai-core-api/src/commonMain/kotlin/event/events/friend.kt b/mirai-core-api/src/commonMain/kotlin/event/events/friend.kt
index 892eb721c..bc309ce55 100644
--- a/mirai-core-api/src/commonMain/kotlin/event/events/friend.kt
+++ b/mirai-core-api/src/commonMain/kotlin/event/events/friend.kt
@@ -21,6 +21,7 @@ import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.User
 import net.mamoe.mirai.event.AbstractEvent
 import net.mamoe.mirai.internal.network.Packet
+import net.mamoe.mirai.utils.MiraiInternalApi
 import java.util.concurrent.atomic.AtomicBoolean
 
 
@@ -36,7 +37,7 @@ public data class FriendRemarkChangeEvent internal constructor(
 /**
  * 成功添加了一个新好友的事件
  */
-public data class FriendAddEvent internal constructor(
+public data class FriendAddEvent @MiraiInternalApi constructor(
     /**
      * 新好友. 已经添加到 [Bot.friends]
      */
diff --git a/mirai-core/src/commonMain/kotlin/MiraiImpl.kt b/mirai-core/src/commonMain/kotlin/MiraiImpl.kt
index a51d10c76..7e1ce6461 100644
--- a/mirai-core/src/commonMain/kotlin/MiraiImpl.kt
+++ b/mirai-core/src/commonMain/kotlin/MiraiImpl.kt
@@ -21,10 +21,7 @@ import net.mamoe.mirai.*
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.data.*
 import net.mamoe.mirai.event.broadcast
-import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent
-import net.mamoe.mirai.event.events.MemberJoinEvent
-import net.mamoe.mirai.event.events.MemberJoinRequestEvent
-import net.mamoe.mirai.event.events.NewFriendRequestEvent
+import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.internal.contact.*
 import net.mamoe.mirai.internal.message.*
 import net.mamoe.mirai.internal.network.highway.HighwayHelper
@@ -137,6 +134,10 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
             accept = true,
             blackList = false
         )
+
+        event.bot.getFriend(event.fromId)?.let { friend ->
+            FriendAddEvent(friend).broadcast()
+        }
     }
 
     override suspend fun rejectNewFriendRequest(event: NewFriendRequestEvent, blackList: Boolean) {