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

Remove unexpected default value

Browse Source
This commit is contained in:
Him188 2019-11-28 19:37:03 +08:00
parent 194a243773
commit 5ceaebca5f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/BeingKickEvent.kt
View File

@ -16,6 +16,9 @@ import net.mamoe.mirai.network.protocol.tim.packet.PacketVersion
*/
data class BeingKickEvent(val group: Group, val operator: Member) : EventPacket
/**
* 机器人被踢出去群
*/
object BeingKickEventPacketHandler : KnownEventParserAndHandler<BeingKickEvent>(0x0022u) {
//00 00 00 08 00 0A 00 04 01 00 00
// 00 36 DD C4 A0

11
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/Message.kt
View File

@ -3,6 +3,7 @@
package net.mamoe.mirai.network.protocol.tim.packet.event
import kotlinx.io.core.ByteReadPacket
import kotlinx.io.core.String
import kotlinx.io.core.discardExact
import kotlinx.io.core.readUInt
import net.mamoe.mirai.Bot
@ -32,10 +33,6 @@ import kotlin.jvm.JvmName
@UseExperimental(MiraiInternalAPI::class)
expect abstract class MessagePacket<TSubject : Contact>() : MessagePacketBase<TSubject>
interface BotExtensions {
suspend fun MessageChain.reply()
}
@MiraiInternalAPI
abstract class MessagePacketBase<TSubject : Contact> : EventPacket, BotEvent() {
internal lateinit var botVar: Bot
@ -109,7 +106,7 @@ data class GroupMessage(
*/
val permission: MemberPermission,
override val sender: QQ,
override val message: MessageChain = NullMessageChain
override val message: MessageChain
) : MessagePacket<Group>() {
override val subject: Group get() = group
@ -146,8 +143,8 @@ object GroupMessageEventParserAndHandler : KnownEventParserAndHandler<GroupMessa
}
senderName = when {
tlv.containsKey(0x01u) -> kotlinx.io.core.String(tlv.getValue(0x01u))//这个人的qq昵称
tlv.containsKey(0x02u) -> kotlinx.io.core.String(tlv.getValue(0x02u))//这个人的群名片
tlv.containsKey(0x01u) -> String(tlv.getValue(0x01u))//这个人的qq昵称
tlv.containsKey(0x02u) -> String(tlv.getValue(0x02u))//这个人的群名片
else -> {
tlv.printTLVMap("TLV(tag=18) Map")
MiraiLogger.warning("Could not determine senderName")