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

Fix #263

Browse Source
This commit is contained in:
Him188 2020-04-24 16:45:45 +08:00
parent 09524da1e9
commit c8e20800a0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
View File

@ -83,8 +83,7 @@ internal class OnlinePush {
val name = extraInfo?.groupCard?.run { val name = extraInfo?.groupCard?.run {
kotlin.runCatching { kotlin.runCatching {
if (this[0] == 0x0A.toByte()) if (this[0] == 0x0A.toByte())
loadAs(Oidb0x8fc.CommCardNameBuf.serializer()).richCardName?.firstOrNull { it.text.isNotEmpty() } loadAs(Oidb0x8fc.CommCardNameBuf.serializer()).richCardName?.joinToString("") { it.text.encodeToString() }
?.text?.encodeToString()
else return@runCatching null else return@runCatching null
}.getOrNull() ?: encodeToString() }.getOrNull() ?: encodeToString()
} ?: pbPushMsg.msg.msgHead.groupInfo.groupCard // 没有 extraInfo 就从 head 里取 } ?: pbPushMsg.msg.msgHead.groupInfo.groupCard // 没有 extraInfo 就从 head 里取
@ -105,8 +104,8 @@ internal class OnlinePush {
flags and 8 != 0 -> MemberPermission.OWNER flags and 8 != 0 -> MemberPermission.OWNER
flags == 0 -> MemberPermission.MEMBER flags == 0 -> MemberPermission.MEMBER
else -> { else -> {
bot.logger.warning("判断群员权限失败: ${pbPushMsg.msg.msgHead._miraiContentToString()}. 请完整截图或复制此日志发送给 mirai 维护者以帮助解决问题.") bot.logger.warning("判断群 ${sender.group.id} 的群员 ${sender.id} 的权限失败: ${pbPushMsg.msg.msgHead._miraiContentToString()}. 请完整截图或复制此日志并确认其真实权限后发送给 mirai 维护者以帮助解决问题.")
MemberPermission.MEMBER sender.permission
} }
}, },
time = pbPushMsg.msg.msgHead.msgTime time = pbPushMsg.msg.msgHead.msgTime