Rename responses

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/BotSession.kt

@@ -20,8 +20,8 @@ import net.mamoe.mirai.network.protocol.tim.handler.TemporaryPacketHandler
 import net.mamoe.mirai.network.protocol.tim.packet.OutgoingPacket
 import net.mamoe.mirai.network.protocol.tim.packet.Packet
 import net.mamoe.mirai.network.protocol.tim.packet.SessionKey
+import net.mamoe.mirai.network.protocol.tim.packet.action.FriendImageLink
 import net.mamoe.mirai.network.protocol.tim.packet.action.FriendImagePacket
-import net.mamoe.mirai.network.protocol.tim.packet.action.ImageLink
 import net.mamoe.mirai.utils.MiraiInternalAPI
 import net.mamoe.mirai.utils.getGTK
 import net.mamoe.mirai.utils.internal.PositiveNumbers
@@ -142,7 +142,7 @@ abstract class BotSessionBase(
     suspend inline fun GroupId.group(): Group = bot.getGroup(this)
     suspend inline fun GroupInternalId.group(): Group = bot.getGroup(this)
 
-    suspend fun Image.getLink(): ImageLink = FriendImagePacket.RequestImageLink(bot.qqAccount, bot.sessionKey, id).sendAndExpect()
+    suspend fun Image.getLink(): FriendImageLink = FriendImagePacket.RequestImageLink(bot.qqAccount, bot.sessionKey, id).sendAndExpect()
     suspend inline fun Image.downloadAsByteArray(): ByteArray = getLink().downloadAsByteArray()
     suspend inline fun Image.download(): ByteReadPacket = getLink().download()
 }

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/Annotations.kt

@@ -2,9 +2,6 @@
 
 package net.mamoe.mirai.network.protocol.tim.packet
 
-import net.mamoe.mirai.event.Subscribable
-import kotlin.reflect.KClass
-
 
 /**
  * 包 ID. 除特殊外, [PacketFactory] 都需要这个注解来指定包 ID.
@@ -18,18 +15,6 @@ annotation class AnnotatedId( // 注解无法在 JS 平台使用, 但现在暂
 
 inline val AnnotatedId.value: UShort get() = id.value
 
-
-/**
- * 标记这个包对应的事件.
- * 这个注解应该被标记在 [Packet] 上
- */
-@MustBeDocumented
-@Retention(AnnotationRetention.SOURCE)
-@Target(AnnotationTarget.CLASS)
-annotation class CorrespondingEvent(
-    val eventClass: KClass<out Subscribable>
-)
-
 /**
  * 包的最后一次修改时间, 和分析时使用的 TIM 版本
  */

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketId.kt

@@ -74,7 +74,7 @@ enum class KnownPacketId(override inline val value: UShort, override inline val
     inline CAN_ADD_FRIEND(0x00A7u, CanAddFriendPacket),
     inline ADD_FRIEND(0x00A8u, AddFriendPacket),
     inline REQUEST_FRIEND_ADDITION_KEY(0x00AEu, RequestFriendAdditionKeyPacket),
-    inline GROUP_IMAGE_ID(0x0388u, GroupImageIdRequestPacket),
+    inline GROUP_IMAGE_ID(0x0388u, GroupImagePacket),
     inline FRIEND_IMAGE_ID(0x0352u, FriendImagePacket),
 
     inline REQUEST_PROFILE_AVATAR(0x0031u, RequestProfileAvatarPacket),

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

@@ -15,8 +15,8 @@ import net.mamoe.mirai.event.events.BotEvent
 import net.mamoe.mirai.message.*
 import net.mamoe.mirai.message.internal.readMessageChain
 import net.mamoe.mirai.network.protocol.tim.packet.PacketVersion
+import net.mamoe.mirai.network.protocol.tim.packet.action.FriendImageLink
 import net.mamoe.mirai.network.protocol.tim.packet.action.FriendImagePacket
-import net.mamoe.mirai.network.protocol.tim.packet.action.ImageLink
 import net.mamoe.mirai.network.sessionKey
 import net.mamoe.mirai.utils.*
 import net.mamoe.mirai.utils.io.printTLVMap
@@ -88,7 +88,7 @@ abstract class MessagePacketBase<TSubject : Contact> : EventPacket, BotEvent() {
 
     // region Image download
 
-    suspend fun Image.getLink(): ImageLink = bot.withSession { FriendImagePacket.RequestImageLink(bot.qqAccount, bot.sessionKey, id).sendAndExpect() }
+    suspend fun Image.getLink(): FriendImageLink = bot.withSession { FriendImagePacket.RequestImageLink(bot.qqAccount, bot.sessionKey, id).sendAndExpect() }
     suspend inline fun Image.downloadAsByteArray(): ByteArray = getLink().downloadAsByteArray()
     suspend inline fun Image.download(): ByteReadPacket = getLink().download()
     // endregion