From 073666e9f7888fa9ce11b4698afa8999102cc0e7 Mon Sep 17 00:00:00 2001 From: Karlatemp Date: Wed, 27 Jan 2021 23:06:34 +0800 Subject: [PATCH] Correct package of StrangerList --- .../commonMain/kotlin/contact/StrangerImpl.kt | 2 +- .../network/QQAndroidBotNetworkHandler.kt | 2 +- .../network/protocol/packet/PacketFactory.kt | 3 +-- .../protocol/packet/list/StrangerList.kt | 17 +++++++++++++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt b/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt index 0a001e113..8d63d5629 100644 --- a/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt @@ -24,10 +24,10 @@ import net.mamoe.mirai.contact.Stranger import net.mamoe.mirai.data.FriendInfoImpl import net.mamoe.mirai.data.StrangerInfo import net.mamoe.mirai.internal.QQAndroidBot +import net.mamoe.mirai.internal.network.protocol.packet.list.StrangerList import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message import net.mamoe.mirai.message.data.isContentEmpty -import network.protocol.packet.list.StrangerList import kotlin.contracts.ExperimentalContracts import kotlin.contracts.contract import kotlin.coroutines.CoroutineContext diff --git a/mirai-core/src/commonMain/kotlin/network/QQAndroidBotNetworkHandler.kt b/mirai-core/src/commonMain/kotlin/network/QQAndroidBotNetworkHandler.kt index f004c7944..24cf2a890 100644 --- a/mirai-core/src/commonMain/kotlin/network/QQAndroidBotNetworkHandler.kt +++ b/mirai-core/src/commonMain/kotlin/network/QQAndroidBotNetworkHandler.kt @@ -40,6 +40,7 @@ import net.mamoe.mirai.internal.network.protocol.packet.chat.GroupInfoImpl import net.mamoe.mirai.internal.network.protocol.packet.chat.TroopManagement import net.mamoe.mirai.internal.network.protocol.packet.chat.receive.MessageSvcPbGetMsg import net.mamoe.mirai.internal.network.protocol.packet.list.FriendList +import net.mamoe.mirai.internal.network.protocol.packet.list.StrangerList import net.mamoe.mirai.internal.network.protocol.packet.login.ConfigPushSvc import net.mamoe.mirai.internal.network.protocol.packet.login.Heartbeat import net.mamoe.mirai.internal.network.protocol.packet.login.StatSvc @@ -51,7 +52,6 @@ import net.mamoe.mirai.internal.network.protocol.packet.login.wtlogin.WtLogin9 import net.mamoe.mirai.internal.utils.* import net.mamoe.mirai.network.* import net.mamoe.mirai.utils.* -import network.protocol.packet.list.StrangerList import java.util.concurrent.ConcurrentLinkedQueue import kotlin.contracts.InvocationKind import kotlin.contracts.contract diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/PacketFactory.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/PacketFactory.kt index 1173eae8e..b1b6d792f 100644 --- a/mirai-core/src/commonMain/kotlin/network/protocol/packet/PacketFactory.kt +++ b/mirai-core/src/commonMain/kotlin/network/protocol/packet/PacketFactory.kt @@ -13,7 +13,6 @@ import kotlinx.io.core.* import net.mamoe.mirai.event.Event import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.network.Packet -import net.mamoe.mirai.internal.network.protocol.data.proto.Oidb0xeac import net.mamoe.mirai.internal.network.protocol.packet.chat.* import net.mamoe.mirai.internal.network.protocol.packet.chat.image.ImgStore import net.mamoe.mirai.internal.network.protocol.packet.chat.image.LongConn @@ -21,6 +20,7 @@ import net.mamoe.mirai.internal.network.protocol.packet.chat.receive.* import net.mamoe.mirai.internal.network.protocol.packet.chat.voice.PttStore import net.mamoe.mirai.internal.network.protocol.packet.list.FriendList import net.mamoe.mirai.internal.network.protocol.packet.list.ProfileService +import net.mamoe.mirai.internal.network.protocol.packet.list.StrangerList import net.mamoe.mirai.internal.network.protocol.packet.login.ConfigPushSvc import net.mamoe.mirai.internal.network.protocol.packet.login.Heartbeat import net.mamoe.mirai.internal.network.protocol.packet.login.StatSvc @@ -31,7 +31,6 @@ import net.mamoe.mirai.internal.network.tryDecryptOrNull import net.mamoe.mirai.internal.utils.crypto.TEA import net.mamoe.mirai.internal.utils.crypto.adjustToPublicKey import net.mamoe.mirai.utils.* -import network.protocol.packet.list.StrangerList internal sealed class PacketFactory { /** diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/list/StrangerList.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/list/StrangerList.kt index 9cf5c836d..3e43fe8fc 100644 --- a/mirai-core/src/commonMain/kotlin/network/protocol/packet/list/StrangerList.kt +++ b/mirai-core/src/commonMain/kotlin/network/protocol/packet/list/StrangerList.kt @@ -1,4 +1,13 @@ -package network.protocol.packet.list; +/* + * Copyright 2019-2021 Mamoe Technologies and contributors. + * + * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. + * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. + * + * https://github.com/mamoe/mirai/blob/master/LICENSE + */ + +package net.mamoe.mirai.internal.network.protocol.packet.list import kotlinx.io.core.ByteReadPacket import net.mamoe.mirai.contact.Stranger @@ -21,7 +30,11 @@ import net.mamoe.mirai.internal.utils.io.serialization.writeProtoBuf internal class StrangerList { object GetStrangerList : OutgoingPacketFactory("OidbSvc.0x5d2_0") { - class Response(val result: Int, val strangerList: List) : Packet + class Response(val result: Int, val strangerList: List) : Packet { + override fun toString(): String { + return "StrangerList.GetStrangerList(result=$result)" + } + } operator fun invoke( client: QQAndroidClient,