Rename MessageEventPacket to MessagePacket

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/MessageSubscribers.kt

@@ -7,16 +7,16 @@ import net.mamoe.mirai.message.Message
 import net.mamoe.mirai.message.any
 import net.mamoe.mirai.network.protocol.tim.packet.event.FriendMessage
 import net.mamoe.mirai.network.protocol.tim.packet.event.GroupMessage
-import net.mamoe.mirai.network.protocol.tim.packet.event.MessageEventPacket
+import net.mamoe.mirai.network.protocol.tim.packet.event.MessagePacket
 import kotlin.jvm.JvmName
 
 /**
  * 订阅来自所有 [Bot] 的所有联系人的消息事件. 联系人可以是任意群或任意好友或临时会话.
  */
 @MessageDsl
-suspend inline fun subscribeMessages(crossinline listeners: suspend MessageSubscribersBuilder<MessageEventPacket<*>>.() -> Unit) {
-    MessageSubscribersBuilder<MessageEventPacket<*>> { listener ->
-        subscribeAlways<MessageEventPacket<*>> {
+suspend inline fun subscribeMessages(crossinline listeners: suspend MessageSubscribersBuilder<MessagePacket<*>>.() -> Unit) {
+    MessageSubscribersBuilder<MessagePacket<*>> { listener ->
+        subscribeAlways<MessagePacket<*>> {
             listener(it)
         }
     }.apply { listeners() }
@@ -50,9 +50,9 @@ suspend inline fun subscribeFriendMessages(crossinline listeners: suspend Messag
  * 订阅来自这个 [Bot] 的所有联系人的消息事件. 联系人可以是任意群或任意好友或临时会话.
  */
 @MessageDsl
-suspend inline fun Bot.subscribeMessages(crossinline listeners: suspend MessageSubscribersBuilder<MessageEventPacket<*>>.() -> Unit) {
-    MessageSubscribersBuilder<MessageEventPacket<*>> { listener ->
-        this.subscribeAlways<MessageEventPacket<*>> {
+suspend inline fun Bot.subscribeMessages(crossinline listeners: suspend MessageSubscribersBuilder<MessagePacket<*>>.() -> Unit) {
+    MessageSubscribersBuilder<MessagePacket<*>> { listener ->
+        this.subscribeAlways<MessagePacket<*>> {
             listener(it)
         }
     }.apply { listeners() }
@@ -86,11 +86,11 @@ internal typealias MessageReplier<T> = @MessageDsl suspend T.(String) -> Message
 
 internal typealias StringReplier<T> = @MessageDsl suspend T.(String) -> String
 
-internal suspend inline operator fun <T : MessageEventPacket<*>> (@MessageDsl suspend T.(String) -> Unit).invoke(t: T) =
+internal suspend inline operator fun <T : MessagePacket<*>> (@MessageDsl suspend T.(String) -> Unit).invoke(t: T) =
     this.invoke(t, t.message.stringValue)
 
 @JvmName("invoke1") //Avoid Platform declaration clash
-internal suspend inline operator fun <T : MessageEventPacket<*>> StringReplier<T>.invoke(t: T): String =
+internal suspend inline operator fun <T : MessagePacket<*>> StringReplier<T>.invoke(t: T): String =
     this.invoke(t, t.message.stringValue)
 
 /**
@@ -101,7 +101,7 @@ internal suspend inline operator fun <T : MessageEventPacket<*>> StringReplier<T
  */
 @Suppress("unused")
 @MessageDsl
-class MessageSubscribersBuilder<T : MessageEventPacket<*>>(
+class MessageSubscribersBuilder<T : MessagePacket<*>>(
     inline val subscriber: suspend (@MessageDsl suspend T.(String) -> Unit) -> Unit
 ) {
     /**

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

@@ -51,7 +51,7 @@ object EventPacketFactory : PacketFactory<Packet, SessionKey>(SessionKey) {
         discardExact(2)
 
         return with(matchEventPacketFactory(readUShort())) { parse(handler.bot, eventIdentity) }.also {
-            if (it is MessageEventPacket<*>) {
+            if (it is MessagePacket<*>) {
                 it.botVar = handler.bot
             }
 

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

@@ -25,7 +25,7 @@ import net.mamoe.mirai.utils.io.readUShortLVByteArray
 import net.mamoe.mirai.utils.sendTo
 import net.mamoe.mirai.utils.upload
 
-sealed class MessageEventPacket<TSubject : Contact> : EventPacket, BotEvent() {
+sealed class MessagePacket<TSubject : Contact> : EventPacket, BotEvent() {
     internal lateinit var botVar: Bot
 
     override val bot: Bot get() = botVar
@@ -82,7 +82,7 @@ data class GroupMessage(
     val permission: MemberPermission,
     override val sender: QQ,
     override val message: MessageChain = NullMessageChain
-) : MessageEventPacket<Group>() {
+) : MessagePacket<Group>() {
     override val subject: Group get() = group
 }
 
@@ -143,7 +143,7 @@ data class FriendMessage(
     val isPrevious: Boolean,
     override val sender: QQ,
     override val message: MessageChain
-) : MessageEventPacket<QQ>() {
+) : MessagePacket<QQ>() {
     override val subject: QQ get() = sender
 }