shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: グループイベントが正しく通知されない問題

Browse Source
This commit is contained in:
ikechan8370 2023-11-17 16:02:27 +08:00
parent f2dc3bc9fd
commit bd28b0f7f7
1 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/PrimitiveListener.kt
View File

@ -47,11 +47,14 @@ internal object PrimitiveListener {
if ( if (
!pb.has(1, 3) !pb.has(1, 3)
|| !pb.has(1, 2) || !pb.has(1, 2)
|| !pb.has(1, 2, 2) // || !pb.has(1, 2, 2)
|| !pb.has(1, 2, 6) || !pb.has(1, 2, 6)
) return ) return
val msgType = pb[1, 2, 1].asInt val msgType = pb[1, 2, 1].asInt
val subType = pb[1, 2, 2].asInt var subType = 0
if (pb.has(1, 2, 3)) {
subType = pb[1, 2, 2].asInt
}
val msgTime = pb[1, 2, 6].asLong val msgTime = pb[1, 2, 6].asLong
when(msgType) { when(msgType) {
33 -> onGroupMemIncreased(msgTime, pb) 33 -> onGroupMemIncreased(msgTime, pb)
@ -63,7 +66,11 @@ internal object PrimitiveListener {
} }
732 -> when(subType) { 732 -> when(subType) {
12 -> onGroupBan(msgTime, pb) 12 -> onGroupBan(msgTime, pb)
17 -> onGroupRecall(msgTime, pb) 17 -> {
onGroupRecall(msgTime, pb)
// invite
onGroupMemIncreased(msgTime, pb)
}
20 -> onGroupPoke(msgTime, pb) 20 -> onGroupPoke(msgTime, pb)
} }
} }
@ -155,21 +162,47 @@ internal object PrimitiveListener {
} }
private suspend fun onGroupMemIncreased(time: Long, pb: ProtoMap) { private suspend fun onGroupMemIncreased(time: Long, pb: ProtoMap) {
val groupCode = pb[1, 3, 2, 1].asULong when(pb[1, 2, 1].asInt) {
val targetUid = pb[1, 3, 2, 3].asUtf8String 732 -> {
val type = pb[1, 3, 2, 4].asInt // invite
val operation = ContactHelper.getUinByUidAsync(pb[1, 3, 2, 5].asUtf8String).toLong() val groupCode = pb[1, 3, 2, 4].asULong
val target = ContactHelper.getUinByUidAsync(targetUid).toLong() lateinit var target: String
lateinit var operation: String
pb[1, 3, 2, 26, 7].asList
.value
.forEach {
val value = it[2].asUtf8String
when (it[1].asUtf8String) {
"invitee" -> operation = value
"invitor" -> target = value
}
}
val type = 131
LogCenter.log("群成员增加($groupCode): $target, type = $type")
LogCenter.log("群成员增加($groupCode): $target, type = $type") if(!GlobalEventTransmitter.GroupNoticeTransmitter
.transGroupMemberNumChanged(time, target.toLong(), groupCode, operation.toLong(), NoticeType.GroupMemIncrease, NoticeSubType.Invite)) {
LogCenter.log("群成员增加推送失败！", Level.WARN)
}
}
33 -> {
// approve
val groupCode = pb[1, 3, 2, 1].asULong
val targetUid = pb[1, 3, 2, 3].asUtf8String
val type = pb[1, 3, 2, 4].asInt
val operation = ContactHelper.getUinByUidAsync(pb[1, 3, 2, 5].asUtf8String).toLong()
val target = ContactHelper.getUinByUidAsync(targetUid).toLong()
LogCenter.log("群成员增加($groupCode): $target, type = $type")
if(!GlobalEventTransmitter.GroupNoticeTransmitter if(!GlobalEventTransmitter.GroupNoticeTransmitter
.transGroupMemberNumChanged(time, target, groupCode, operation, NoticeType.GroupMemIncrease, when(type) { .transGroupMemberNumChanged(time, target, groupCode, operation, NoticeType.GroupMemIncrease, when(type) {
130 -> NoticeSubType.Approve 130 -> NoticeSubType.Approve
131 -> NoticeSubType.Invite 131 -> NoticeSubType.Invite
else -> NoticeSubType.Approve else -> NoticeSubType.Approve
})) { })) {
LogCenter.log("群成员增加推送失败！", Level.WARN) LogCenter.log("群成员增加推送失败！", Level.WARN)
}
}
} }
} }