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

Filter out duplicated GroupTalkativeChangeEvent and relevant events with same subject. Fix #1707

Browse Source
This commit is contained in:
Him188 2021-12-21 22:55:54 +00:00
parent aa53d92fbe
commit 10af69f05e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt
View File

@ -12,6 +12,7 @@
package net.mamoe.mirai.internal.contact
import kotlinx.atomicfu.atomic
import net.mamoe.mirai.LowLevelApi
import net.mamoe.mirai.Mirai
import net.mamoe.mirai.contact.*
@ -114,6 +115,7 @@ internal class GroupImpl constructor(
override val filesRoot: RemoteFile by lazy { RemoteFileImpl(this, "/") }
override val files: RemoteFiles by lazy { RemoteFilesImpl(this) }
val lastTalkative = atomic<NormalMemberImpl?>(null)
override val announcements: Announcements by lazy {
AnnouncementsImpl(

8
mirai-core/src/commonMain/kotlin/network/notice/group/GroupNotificationProcessor.kt
View File

@ -347,8 +347,12 @@ internal class GroupNotificationProcessor(
}
// 龙王
10093L, 1053L, 1054L -> {
val now: NormalMember = grayTip.msgTemplParam["uin"]?.findMember() ?: group.botAsMember
val previous: NormalMember? = grayTip.msgTemplParam["uin_last"]?.findMember()
val now = grayTip.msgTemplParam["uin"]?.findMember() ?: group.botAsMember
val previous = grayTip.msgTemplParam["uin_last"]?.findMember()
val lastTalkative = group.lastTalkative.value
if (lastTalkative == now) return // duplicate
if (!group.lastTalkative.compareAndSet(lastTalkative, now)) return
if (previous == null) {
collect(MemberHonorChangeEvent.Achieve(now, GroupHonorType.TALKATIVE))