diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt index 0e6cf8f53..f402a8c89 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt @@ -38,7 +38,6 @@ import net.mamoe.mirai.utils.io.toUHexString import kotlin.contracts.ExperimentalContracts import kotlin.contracts.contract import kotlin.coroutines.CoroutineContext -import kotlin.jvm.JvmName import kotlin.jvm.JvmSynthetic import net.mamoe.mirai.qqandroid.network.protocol.data.jce.FriendInfo as JceFriendInfo @@ -81,12 +80,6 @@ internal class QQImpl( return MessageReceipt(source, this, null) } - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - override suspend fun sendMessage(message: MessageChain): MessageReceipt { - return this.sendMessage(message as Message) - } - @JvmSynthetic @OptIn(MiraiInternalAPI::class) override suspend fun uploadImage(image: ExternalImage): OfflineFriendImage = try { @@ -241,12 +234,6 @@ internal class MemberImpl( return MessageReceipt(source, this, null) } - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - override suspend fun sendMessage(message: MessageChain): MessageReceipt { - return this.sendMessage(message as Message) - } - @JvmSynthetic override suspend fun uploadImage(image: ExternalImage): OfflineFriendImage = qq.uploadImage(image) // endregion @@ -647,13 +634,6 @@ internal class GroupImpl( return MessageReceipt(source, this, botAsMember) } - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - override suspend fun sendMessage(message: MessageChain): MessageReceipt { - return this.sendMessage(message as Message) - } - - @JvmSynthetic override suspend fun uploadImage(image: ExternalImage): OfflineGroupImage = try { if (BeforeImageUploadEvent(this, image).broadcast().isCancelled) { diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt index 91458cd05..f02aec3ab 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt @@ -69,13 +69,6 @@ internal abstract class QQAndroidBotBase constructor( val json = Json(JsonConfiguration(ignoreUnknownKeys = true, encodeDefaults = true)) } - @Deprecated( - "use friends instead", - level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("this.friends") - ) - override val qqs: ContactList - get() = friends override val friends: ContactList = ContactList(LockFreeLinkedList()) override val selfQQ: QQ by lazy { diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt index e768f02aa..8e1a41537 100644 --- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt +++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt @@ -77,33 +77,11 @@ actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIA actual abstract val selfQQ: QQ - /** - * 机器人的好友列表. 它将与服务器同步更新 - */ - @Deprecated( - "use friends instead", - level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("this.friends") - ) - actual abstract val qqs: ContactList - /** * 机器人的好友列表. 它将与服务器同步更新 */ actual abstract val friends: ContactList - /** - * 获取一个好友或一个群. - */ - @Deprecated( - "use getFriend or getGroup instead", - level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("this.qqs.getOrNull(id) ?: this.groups.getOrNull(id) ?: throw NoSuchElementException(\"contact id \$id\")") - ) - actual operator fun get(id: Long): Contact { - return this.friends.getOrNull(id) ?: this.groups.getOrNull(id) ?: throw NoSuchElementException("contact id $id") - } - /** * 判断是否有这个 id 的好友或群. * 在一些情况下这可能会造成歧义. 请考虑后使用. diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt index 3846d7c95..bfae361d2 100644 --- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt +++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt @@ -19,7 +19,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.OfflineImage import net.mamoe.mirai.message.data.id import net.mamoe.mirai.utils.ExternalImage @@ -66,10 +65,6 @@ actual abstract class Contact : CoroutineScope, ContactJavaHappyAPI() { @JvmSynthetic actual abstract suspend fun sendMessage(message: Message): MessageReceipt - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - actual abstract suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 上传一个图片以备发送. * diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt index fd19d53cd..bd976661d 100644 --- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt +++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt @@ -17,7 +17,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.OfflineGroupImage import net.mamoe.mirai.utils.ExternalImage import net.mamoe.mirai.utils.MiraiExperimentalAPI @@ -181,10 +180,6 @@ actual abstract class Group : Contact(), CoroutineScope { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - @JvmSynthetic - actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 上传一个图片以备发送. * diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt index 244d60d8a..5c8ed9d37 100644 --- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt +++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt @@ -18,7 +18,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.WeakRefProperty @@ -33,12 +32,14 @@ actual abstract class Member : MemberJavaHappyAPI() { */ @WeakRefProperty actual abstract val group: Group + /** * 成员的权限, 动态更新. * * @see MemberPermissionChangeEvent 权限变更事件. 由群主或机器人的操作触发. */ actual abstract val permission: MemberPermission + /** * 群名片. 可能为空. * @@ -52,6 +53,7 @@ actual abstract class Member : MemberJavaHappyAPI() { * @throws PermissionDeniedException 无权限修改时 */ actual abstract var nameCard: String + /** * 群头衔. * @@ -63,6 +65,7 @@ actual abstract class Member : MemberJavaHappyAPI() { * @throws PermissionDeniedException 无权限修改时 */ actual abstract var specialTitle: String + /** * 被禁言剩余时长. 单位为秒. * @@ -118,10 +121,6 @@ actual abstract class Member : MemberJavaHappyAPI() { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 踢出该成员. * diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt index 6579d9669..16c623883 100644 --- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt +++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt @@ -14,7 +14,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.OfflineFriendImage import net.mamoe.mirai.utils.ExternalImage import net.mamoe.mirai.utils.MiraiExperimentalAPI @@ -90,10 +89,6 @@ actual abstract class QQ : Contact(), CoroutineScope { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 上传一个图片以备发送. * diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt index a6b131f0b..100a169de 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt @@ -98,32 +98,11 @@ expect abstract class Bot() : CoroutineScope, LowLevelBotAPIAccessor { */ abstract val selfQQ: QQ - /** - * 机器人的好友列表. 它将与服务器同步更新 - */ - @Deprecated( - "use friends instead", - level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("this.friends") - ) - abstract val qqs: ContactList - /** * 机器人的好友列表. 它将与服务器同步更新 */ abstract val friends: ContactList - /** - * 获取一个好友或一个群. - * 在一些情况下这可能会造成歧义. 请考虑后使用. - */ - @Deprecated( - "use getFriend or getGroup instead", - level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("this.qqs.getOrNull(id) ?: this.groups.getOrNull(id) ?: throw NoSuchElementException(\"contact id \$id\")") - ) - operator fun get(id: Long): Contact - /** * 判断是否有这个 id 的好友或群. */ diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/BotImpl.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/BotImpl.kt index b821cd54c..053b81be6 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/BotImpl.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/BotImpl.kt @@ -52,6 +52,7 @@ abstract class BotImpl constructor( @OptIn(RawAccountIdUse::class) override val uin: Long get() = this.account.id + final override val logger: MiraiLogger by lazy { configuration.botLoggerSupplier(this) } init { diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt index 21b242a37..a2d2a1e52 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt @@ -69,10 +69,6 @@ expect abstract class Contact() : CoroutineScope, ContactJavaHappyAPI { @JvmSynthetic abstract suspend fun sendMessage(message: Message): MessageReceipt - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - @JvmSynthetic - abstract suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 上传一个图片以备发送. * diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt index a1ad294b5..61f19826c 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt @@ -33,8 +33,6 @@ class ContactList(@MiraiInternalAPI val delegate: LockFreeLinkedLis operator fun get(id: Long): C = delegate[id] fun getOrNull(id: Long): C? = delegate.getOrNull(id) - @Deprecated("Use contains instead", ReplaceWith("contains(id)")) - fun containsId(id: Long): Boolean = contains(id) val size: Int get() = delegate.size operator fun contains(element: C): Boolean = delegate.contains(element) diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt index 7eb8bcdb3..5cbc18928 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt @@ -19,7 +19,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.OfflineGroupImage import net.mamoe.mirai.utils.ExternalImage import net.mamoe.mirai.utils.MiraiExperimentalAPI @@ -181,10 +180,6 @@ expect abstract class Group() : Contact, CoroutineScope { @JvmSynthetic abstract override suspend fun sendMessage(message: Message): MessageReceipt - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - @JvmSynthetic - abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 上传一个图片以备发送. * diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt index 33f9473eb..54a5c574a 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt @@ -16,7 +16,6 @@ import net.mamoe.mirai.JavaHappyAPI import net.mamoe.mirai.event.events.* import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.WeakRefProperty import kotlin.jvm.JvmSynthetic @@ -143,11 +142,6 @@ expect abstract class Member() : MemberJavaHappyAPI { */ @JvmSynthetic abstract override suspend fun sendMessage(message: Message): MessageReceipt - - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt - } /** diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt index 268906222..81956420e 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt @@ -23,7 +23,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.OfflineFriendImage import net.mamoe.mirai.utils.ExternalImage import net.mamoe.mirai.utils.MiraiExperimentalAPI @@ -99,10 +98,6 @@ expect abstract class QQ() : Contact, CoroutineScope { @JvmSynthetic abstract override suspend fun sendMessage(message: Message): MessageReceipt - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 上传一个图片以备发送. * diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/internal/InternalEventListeners.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/internal/InternalEventListeners.kt index cd406b5ed..bd1369c22 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/internal/InternalEventListeners.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/internal/InternalEventListeners.kt @@ -35,14 +35,6 @@ fun , E : Event> KClass.subscribeInternal(listener: L): L return listener } -@PublishedApi -@Suppress("FunctionName", "unused") -@Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) -internal fun CoroutineScope.Handler( - coroutineContext: CoroutineContext, - handler: suspend (E) -> ListeningStatus -): Handler = Handler(coroutineContext, concurrencyKind = Listener.ConcurrencyKind.LOCKED, handler = handler) - @PublishedApi @Suppress("FunctionName") internal fun CoroutineScope.Handler( @@ -68,15 +60,6 @@ internal class Handler ) : Listener, CompletableJob by Job(parentJob) { - @Suppress("unused") - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - @PublishedApi - internal constructor( - parentJob: Job?, - subscriberContext: CoroutineContext, - handler: suspend (E) -> ListeningStatus - ) : this(parentJob, subscriberContext, handler, Listener.ConcurrencyKind.LOCKED) - @MiraiInternalAPI val lock: Mutex? = when (concurrencyKind) { Listener.ConcurrencyKind.CONCURRENT -> null diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt index 7c5ef0aa1..f48eb3252 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt @@ -115,7 +115,6 @@ suspend fun Image.queryUrl(): String { * 不能直接获取它在服务器上的链接. 需要通过 [Bot.queryImageUrl] 查询 * * 一般由 [Contact.uploadImage] 得到 - * @see queryOriginUrl */ interface OfflineImage : Image { companion object Key : Message.Key @@ -130,9 +129,6 @@ suspend fun OfflineImage.queryUrl(): String { return BotImpl.instances.peekFirst().get()?.queryImageUrl(this) ?: error("No Bot available to query image url") } -@Deprecated("use queryUrl() instead", ReplaceWith("queryUrl()"), level = DeprecationLevel.ERROR) -@JvmSynthetic -suspend inline fun OfflineImage.queryOriginUrl(): String = queryUrl() // endregion 离线图片 // region 群图片 diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/RichMessage.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/RichMessage.kt index c5104b3d0..26e49d506 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/RichMessage.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/RichMessage.kt @@ -182,13 +182,4 @@ class XmlMessageBuilder( this.builder.append("") } } -} - -@Deprecated( - "for source compatibility", - replaceWith = ReplaceWith("RichMessage.Templates", "net.mamoe.mirai.message.data.RichMessage"), - level = DeprecationLevel.ERROR -) -@Suppress("unused") -// in bytecode it's public -internal typealias XmlMessageHelper = RichMessage.Templates \ No newline at end of file +} \ No newline at end of file diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt index 8024b87ac..7a266a180 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt @@ -87,33 +87,11 @@ actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIA actual abstract val selfQQ: QQ - /** - * 机器人的好友列表. 它将与服务器同步更新 - */ - @Deprecated( - "use friends instead", - level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("this.friends") - ) - actual abstract val qqs: ContactList - /** * 机器人的好友列表. 它将与服务器同步更新 */ actual abstract val friends: ContactList - /** - * 获取一个好友或一个群. - */ - @Deprecated( - "use getFriend or getGroup instead", - level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("this.qqs.getOrNull(id) ?: this.groups.getOrNull(id) ?: throw NoSuchElementException(\"contact id \$id\")") - ) - actual operator fun get(id: Long): Contact { - return this.friends.getOrNull(id) ?: this.groups.getOrNull(id) ?: throw NoSuchElementException("contact id $id") - } - /** * 判断是否有这个 id 的好友或群. * 在一些情况下这可能会造成歧义. 请考虑后使用. diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt index 76d0142be..c92d581c9 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt @@ -19,7 +19,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.OfflineImage import net.mamoe.mirai.message.data.id import net.mamoe.mirai.utils.ExternalImage @@ -62,13 +61,9 @@ actual abstract class Contact : CoroutineScope, ContactJavaHappyAPI() { * * @return 消息回执. 可 [引用回复][MessageReceipt.quote](仅群聊)或 [撤回][MessageReceipt.recall] 这条消息. */ - @JvmSynthetic + @JvmSynthetic // actual abstract suspend fun sendMessage(message: Message): MessageReceipt - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - actual abstract suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 上传一个图片以备发送. * diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt index 3db823e7b..9473443c2 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt @@ -17,7 +17,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.OfflineGroupImage import net.mamoe.mirai.utils.ExternalImage import net.mamoe.mirai.utils.MiraiExperimentalAPI @@ -182,10 +181,6 @@ actual abstract class Group : Contact(), CoroutineScope { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - @JvmSynthetic - actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 上传一个图片以备发送. * diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt index 969fb151f..830174c39 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt @@ -18,7 +18,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.WeakRefProperty @@ -129,10 +128,6 @@ actual abstract class Member : MemberJavaHappyAPI() { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 当且仅当 `[other] is [Member] && [other].id == this.id && [other].group == this.group` 时为 true */ diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt index 6579d9669..16c623883 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt @@ -14,7 +14,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.OfflineFriendImage import net.mamoe.mirai.utils.ExternalImage import net.mamoe.mirai.utils.MiraiExperimentalAPI @@ -90,10 +89,6 @@ actual abstract class QQ : Contact(), CoroutineScope { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt - @JvmSynthetic - @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt - /** * 上传一个图片以备发送. *