From 1675387cb6e7c8a33153ecc2f0fb7b5c7e901a60 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 20 Dec 2019 10:56:15 +0800
Subject: [PATCH] Move ConnectionOccupiedEvent.kt and MuteEvent.kt

---
 .../network/packet/event/ConnectionOccupiedEvent.kt           | 2 +-
 .../net.mamoe.mirai.timpc/network/packet/event/MemberMute.kt  | 2 +-
 .../{event/events => data}/ConnectionOccupiedEvent.kt         | 4 +---
 .../net.mamoe.mirai/{event/events => data}/MuteEvent.kt       | 3 +--
 .../kotlin/net.mamoe.mirai/message/FriendMessage.kt           | 2 ++
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename mirai-core/src/commonMain/kotlin/net.mamoe.mirai/{event/events => data}/ConnectionOccupiedEvent.kt (74%)
 rename mirai-core/src/commonMain/kotlin/net.mamoe.mirai/{event/events => data}/MuteEvent.kt (96%)

diff --git a/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/ConnectionOccupiedEvent.kt b/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/ConnectionOccupiedEvent.kt
index 926300147..96add44be 100644
--- a/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/ConnectionOccupiedEvent.kt
+++ b/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) {
diff --git a/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/MemberMute.kt b/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/MemberMute.kt
index cf6b840c8..6c27a6e51 100644
--- a/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/MemberMute.kt
+++ b/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
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/ConnectionOccupiedEvent.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/ConnectionOccupiedEvent.kt
similarity index 74%
rename from mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/ConnectionOccupiedEvent.kt
rename to mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/ConnectionOccupiedEvent.kt
index b82486131..a43a05140 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/ConnectionOccupiedEvent.kt
+++ b/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
 
 /**
  * 被挤下线. 只能获取到中文的消息
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/MuteEvent.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/MuteEvent.kt
similarity index 96%
rename from mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/MuteEvent.kt
rename to mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/MuteEvent.kt
index c06918963..c02d97ec1 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/MuteEvent.kt
+++ b/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
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/FriendMessage.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/FriendMessage.kt
index 43717e526..c93ecbe6b 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/FriendMessage.kt
+++ b/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)"
 }