diff --git a/mirai-core/src/commonMain/kotlin/MiraiImpl.kt b/mirai-core/src/commonMain/kotlin/MiraiImpl.kt index a27671144..bcc4b81c0 100644 --- a/mirai-core/src/commonMain/kotlin/MiraiImpl.kt +++ b/mirai-core/src/commonMain/kotlin/MiraiImpl.kt @@ -35,6 +35,10 @@ import net.mamoe.mirai.internal.event.EventChannelToEventDispatcherAdapter import net.mamoe.mirai.internal.event.InternalEventMechanism import net.mamoe.mirai.internal.message.* import net.mamoe.mirai.internal.message.DeepMessageRefiner.refineDeep +import net.mamoe.mirai.internal.message.image.* +import net.mamoe.mirai.internal.message.image.OfflineGroupImage +import net.mamoe.mirai.internal.message.image.OnlineFriendImageImpl +import net.mamoe.mirai.internal.message.image.OnlineGroupImageImpl import net.mamoe.mirai.internal.message.source.* import net.mamoe.mirai.internal.message.source.OnlineMessageSourceFromFriendImpl import net.mamoe.mirai.internal.message.source.OnlineMessageSourceFromGroupImpl diff --git a/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt b/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt index ddff7060e..fc1e6c0c3 100644 --- a/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt +++ b/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt @@ -18,7 +18,9 @@ import net.mamoe.mirai.data.UserInfo import net.mamoe.mirai.event.broadcast import net.mamoe.mirai.event.events.* import net.mamoe.mirai.internal.QQAndroidBot -import net.mamoe.mirai.internal.message.* +import net.mamoe.mirai.internal.message.MiraiInternalMessageFlag +import net.mamoe.mirai.internal.message.contextualBugReportException +import net.mamoe.mirai.internal.message.image.* import net.mamoe.mirai.internal.network.components.BdhSession import net.mamoe.mirai.internal.network.highway.ChannelKind import net.mamoe.mirai.internal.network.highway.Highway diff --git a/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt b/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt index 8120a99bb..3a324215e 100644 --- a/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt @@ -26,7 +26,13 @@ import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.contact.announcement.AnnouncementsImpl import net.mamoe.mirai.internal.contact.file.RemoteFilesImpl import net.mamoe.mirai.internal.contact.info.MemberInfoImpl -import net.mamoe.mirai.internal.message.* +import net.mamoe.mirai.internal.message.MiraiInternalMessageFlag +import net.mamoe.mirai.internal.message.OfflineAudioImpl +import net.mamoe.mirai.internal.message.contextualBugReportException +import net.mamoe.mirai.internal.message.image.OfflineGroupImage +import net.mamoe.mirai.internal.message.image.calculateImageInfo +import net.mamoe.mirai.internal.message.image.getIdByImageType +import net.mamoe.mirai.internal.message.image.getImageTypeById import net.mamoe.mirai.internal.network.components.BdhSession import net.mamoe.mirai.internal.network.handler.logger import net.mamoe.mirai.internal.network.highway.ChannelKind diff --git a/mirai-core/src/commonMain/kotlin/contact/NormalMemberImpl.kt b/mirai-core/src/commonMain/kotlin/contact/NormalMemberImpl.kt index 3cc1ea58e..b30d5f574 100644 --- a/mirai-core/src/commonMain/kotlin/contact/NormalMemberImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/NormalMemberImpl.kt @@ -19,8 +19,8 @@ import net.mamoe.mirai.contact.* import net.mamoe.mirai.data.MemberInfo import net.mamoe.mirai.event.broadcast import net.mamoe.mirai.event.events.* -import net.mamoe.mirai.internal.message.createMessageReceipt import net.mamoe.mirai.internal.message.source.OnlineMessageSourceToTempImpl +import net.mamoe.mirai.internal.message.source.createMessageReceipt import net.mamoe.mirai.internal.network.protocol.packet.chat.TroopManagement import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message diff --git a/mirai-core/src/commonMain/kotlin/contact/SendMessageHandler.kt b/mirai-core/src/commonMain/kotlin/contact/SendMessageHandler.kt index a7c0eab43..914fdf71f 100644 --- a/mirai-core/src/commonMain/kotlin/contact/SendMessageHandler.kt +++ b/mirai-core/src/commonMain/kotlin/contact/SendMessageHandler.kt @@ -20,8 +20,12 @@ import net.mamoe.mirai.event.nextEvent import net.mamoe.mirai.internal.asQQAndroidBot import net.mamoe.mirai.internal.getMiraiImpl import net.mamoe.mirai.internal.message.* +import net.mamoe.mirai.internal.message.image.FriendImage +import net.mamoe.mirai.internal.message.image.OfflineGroupImage import net.mamoe.mirai.internal.message.source.OnlineMessageSourceToFriendImpl import net.mamoe.mirai.internal.message.source.OnlineMessageSourceToGroupImpl +import net.mamoe.mirai.internal.message.source.createMessageReceipt +import net.mamoe.mirai.internal.message.source.ensureSequenceIdAvailable import net.mamoe.mirai.internal.network.Packet import net.mamoe.mirai.internal.network.QQAndroidClient import net.mamoe.mirai.internal.network.components.ClockHolder.Companion.clock diff --git a/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt b/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt index a5e9dea93..acc58327e 100644 --- a/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt @@ -25,8 +25,8 @@ import net.mamoe.mirai.data.StrangerInfo import net.mamoe.mirai.event.events.StrangerMessagePostSendEvent import net.mamoe.mirai.event.events.StrangerMessagePreSendEvent import net.mamoe.mirai.internal.QQAndroidBot -import net.mamoe.mirai.internal.message.createMessageReceipt import net.mamoe.mirai.internal.message.source.OnlineMessageSourceToStrangerImpl +import net.mamoe.mirai.internal.message.source.createMessageReceipt import net.mamoe.mirai.internal.network.protocol.packet.list.StrangerList import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message diff --git a/mirai-core/src/commonMain/kotlin/message/MultiMsgUploader.kt b/mirai-core/src/commonMain/kotlin/message/MultiMsgUploader.kt index c90075b8c..4f6b5fc4e 100644 --- a/mirai-core/src/commonMain/kotlin/message/MultiMsgUploader.kt +++ b/mirai-core/src/commonMain/kotlin/message/MultiMsgUploader.kt @@ -12,6 +12,7 @@ package net.mamoe.mirai.internal.message import io.ktor.utils.io.core.* import net.mamoe.mirai.internal.contact.SendMessageHandler import net.mamoe.mirai.internal.contact.takeSingleContent +import net.mamoe.mirai.internal.message.source.MessageSourceInternal import net.mamoe.mirai.internal.network.QQAndroidClient import net.mamoe.mirai.internal.network.highway.Highway import net.mamoe.mirai.internal.network.highway.ResourceKind diff --git a/mirai-core/src/commonMain/kotlin/message/ReceiveMessageHandler.kt b/mirai-core/src/commonMain/kotlin/message/ReceiveMessageHandler.kt index db01953f2..2b43ce3df 100644 --- a/mirai-core/src/commonMain/kotlin/message/ReceiveMessageHandler.kt +++ b/mirai-core/src/commonMain/kotlin/message/ReceiveMessageHandler.kt @@ -19,6 +19,8 @@ import net.mamoe.mirai.internal.message.LightMessageRefiner.refineLight import net.mamoe.mirai.internal.message.ReceiveMessageTransformer.cleanupRubbishMessageElements import net.mamoe.mirai.internal.message.ReceiveMessageTransformer.joinToMessageChain import net.mamoe.mirai.internal.message.ReceiveMessageTransformer.toAudio +import net.mamoe.mirai.internal.message.image.OnlineFriendImageImpl +import net.mamoe.mirai.internal.message.image.OnlineGroupImageImpl import net.mamoe.mirai.internal.message.source.* import net.mamoe.mirai.internal.network.protocol.data.proto.* import net.mamoe.mirai.internal.utils.io.serialization.loadAs diff --git a/mirai-core/src/commonMain/kotlin/message/RefinableMessage.kt b/mirai-core/src/commonMain/kotlin/message/RefinableMessage.kt index 5f974f4b9..d72c13416 100644 --- a/mirai-core/src/commonMain/kotlin/message/RefinableMessage.kt +++ b/mirai-core/src/commonMain/kotlin/message/RefinableMessage.kt @@ -1,10 +1,10 @@ /* - * Copyright 2019-2021 Mamoe Technologies and contributors. + * Copyright 2019-2022 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. + * 此源代码的使用受 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 + * https://github.com/mamoe/mirai/blob/dev/LICENSE */ package net.mamoe.mirai.internal.message @@ -13,6 +13,8 @@ import net.mamoe.mirai.Bot import net.mamoe.mirai.internal.message.DeepMessageRefiner.refineDeep import net.mamoe.mirai.internal.message.LightMessageRefiner.refineLight import net.mamoe.mirai.internal.message.LightMessageRefiner.refineMessageSource +import net.mamoe.mirai.internal.message.flags.InternalFlagOnlyMessage +import net.mamoe.mirai.internal.message.source.IncomingMessageSourceInternal import net.mamoe.mirai.message.data.* import net.mamoe.mirai.utils.safeCast diff --git a/mirai-core/src/commonMain/kotlin/message/ImageDecoder.kt b/mirai-core/src/commonMain/kotlin/message/image/ImageDecoder.kt similarity index 97% rename from mirai-core/src/commonMain/kotlin/message/ImageDecoder.kt rename to mirai-core/src/commonMain/kotlin/message/image/ImageDecoder.kt index 513815153..a0a84e5a0 100644 --- a/mirai-core/src/commonMain/kotlin/message/ImageDecoder.kt +++ b/mirai-core/src/commonMain/kotlin/message/image/ImageDecoder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 Mamoe Technologies and contributors. + * Copyright 2019-2022 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. @@ -7,7 +7,7 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -package net.mamoe.mirai.internal.message +package net.mamoe.mirai.internal.message.image import kotlinx.io.core.* import kotlinx.io.streams.asInput diff --git a/mirai-core/src/commonMain/kotlin/message/InternalImageProtocolImpl.kt b/mirai-core/src/commonMain/kotlin/message/image/InternalImageProtocolImpl.kt similarity index 99% rename from mirai-core/src/commonMain/kotlin/message/InternalImageProtocolImpl.kt rename to mirai-core/src/commonMain/kotlin/message/image/InternalImageProtocolImpl.kt index e97db1384..d5d517460 100644 --- a/mirai-core/src/commonMain/kotlin/message/InternalImageProtocolImpl.kt +++ b/mirai-core/src/commonMain/kotlin/message/image/InternalImageProtocolImpl.kt @@ -7,7 +7,7 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -package net.mamoe.mirai.internal.message +package net.mamoe.mirai.internal.message.image import net.mamoe.mirai.Bot import net.mamoe.mirai.contact.Contact diff --git a/mirai-core/src/commonMain/kotlin/message/imagesImpl.kt b/mirai-core/src/commonMain/kotlin/message/image/imagesImpl.kt similarity index 99% rename from mirai-core/src/commonMain/kotlin/message/imagesImpl.kt rename to mirai-core/src/commonMain/kotlin/message/image/imagesImpl.kt index 02f9d89c9..5accd58c7 100644 --- a/mirai-core/src/commonMain/kotlin/message/imagesImpl.kt +++ b/mirai-core/src/commonMain/kotlin/message/image/imagesImpl.kt @@ -9,7 +9,7 @@ @file:Suppress("DEPRECATION_ERROR") -package net.mamoe.mirai.internal.message +package net.mamoe.mirai.internal.message.image import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable @@ -20,6 +20,7 @@ import net.mamoe.mirai.contact.Contact.Companion.uploadImage import net.mamoe.mirai.contact.ContactOrBot import net.mamoe.mirai.contact.Group import net.mamoe.mirai.contact.User +import net.mamoe.mirai.internal.message.contextualBugReportException import net.mamoe.mirai.internal.network.protocol.data.proto.* import net.mamoe.mirai.internal.utils.io.serialization.loadAs import net.mamoe.mirai.internal.utils.io.serialization.toByteArray diff --git a/mirai-core/src/commonMain/kotlin/message/messageToElems.kt b/mirai-core/src/commonMain/kotlin/message/messageToElems.kt index b46cdfd46..36260ea9b 100644 --- a/mirai-core/src/commonMain/kotlin/message/messageToElems.kt +++ b/mirai-core/src/commonMain/kotlin/message/messageToElems.kt @@ -14,6 +14,8 @@ import net.mamoe.mirai.contact.AnonymousMember import net.mamoe.mirai.contact.ContactOrBot import net.mamoe.mirai.contact.Group import net.mamoe.mirai.contact.User +import net.mamoe.mirai.internal.message.image.* +import net.mamoe.mirai.internal.message.source.MessageSourceInternal import net.mamoe.mirai.internal.network.protocol.data.proto.HummerCommelem import net.mamoe.mirai.internal.network.protocol.data.proto.ImMsgBody import net.mamoe.mirai.internal.utils.io.serialization.toByteArray diff --git a/mirai-core/src/commonMain/kotlin/message/MessageSourceInternal.kt b/mirai-core/src/commonMain/kotlin/message/source/MessageSourceInternal.kt similarity index 96% rename from mirai-core/src/commonMain/kotlin/message/MessageSourceInternal.kt rename to mirai-core/src/commonMain/kotlin/message/source/MessageSourceInternal.kt index cc6917d74..f6fd4313e 100644 --- a/mirai-core/src/commonMain/kotlin/message/MessageSourceInternal.kt +++ b/mirai-core/src/commonMain/kotlin/message/source/MessageSourceInternal.kt @@ -7,14 +7,13 @@ * https://github.com/mamoe/mirai/blob/master/LICENSE */ -package net.mamoe.mirai.internal.message +package net.mamoe.mirai.internal.message.source import kotlinx.serialization.Transient import net.mamoe.mirai.contact.Contact import net.mamoe.mirai.internal.contact.SendMessageHandler import net.mamoe.mirai.internal.message.LightMessageRefiner.dropMiraiInternalFlags import net.mamoe.mirai.internal.message.LightMessageRefiner.refineLight -import net.mamoe.mirai.internal.message.source.OnlineMessageSourceToGroupImpl import net.mamoe.mirai.internal.message.visitor.ex import net.mamoe.mirai.internal.network.protocol.data.proto.ImMsgBody import net.mamoe.mirai.message.MessageReceipt diff --git a/mirai-core/src/commonMain/kotlin/message/source/incomingSourceImpl.kt b/mirai-core/src/commonMain/kotlin/message/source/incomingSourceImpl.kt index 3e02d7162..88c03e03d 100644 --- a/mirai-core/src/commonMain/kotlin/message/source/incomingSourceImpl.kt +++ b/mirai-core/src/commonMain/kotlin/message/source/incomingSourceImpl.kt @@ -22,7 +22,6 @@ import net.mamoe.mirai.internal.contact.GroupImpl import net.mamoe.mirai.internal.contact.checkIsGroupImpl import net.mamoe.mirai.internal.contact.newAnonymous import net.mamoe.mirai.internal.getGroupByUinOrCodeOrFail -import net.mamoe.mirai.internal.message.IncomingMessageSourceInternal import net.mamoe.mirai.internal.message.MessageSourceSerializerImpl import net.mamoe.mirai.internal.message.toMessageChainNoSource import net.mamoe.mirai.internal.network.protocol.data.proto.ImMsgBody diff --git a/mirai-core/src/commonMain/kotlin/message/source/offlineSourceImpl.kt b/mirai-core/src/commonMain/kotlin/message/source/offlineSourceImpl.kt index 31e173a50..ce8f9e2b3 100644 --- a/mirai-core/src/commonMain/kotlin/message/source/offlineSourceImpl.kt +++ b/mirai-core/src/commonMain/kotlin/message/source/offlineSourceImpl.kt @@ -13,7 +13,6 @@ package net.mamoe.mirai.internal.message.source import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import net.mamoe.mirai.Bot -import net.mamoe.mirai.internal.message.MessageSourceInternal import net.mamoe.mirai.internal.message.MessageSourceSerializerImpl import net.mamoe.mirai.internal.message.toMessageChainNoSource import net.mamoe.mirai.internal.message.toRichTextElems diff --git a/mirai-core/src/commonMain/kotlin/message/source/outgoingSourceImpl.kt b/mirai-core/src/commonMain/kotlin/message/source/outgoingSourceImpl.kt index c4da8df82..b4f8b1d36 100644 --- a/mirai-core/src/commonMain/kotlin/message/source/outgoingSourceImpl.kt +++ b/mirai-core/src/commonMain/kotlin/message/source/outgoingSourceImpl.kt @@ -19,9 +19,7 @@ import net.mamoe.mirai.event.EventPriority import net.mamoe.mirai.event.GlobalEventChannel import net.mamoe.mirai.event.syncFromEvent import net.mamoe.mirai.internal.contact.uin -import net.mamoe.mirai.internal.message.MessageSourceInternal import net.mamoe.mirai.internal.message.MessageSourceSerializerImpl -import net.mamoe.mirai.internal.message.OutgoingMessageSourceInternal import net.mamoe.mirai.internal.message.toRichTextElems import net.mamoe.mirai.internal.network.notice.group.GroupMessageProcessor.SendGroupMessageReceipt import net.mamoe.mirai.internal.network.protocol.data.proto.ImMsgBody diff --git a/mirai-core/src/commonMain/kotlin/message/visitor/MessageVisitorEx.kt b/mirai-core/src/commonMain/kotlin/message/visitor/MessageVisitorEx.kt index 76d54b5f7..c07690873 100644 --- a/mirai-core/src/commonMain/kotlin/message/visitor/MessageVisitorEx.kt +++ b/mirai-core/src/commonMain/kotlin/message/visitor/MessageVisitorEx.kt @@ -11,6 +11,8 @@ package net.mamoe.mirai.internal.message.visitor import net.mamoe.mirai.internal.message.* +import net.mamoe.mirai.internal.message.flags.* +import net.mamoe.mirai.internal.message.source.* import net.mamoe.mirai.message.data.MessageSource import net.mamoe.mirai.message.data.visitor.MessageVisitor import net.mamoe.mirai.utils.castOrNull diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt index 44ff388dd..3e17eae39 100644 --- a/mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt +++ b/mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt @@ -1,10 +1,10 @@ /* - * Copyright 2019-2021 Mamoe Technologies and contributors. + * Copyright 2019-2022 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. + * 此源代码的使用受 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 + * https://github.com/mamoe/mirai/blob/dev/LICENSE */ @file:Suppress("EXPERIMENTAL_API_USAGE") @@ -14,8 +14,8 @@ package net.mamoe.mirai.internal.network.protocol.packet.chat import kotlinx.io.core.ByteReadPacket import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.contact.SendMessageHandler -import net.mamoe.mirai.internal.message.MessageSourceInternal import net.mamoe.mirai.internal.message.contextualBugReportException +import net.mamoe.mirai.internal.message.source.MessageSourceInternal import net.mamoe.mirai.internal.message.toRichTextElems import net.mamoe.mirai.internal.network.Packet import net.mamoe.mirai.internal.network.QQAndroidClient diff --git a/mirai-core/src/commonMain/kotlin/utils/ImagePatcher.kt b/mirai-core/src/commonMain/kotlin/utils/ImagePatcher.kt index 6ca66bc7a..3ec7263cc 100644 --- a/mirai-core/src/commonMain/kotlin/utils/ImagePatcher.kt +++ b/mirai-core/src/commonMain/kotlin/utils/ImagePatcher.kt @@ -10,8 +10,8 @@ package net.mamoe.mirai.internal.utils import net.mamoe.mirai.internal.contact.GroupImpl -import net.mamoe.mirai.internal.message.FriendImage -import net.mamoe.mirai.internal.message.OfflineGroupImage +import net.mamoe.mirai.internal.message.image.FriendImage +import net.mamoe.mirai.internal.message.image.OfflineGroupImage import net.mamoe.mirai.internal.network.component.ComponentKey import net.mamoe.mirai.internal.network.protocol.packet.chat.image.ImgStore import net.mamoe.mirai.utils.ResourceAccessLock diff --git a/mirai-core/src/commonMain/resources/META-INF/services/net.mamoe.mirai.message.data.InternalImageProtocol b/mirai-core/src/commonMain/resources/META-INF/services/net.mamoe.mirai.message.data.InternalImageProtocol index 7d468c002..2475c45cf 100644 --- a/mirai-core/src/commonMain/resources/META-INF/services/net.mamoe.mirai.message.data.InternalImageProtocol +++ b/mirai-core/src/commonMain/resources/META-INF/services/net.mamoe.mirai.message.data.InternalImageProtocol @@ -1,5 +1,5 @@ # -# Copyright 2019-2021 Mamoe Technologies and contributors. +# Copyright 2019-2022 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. @@ -7,4 +7,4 @@ # https://github.com/mamoe/mirai/blob/dev/LICENSE # -net.mamoe.mirai.internal.message.InternalImageProtocolImpl \ No newline at end of file +net.mamoe.mirai.internal.message.image.InternalImageProtocolImpl \ No newline at end of file diff --git a/mirai-core/src/commonTest/kotlin/message/ImageReadingTest.kt b/mirai-core/src/commonTest/kotlin/message/ImageReadingTest.kt index b40f2a680..66323f8bb 100644 --- a/mirai-core/src/commonTest/kotlin/message/ImageReadingTest.kt +++ b/mirai-core/src/commonTest/kotlin/message/ImageReadingTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 Mamoe Technologies and contributors. + * Copyright 2019-2022 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. @@ -9,6 +9,7 @@ package net.mamoe.mirai.internal.message +import net.mamoe.mirai.internal.message.image.calculateImageInfo import net.mamoe.mirai.internal.test.AbstractTest import net.mamoe.mirai.message.data.ImageType import net.mamoe.mirai.utils.ExternalResource.Companion.toExternalResource diff --git a/mirai-core/src/commonTest/kotlin/message/InternalImageProtocolImplTest.kt b/mirai-core/src/commonTest/kotlin/message/InternalImageProtocolImplTest.kt index c05fccfcb..42c3105e7 100644 --- a/mirai-core/src/commonTest/kotlin/message/InternalImageProtocolImplTest.kt +++ b/mirai-core/src/commonTest/kotlin/message/InternalImageProtocolImplTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 Mamoe Technologies and contributors. + * Copyright 2019-2022 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. @@ -9,6 +9,7 @@ package net.mamoe.mirai.internal.message +import net.mamoe.mirai.internal.message.image.InternalImageProtocolImpl import net.mamoe.mirai.internal.notice.processors.AbstractNoticeProcessorTest import kotlin.test.Test import kotlin.test.assertIs