github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-22 13:46:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicated MemberJoinEvent broadcast; fix #1090

Browse Source
This commit is contained in:
Karlatemp 2021-03-11 22:32:22 +08:00
parent 27e0f572d3
commit d4532f948c
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mirai-core/src/commonMain/kotlin/MiraiImpl.kt
View File

@ -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)