github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-09 09:50:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use MessageKey instead of MessageId

Browse Source
This commit is contained in:
Him188 2019-10-07 13:50:36 +08:00
parent 3dfe7f6e6f
commit 8ca3e6578d
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/MessageId.kt
View File

@ -1,22 +0,0 @@
package net.mamoe.mirai.message
/**
* [Message] 在数据包中的 id([UByte])
*
* Java 调用方式:
* MessageId.at
*
* @author Him188moe
*/
object MessageId {
const val AT: Int = 0x06
const val FACE: Int = 0x02
const val TEXT: Int = 0x01
const val IMAGE: Int = 0x03
const val CHAIN: Int = 0xff//仅用于 equals. Packet 中不存在 Chain 概念
}

3
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/Image.kt
View File

@ -1,7 +1,6 @@
package net.mamoe.mirai.message.defaults package net.mamoe.mirai.message.defaults
import net.mamoe.mirai.message.Message import net.mamoe.mirai.message.Message
import net.mamoe.mirai.message.MessageId
import net.mamoe.mirai.message.MessageKey import net.mamoe.mirai.message.MessageKey
import net.mamoe.mirai.network.protocol.tim.packet.* import net.mamoe.mirai.network.protocol.tim.packet.*
import net.mamoe.mirai.utils.lazyDecode import net.mamoe.mirai.utils.lazyDecode
@ -27,7 +26,7 @@ open class Image(val imageId: String) : Message() {
} }
override fun toByteArray(): ByteArray = lazyEncode { section -> override fun toByteArray(): ByteArray = lazyEncode { section ->
section.writeByte(MessageId.IMAGE) section.writeByte(intValue)
section.writeLVByteArray(lazyEncode { child -> section.writeLVByteArray(lazyEncode { child ->
child.writeByte(0x02) child.writeByte(0x02)