From b40b2232e609b944601b610cae41307994f05fc6 Mon Sep 17 00:00:00 2001 From: Him188 Date: Sun, 27 Dec 2020 23:48:40 +0800 Subject: [PATCH] Move MessageReceipt static functions to member ones --- .../src/commonMain/kotlin/contact/Contact.kt | 2 - .../src/commonMain/kotlin/contact/Friend.kt | 1 - .../src/commonMain/kotlin/contact/Group.kt | 1 - .../src/commonMain/kotlin/contact/Member.kt | 1 - .../commonMain/kotlin/contact/NormalMember.kt | 1 - .../src/commonMain/kotlin/contact/User.kt | 1 - .../kotlin/message/MessageReceipt.kt | 93 +++++++++---------- .../kotlin/message/data/MessageSource.kt | 1 - 8 files changed, 43 insertions(+), 58 deletions(-) diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt b/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt index 2697abc31..f351f0d6c 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/Contact.kt @@ -17,8 +17,6 @@ import net.mamoe.kjbb.JvmBlockingBridge import net.mamoe.mirai.* import net.mamoe.mirai.event.events.* import net.mamoe.mirai.message.MessageReceipt -import net.mamoe.mirai.message.MessageReceipt.Companion.quote -import net.mamoe.mirai.message.MessageReceipt.Companion.recall import net.mamoe.mirai.message.data.* import net.mamoe.mirai.utils.* import net.mamoe.mirai.utils.ExternalResource.Companion.sendAsImageTo diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt b/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt index ea3acb4cd..ce30cc88e 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt @@ -19,7 +19,6 @@ import net.mamoe.mirai.event.events.FriendMessageEvent import net.mamoe.mirai.event.events.FriendMessagePostSendEvent import net.mamoe.mirai.event.events.FriendMessagePreSendEvent import net.mamoe.mirai.message.MessageReceipt -import net.mamoe.mirai.message.MessageReceipt.Companion.recall import net.mamoe.mirai.message.action.FriendNudge import net.mamoe.mirai.message.action.Nudge import net.mamoe.mirai.message.data.Message diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Group.kt b/mirai-core-api/src/commonMain/kotlin/contact/Group.kt index fb08c88e1..61911fef2 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/Group.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/Group.kt @@ -16,7 +16,6 @@ import net.mamoe.kjbb.JvmBlockingBridge import net.mamoe.mirai.Bot import net.mamoe.mirai.event.events.* import net.mamoe.mirai.message.MessageReceipt -import net.mamoe.mirai.message.MessageReceipt.Companion.recall import net.mamoe.mirai.message.data.* import net.mamoe.mirai.utils.ExternalResource import net.mamoe.mirai.utils.MiraiExperimentalApi diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Member.kt b/mirai-core-api/src/commonMain/kotlin/contact/Member.kt index 2b7fa7a07..2bd073948 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/Member.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/Member.kt @@ -15,7 +15,6 @@ import net.mamoe.kjbb.JvmBlockingBridge import net.mamoe.mirai.Bot import net.mamoe.mirai.event.events.* import net.mamoe.mirai.message.MessageReceipt -import net.mamoe.mirai.message.MessageReceipt.Companion.recall import net.mamoe.mirai.message.action.MemberNudge import net.mamoe.mirai.message.action.Nudge import net.mamoe.mirai.message.data.Message diff --git a/mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt b/mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt index 631da5cc3..083d08cd0 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt @@ -13,7 +13,6 @@ import net.mamoe.kjbb.JvmBlockingBridge import net.mamoe.mirai.Bot import net.mamoe.mirai.event.events.* import net.mamoe.mirai.message.MessageReceipt -import net.mamoe.mirai.message.MessageReceipt.Companion.recall import net.mamoe.mirai.message.action.MemberNudge import net.mamoe.mirai.message.action.Nudge import net.mamoe.mirai.message.data.Message diff --git a/mirai-core-api/src/commonMain/kotlin/contact/User.kt b/mirai-core-api/src/commonMain/kotlin/contact/User.kt index 284993b52..4b46007fb 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/User.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/User.kt @@ -18,7 +18,6 @@ import net.mamoe.mirai.event.events.EventCancelledException import net.mamoe.mirai.event.events.UserMessagePostSendEvent import net.mamoe.mirai.event.events.UserMessagePreSendEvent import net.mamoe.mirai.message.MessageReceipt -import net.mamoe.mirai.message.MessageReceipt.Companion.recall import net.mamoe.mirai.message.action.Nudge import net.mamoe.mirai.message.action.UserNudge import net.mamoe.mirai.message.data.Message diff --git a/mirai-core-api/src/commonMain/kotlin/message/MessageReceipt.kt b/mirai-core-api/src/commonMain/kotlin/message/MessageReceipt.kt index 8ff799bd4..5d3bccef2 100644 --- a/mirai-core-api/src/commonMain/kotlin/message/MessageReceipt.kt +++ b/mirai-core-api/src/commonMain/kotlin/message/MessageReceipt.kt @@ -17,8 +17,6 @@ import net.mamoe.mirai.Bot import net.mamoe.mirai.IMirai import net.mamoe.mirai.Mirai import net.mamoe.mirai.contact.* -import net.mamoe.mirai.message.MessageReceipt.Companion.quote -import net.mamoe.mirai.message.MessageReceipt.Companion.quoteReply import net.mamoe.mirai.message.data.* import net.mamoe.mirai.message.data.MessageSource.Key.quote import net.mamoe.mirai.message.data.MessageSource.Key.recallIn @@ -56,55 +54,50 @@ public open class MessageReceipt @MiraiInternalApi constructor( */ public val isToGroup: Boolean get() = target is Group - public companion object { - /** - * 撤回这条消息. - * - * @see IMirai.recallMessage - */ - @JvmBlockingBridge - @JvmStatic - public suspend inline fun MessageReceipt<*>.recall() { - return Mirai.recallMessage(target.bot, source) - } - - /** - * 在一段时间后撤回这条消息. - * - * @see IMirai.recallMessage - */ - @JvmStatic - @Suppress("DeferredIsResult") - public fun MessageReceipt<*>.recallIn(millis: Long): Deferred = this.source.recallIn(millis) - - /** - * 引用这条消息. - * @see MessageSource.quote 引用一条消息 - */ - @JvmStatic - public inline fun MessageReceipt<*>.quote(): QuoteReply = this.source.quote() - - /** - * 引用这条消息并回复. - * @see MessageSource.quote 引用一条消息 - */ - @JvmStatic - @JvmBlockingBridge - public suspend inline fun MessageReceipt.quoteReply(message: Message): MessageReceipt { - @Suppress("UNCHECKED_CAST") - return target.sendMessage(this.quote() + message) as MessageReceipt - } - - /** - * 引用这条消息并回复. - * @see MessageSource.quote 引用一条消息 - */ - @JvmBlockingBridge - @JvmStatic - public suspend inline fun MessageReceipt.quoteReply(message: String): MessageReceipt { - return this.quoteReply(PlainText(message)) - } + /** + * 撤回这条消息. + * + * @see IMirai.recallMessage + */ + @JvmBlockingBridge + public suspend inline fun recall() { + return Mirai.recallMessage(target.bot, source) } + + /** + * 在一段时间后撤回这条消息. + * + * @see IMirai.recallMessage + */ + @Suppress("DeferredIsResult") + public fun recallIn(millis: Long): Deferred = this.source.recallIn(millis) + + /** + * 引用这条消息. + * @see MessageSource.quote 引用一条消息 + */ + public fun quote(): QuoteReply = this.source.quote() + + /** + * 引用这条消息并回复. + * @see MessageSource.quote 引用一条消息 + */ + @JvmBlockingBridge + public suspend inline fun quoteReply(message: Message): MessageReceipt { + @Suppress("UNCHECKED_CAST") + return target.sendMessage(this.quote() + message) as MessageReceipt + } + + /** + * 引用这条消息并回复. + * @see MessageSource.quote 引用一条消息 + */ + @JvmBlockingBridge + public suspend inline fun quoteReply(message: String): MessageReceipt { + return this.quoteReply(PlainText(message)) + } + + public companion object } /** diff --git a/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt b/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt index 0d558a641..b4444ddfc 100644 --- a/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt +++ b/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt @@ -24,7 +24,6 @@ import net.mamoe.mirai.Mirai import net.mamoe.mirai.contact.* import net.mamoe.mirai.event.events.MessageEvent import net.mamoe.mirai.message.MessageReceipt -import net.mamoe.mirai.message.MessageReceipt.Companion.recall import net.mamoe.mirai.message.MessageSourceSerializerImpl import net.mamoe.mirai.message.data.MessageSource.Key.isAboutFriend import net.mamoe.mirai.message.data.MessageSource.Key.isAboutGroup