Commit d3ccb566 authored by Him188's avatar Him188

Alter AnnotationTarget of CorrespondingEvent to SOURCE

parent ccfb4f08
......@@ -25,7 +25,7 @@ inline val AnnotatedId.value: UShort get() = id.value
* 这个注解应该被标记在 [Packet] 上
*/
@MustBeDocumented
@Retention(AnnotationRetention.BINARY)
@Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.CLASS)
annotation class CorrespondingEvent(
val eventClass: KClass<out Subscribable>
......
......@@ -3,12 +3,12 @@
package net.mamoe.mirai.network.protocol.tim.packet.action
import kotlinx.io.core.ByteReadPacket
import kotlinx.io.core.writeFully
import kotlinx.io.core.writeUByte
import net.mamoe.mirai.network.BotNetworkHandler
import net.mamoe.mirai.network.protocol.tim.TIMProtocol
import net.mamoe.mirai.network.protocol.tim.packet.*
import net.mamoe.mirai.utils.io.encryptAndWrite
import net.mamoe.mirai.utils.io.writeHex
import net.mamoe.mirai.utils.io.writeQQ
/**
......@@ -23,7 +23,7 @@ object RequestAccountInfoPacket : SessionPacketFactory<RequestAccountInfoPacket.
sessionKey: SessionKey
): OutgoingPacket = buildOutgoingPacket {
writeQQ(qq)
writeHex(TIMProtocol.fixVer2)
writeFully(TIMProtocol.fixVer2)
encryptAndWrite(sessionKey) {
writeUByte(0x88u)
writeQQ(qq)
......
......@@ -3,6 +3,7 @@
package net.mamoe.mirai.network.protocol.tim.packet.action
import kotlinx.io.core.ByteReadPacket
import kotlinx.io.core.writeFully
import net.mamoe.mirai.contact.GroupInternalId
import net.mamoe.mirai.message.MessageChain
import net.mamoe.mirai.message.internal.toPacket
......@@ -19,7 +20,7 @@ object SendGroupMessagePacket : SessionPacketFactory<SendGroupMessagePacket.Resp
message: MessageChain
): OutgoingPacket = buildOutgoingPacket {
writeQQ(botQQ)
writeHex(TIMProtocol.fixVer2)
writeFully(TIMProtocol.fixVer2)
encryptAndWrite(sessionKey) {
writeByte(0x2A)
......@@ -32,7 +33,7 @@ object SendGroupMessagePacket : SessionPacketFactory<SendGroupMessagePacket.Resp
writeTime()
writeRandom(4)
writeHex("00 00 00 00 09 00 86")
writeHex(TIMProtocol.messageConst1)
writeFully(TIMProtocol.messageConst1)
writeZero(2)
writePacket(message.toPacket())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment