Просмотр исходного кода

Move ConnectionOccupiedEvent.kt and MuteEvent.kt

Him188 6 лет назад
Родитель
Сommit
1675387cb6

+ 1 - 1
mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/ConnectionOccupiedEvent.kt

@@ -6,7 +6,7 @@ import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.discardExact
 import kotlinx.io.core.readBytes
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.event.events.ConnectionOccupiedEvent
+import net.mamoe.mirai.data.ConnectionOccupiedEvent
 import net.mamoe.mirai.utils.io.encodeToString
 
 internal object ConnectionOccupiedPacketHandler : KnownEventParserAndHandler<ConnectionOccupiedEvent>(0x0030u) {

+ 1 - 1
mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/MemberMute.kt

@@ -9,7 +9,7 @@ import kotlinx.io.core.readUInt
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.Member
-import net.mamoe.mirai.event.events.*
+import net.mamoe.mirai.data.*
 import net.mamoe.mirai.qqAccount
 import net.mamoe.mirai.utils.io.debugPrintIfFail
 import net.mamoe.mirai.utils.io.readQQ

+ 1 - 3
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/ConnectionOccupiedEvent.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/ConnectionOccupiedEvent.kt

@@ -1,6 +1,4 @@
-package net.mamoe.mirai.event.events
-
-import net.mamoe.mirai.data.EventPacket
+package net.mamoe.mirai.data
 
 /**
  * 被挤下线. 只能获取到中文的消息

+ 1 - 2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/MuteEvent.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/MuteEvent.kt

@@ -1,8 +1,7 @@
-package net.mamoe.mirai.event.events
+package net.mamoe.mirai.data
 
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.Member
-import net.mamoe.mirai.data.EventPacket
 
 
 // region mute

+ 2 - 0
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/FriendMessage.kt

@@ -23,4 +23,6 @@ class FriendMessage(
         get() = !previous
 
     override val subject: QQ get() = sender
+
+    override fun toString(): String = "FriendMessage(sender=${sender.id}, message=$message)"
 }