Shamrock: 修复群戳一戳丶群打卡获取的群号错误

This commit is contained in:
owo233 2023-12-04 19:42:46 +08:00
parent ec39aa7bc3
commit 003c4d4456
No known key found for this signature in database
GPG Key ID: 5D538586B03AFDAB

View File

@ -282,14 +282,11 @@ internal object PrimitiveListener {
private suspend fun onGroupPokeAndGroupSign(time: Long, pb: ProtoMap) { private suspend fun onGroupPokeAndGroupSign(time: Long, pb: ProtoMap) {
var groupCode = pb[1, 1, 1].asULong
// ntqq
var detail = pb[1, 3, 2] var detail = pb[1, 3, 2]
if (detail !is ProtoMap) { if (detail !is ProtoMap) {
try { try {
val readPacket = ByteReadPacket(detail.asByteArray) val readPacket = ByteReadPacket(detail.asByteArray)
groupCode = readPacket.readBuf32Long() readPacket.discardExact(4)
readPacket.discardExact(1) readPacket.discardExact(1)
detail = ProtoUtils.decodeFromByteArray(readPacket.readBytes(readPacket.readShort().toInt())) detail = ProtoUtils.decodeFromByteArray(readPacket.readBytes(readPacket.readShort().toInt()))
readPacket.release() readPacket.release()
@ -297,13 +294,13 @@ internal object PrimitiveListener {
LogCenter.log("onGroupPokeAndGroupSign error: ${e.stackTraceToString()}", Level.WARN) LogCenter.log("onGroupPokeAndGroupSign error: ${e.stackTraceToString()}", Level.WARN)
} }
} }
lateinit var target: String lateinit var target: String
lateinit var operation: String lateinit var operation: String
var action: String? = null var action: String? = null
var suffix: String? = null var suffix: String? = null
var actionImg: String? = null var actionImg: String? = null
var rankImg: String? = null var rankImg: String? = null
val groupCode = detail[4].asULong
detail[26][7] detail[26][7]
.asList .asList
.value .value