github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-03 00:42:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect new contact handling

Browse Source
This commit is contained in:
Him188 2020-04-08 14:37:33 +08:00
parent b4140b7871
commit df9a5f7c0a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
View File

@ -78,6 +78,7 @@ internal class QQAndroidBot constructor(
configuration: BotConfiguration configuration: BotConfiguration
) : QQAndroidBotBase(context, account, configuration) { ) : QQAndroidBotBase(context, account, configuration) {
@OptIn(LowLevelAPI::class)
override suspend fun acceptNewFriendRequest(event: NewFriendRequestEvent) { override suspend fun acceptNewFriendRequest(event: NewFriendRequestEvent) {
check(event.responded.compareAndSet(expect = false, update = true)) { check(event.responded.compareAndSet(expect = false, update = true)) {
"the request $this has already been responded" "the request $this has already been responded"
@ -89,6 +90,10 @@ internal class QQAndroidBot constructor(
event, event,
accept = true accept = true
).sendWithoutExpect() ).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, event,
accept = true accept = true
).sendWithoutExpect() ).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 uin: Long get() = event.fromId
override val nick: String get() = event.fromNick override val nick: String get() = event.fromNick
})) }))
@ -138,14 +147,6 @@ internal class QQAndroidBot constructor(
accept = false, accept = false,
blackList = blackList blackList = blackList
).sendWithoutExpect() ).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
}))
} }
} }

2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
View File

@ -509,7 +509,7 @@ data class NewFriendRequestEvent(
/** /**
* 群名片或好友昵称 * 群名片或好友昵称
*/ */
val nick: String val fromNick: String
) : BotEvent, Packet { ) : BotEvent, Packet {
internal val responded: AtomicBoolean = atomic(false) internal val responded: AtomicBoolean = atomic(false)