From df9a5f7c0a263e7956c4296364e45f5ddfcc85af Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 8 Apr 2020 14:37:33 +0800
Subject: [PATCH] Fix incorrect new contact handling

---
 .../mirai/qqandroid/QQAndroidBot.common.kt    | 19 ++++++++++---------
 .../net.mamoe.mirai/event/events/BotEvents.kt |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
index ee5e156df..a39f09a11 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
@@ -78,6 +78,7 @@ internal class QQAndroidBot constructor(
     configuration: BotConfiguration
 ) : QQAndroidBotBase(context, account, configuration) {
 
+    @OptIn(LowLevelAPI::class)
     override suspend fun acceptNewFriendRequest(event: NewFriendRequestEvent) {
         check(event.responded.compareAndSet(expect = false, update = true)) {
             "the request $this has already been responded"
@@ -89,6 +90,10 @@ internal class QQAndroidBot constructor(
                 event,
                 accept = true
             ).sendWithoutExpect()
+            bot.friends.delegate.addLast(bot._lowLevelNewQQ(object : FriendInfo {
+                override val uin: Long get() = event.fromId
+                override val nick: String get() = event.fromNick
+            }))
         }
     }
 
@@ -119,7 +124,11 @@ internal class QQAndroidBot constructor(
                 event,
                 accept = true
             ).sendWithoutExpect()
-            bot.friends.delegate.addLast(bot._lowLevelNewQQ(object : FriendInfo {
+            event.group.members.delegate.addLast(event.group.newMember(object : MemberInfo {
+                override val nameCard: String get() = ""
+                override val permission: MemberPermission get() = MemberPermission.MEMBER
+                override val specialTitle: String get() = ""
+                override val muteTimestamp: Int get() = 0
                 override val uin: Long get() = event.fromId
                 override val nick: String get() = event.fromNick
             }))
@@ -138,14 +147,6 @@ internal class QQAndroidBot constructor(
                 accept = false,
                 blackList = blackList
             ).sendWithoutExpect()
-            event.group.members.delegate.addLast(event.group.newMember(object : MemberInfo {
-                override val nameCard: String get() = ""
-                override val permission: MemberPermission get() = MemberPermission.MEMBER
-                override val specialTitle: String get() = ""
-                override val muteTimestamp: Int get() = 0
-                override val uin: Long get() = event.fromId
-                override val nick: String get() = event.fromNick
-            }))
         }
     }
 
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
index deafcc70f..7e5c728a2 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
@@ -509,7 +509,7 @@ data class NewFriendRequestEvent(
     /**
      * 群名片或好友昵称
      */
-    val nick: String
+    val fromNick: String
 ) : BotEvent, Packet {
     internal val responded: AtomicBoolean = atomic(false)