From d4532f948ca01537421424ac16919acb37db3556 Mon Sep 17 00:00:00 2001 From: Karlatemp Date: Thu, 11 Mar 2021 22:32:22 +0800 Subject: [PATCH] Fix duplicated MemberJoinEvent broadcast; fix #1090 --- mirai-core/src/commonMain/kotlin/MiraiImpl.kt | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/mirai-core/src/commonMain/kotlin/MiraiImpl.kt b/mirai-core/src/commonMain/kotlin/MiraiImpl.kt index 6bec0d825..e6af9a0e5 100644 --- a/mirai-core/src/commonMain/kotlin/MiraiImpl.kt +++ b/mirai-core/src/commonMain/kotlin/MiraiImpl.kt @@ -195,14 +195,6 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor { accept = true, blackList = false ) - - event.group?.getMember(event.fromId)?.let { member -> - if (event.invitor != null) { - MemberJoinEvent.Invite(member, event.invitor!!) - } else { - MemberJoinEvent.Active(member) - }.broadcastWithBot(event.bot) - } } @Suppress("DuplicatedCode") @@ -849,20 +841,7 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor { message = message ).sendWithoutExpect() } - - if (accept ?: return@run) - groups[groupId]?.run { - members.delegate.add( - newMember( - MemberInfoImpl( - uin = fromId, - nick = fromNick, - permission = MemberPermission.MEMBER, - "", "", "", 0, null - ) - ).cast() - ) - } + // Add member in MsgOnlinePush.PbPushMsg } @OptIn(ExperimentalStdlibApi::class)