mirror of
https://github.com/whitechi73/OpenShamrock.git
synced 2024-08-14 13:12:17 +08:00
Shamrock
: fix #89
This commit is contained in:
parent
5ea260c24b
commit
1a814e565a
@ -82,9 +82,11 @@ internal object PrimitiveListener {
|
|||||||
12 -> onGroupBan(msgTime, pb)
|
12 -> onGroupBan(msgTime, pb)
|
||||||
16 -> onGroupTitleChange(msgTime, pb)
|
16 -> onGroupTitleChange(msgTime, pb)
|
||||||
17 -> {
|
17 -> {
|
||||||
|
try {
|
||||||
onGroupRecall(msgTime, pb)
|
onGroupRecall(msgTime, pb)
|
||||||
// invite
|
// invite
|
||||||
onGroupMemIncreased(msgTime, pb)
|
onGroupMemIncreased(msgTime, pb)
|
||||||
|
} finally { }
|
||||||
}
|
}
|
||||||
20 -> onGroupPoke(msgTime, pb)
|
20 -> onGroupPoke(msgTime, pb)
|
||||||
21 -> onEssenceMessage(msgTime, pb)
|
21 -> onEssenceMessage(msgTime, pb)
|
||||||
@ -337,15 +339,20 @@ internal object PrimitiveListener {
|
|||||||
// 131 passive | 130 active | 3 kick_self
|
// 131 passive | 130 active | 3 kick_self
|
||||||
|
|
||||||
val target = ContactHelper.getUinByUidAsync(targetUid).toLong()
|
val target = ContactHelper.getUinByUidAsync(targetUid).toLong()
|
||||||
LogCenter.log("群成员减少($groupCode): $target, type = $type")
|
val subtype = when(type) {
|
||||||
|
130 -> NoticeSubType.Leave
|
||||||
|
131 -> NoticeSubType.Kick
|
||||||
|
3 -> NoticeSubType.KickMe
|
||||||
|
else -> {
|
||||||
|
|
||||||
|
NoticeSubType.Kick
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
LogCenter.log("群成员减少($groupCode): $target, type = $subtype ($type)")
|
||||||
|
|
||||||
if(!GlobalEventTransmitter.GroupNoticeTransmitter
|
if(!GlobalEventTransmitter.GroupNoticeTransmitter
|
||||||
.transGroupMemberNumChanged(time, target, groupCode, operation, NoticeType.GroupMemDecrease, when(type) {
|
.transGroupMemberNumChanged(time, target, groupCode, operation, NoticeType.GroupMemDecrease, subtype)) {
|
||||||
130 -> NoticeSubType.Kick
|
|
||||||
131 -> NoticeSubType.Leave
|
|
||||||
3 -> NoticeSubType.KickMe
|
|
||||||
else -> NoticeSubType.Kick
|
|
||||||
})) {
|
|
||||||
LogCenter.log("群成员减少推送失败!", Level.WARN)
|
LogCenter.log("群成员减少推送失败!", Level.WARN)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user