github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-28 21:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move MessageReceipt static functions to member ones

Browse Source
This commit is contained in:
Him188 2020-12-27 23:48:40 +08:00
parent 1769b681d2
commit b40b2232e6
8 changed files with 43 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core-api/src/commonMain/kotlin/contact/Contact.kt
View File

@ -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

1
mirai-core-api/src/commonMain/kotlin/contact/Friend.kt
View File

@ -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

1
mirai-core-api/src/commonMain/kotlin/contact/Group.kt
View File

@ -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

1
mirai-core-api/src/commonMain/kotlin/contact/Member.kt
View File

@ -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

1
mirai-core-api/src/commonMain/kotlin/contact/NormalMember.kt
View File

@ -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

1
mirai-core-api/src/commonMain/kotlin/contact/User.kt
View File

@ -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

21
mirai-core-api/src/commonMain/kotlin/message/MessageReceipt.kt
View File

@ -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,15 +54,13 @@ public open class MessageReceipt<out C : Contact> @MiraiInternalApi constructor(
*/
public val isToGroup: Boolean get() = target is Group
public companion object {
/**
* 撤回这条消息.
*
* @see IMirai.recallMessage
*/
@JvmBlockingBridge
@JvmStatic
public suspend inline fun MessageReceipt<*>.recall() {
public suspend inline fun recall() {
return Mirai.recallMessage(target.bot, source)
}
@ -73,24 +69,21 @@ public open class MessageReceipt<out C : Contact> @MiraiInternalApi constructor(
*
* @see IMirai.recallMessage
*/
@JvmStatic
@Suppress("DeferredIsResult")
public fun MessageReceipt<*>.recallIn(millis: Long): Deferred<Unit> = this.source.recallIn(millis)
public fun recallIn(millis: Long): Deferred<Unit> = this.source.recallIn(millis)
/**
* 引用这条消息.
* @see MessageSource.quote 引用一条消息
*/
@JvmStatic
public inline fun MessageReceipt<*>.quote(): QuoteReply = this.source.quote()
public fun quote(): QuoteReply = this.source.quote()
/**
* 引用这条消息并回复.
* @see MessageSource.quote 引用一条消息
*/
@JvmStatic
@JvmBlockingBridge
public suspend inline fun <C : Contact> MessageReceipt<C>.quoteReply(message: Message): MessageReceipt<C> {
public suspend inline fun quoteReply(message: Message): MessageReceipt<C> {
@Suppress("UNCHECKED_CAST")
return target.sendMessage(this.quote() + message) as MessageReceipt<C>
}
@ -100,11 +93,11 @@ public open class MessageReceipt<out C : Contact> @MiraiInternalApi constructor(
* @see MessageSource.quote 引用一条消息
*/
@JvmBlockingBridge
@JvmStatic
public suspend inline fun <C : Contact> MessageReceipt<C>.quoteReply(message: String): MessageReceipt<C> {
public suspend inline fun quoteReply(message: String): MessageReceipt<C> {
return this.quoteReply(PlainText(message))
}
}
public companion object
}
/**

1
mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt
View File

@ -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