From 679d61a6b15478bdf1a81e3ce9f1f30935f890bd Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 19 Aug 2020 09:32:28 +0800 Subject: [PATCH] Replace deprecated String.toMessage --- .../net/mamoe/mirai/qqandroid/message/conversions.kt | 2 +- .../commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt | 2 +- .../commonMain/kotlin/net.mamoe.mirai/contact/Friend.kt | 4 ++-- .../commonMain/kotlin/net.mamoe.mirai/contact/Group.kt | 2 +- .../commonMain/kotlin/net.mamoe.mirai/contact/Member.kt | 4 ++-- .../src/commonMain/kotlin/net.mamoe.mirai/contact/User.kt | 4 ++-- .../kotlin/net.mamoe.mirai/message/MessageEvent.kt | 4 ++-- .../kotlin/net.mamoe.mirai/message/MessageReceipt.kt | 2 +- .../kotlin/net.mamoe.mirai/message/code/internal/impl.kt | 6 +++--- .../kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt | 8 ++++---- .../kotlin/net.mamoe.mirai/message/data/Message.kt | 4 ++-- .../kotlin/net.mamoe.mirai/message/data/MessageChain.kt | 2 +- .../net.mamoe.mirai/message/data/MessageChainBuilder.kt | 2 +- .../net/mamoe/mirai/message.data/CombinedMessageTest.kt | 4 ++-- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/conversions.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/conversions.kt index e7db9066d..8bb1f16d7 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/conversions.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/conversions.kt @@ -327,7 +327,7 @@ internal fun List.joinToMessageChain(groupIdOrZero: Long, bot: B element.face != null -> list.add(Face(element.face.index)) element.text != null -> { if (element.text.attr6Buf.isEmpty()) { - list.add(element.text.str.toMessage()) + list.add(PlainText(element.text.str)) } else { val id: Long element.text.attr6Buf.read { 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 ef67f0b28..cd50a8caa 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 @@ -72,7 +72,7 @@ public abstract class Contact : ContactOrBot, CoroutineScope, ContactJavaFriendl @kotlin.internal.InlineOnly @JvmSynthetic public suspend inline fun sendMessage(message: String): MessageReceipt { - return sendMessage(message.toMessage()) + return sendMessage(PlainText(message)) } /** diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Friend.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Friend.kt index a2ae82ae7..978034c9b 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Friend.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Friend.kt @@ -19,8 +19,8 @@ import net.mamoe.mirai.event.events.FriendMessagePreSendEvent import net.mamoe.mirai.message.FriendMessageEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message +import net.mamoe.mirai.message.data.PlainText import net.mamoe.mirai.message.data.isContentEmpty -import net.mamoe.mirai.message.data.toMessage import net.mamoe.mirai.message.recall import kotlin.jvm.JvmSynthetic @@ -74,7 +74,7 @@ public abstract class Friend : User(), CoroutineScope { @kotlin.internal.InlineOnly @JvmSynthetic suspend inline fun sendMessage(message: String): MessageReceipt { - return sendMessage(message.toMessage()) + return sendMessage(PlainText(message)) } final override fun toString(): String = "Friend($id)" 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 d49ed2158..a1ecec8d8 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 @@ -155,7 +155,7 @@ public abstract class Group : Contact(), CoroutineScope { @kotlin.internal.InlineOnly @JvmSynthetic public suspend inline fun sendMessage(message: String): MessageReceipt { - return sendMessage(message.toMessage()) + return sendMessage(PlainText(message)) } /** 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 68425f2f3..577e549b5 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 @@ -17,8 +17,8 @@ import net.mamoe.mirai.event.events.* import net.mamoe.mirai.getFriendOrNull import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message +import net.mamoe.mirai.message.data.PlainText import net.mamoe.mirai.message.data.isContentEmpty -import net.mamoe.mirai.message.data.toMessage import net.mamoe.mirai.message.recall import net.mamoe.mirai.utils.WeakRefProperty import kotlin.jvm.JvmSynthetic @@ -164,7 +164,7 @@ public abstract class Member : MemberJavaFriendlyAPI, User() { @kotlin.internal.InlineOnly @JvmSynthetic public suspend inline fun sendMessage(message: String): MessageReceipt { - return sendMessage(message.toMessage()) + return sendMessage(PlainText(message)) } public final override fun toString(): String = "Member($id)" diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/User.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/User.kt index cf0e5d4ba..a20ae7208 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/User.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/User.kt @@ -17,7 +17,7 @@ import net.mamoe.mirai.event.events.* import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Image import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.toMessage +import net.mamoe.mirai.message.data.PlainText import net.mamoe.mirai.utils.ExternalImage import net.mamoe.mirai.utils.OverFileSizeMaxException import kotlin.jvm.JvmSynthetic @@ -74,7 +74,7 @@ public abstract class User : Contact(), CoroutineScope { @kotlin.internal.InlineOnly @JvmSynthetic public suspend inline fun sendMessage(message: String): MessageReceipt { - return sendMessage(message.toMessage()) + return sendMessage(PlainText(message)) } /** diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessageEvent.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessageEvent.kt index e9c7e8237..f37db3ba4 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessageEvent.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessageEvent.kt @@ -109,7 +109,7 @@ public interface MessageEventExtensions = - subject.sendMessage(plain.toMessage().asMessageChain()) as MessageReceipt + subject.sendMessage(PlainText(plain).asMessageChain()) as MessageReceipt // endregion @@ -126,7 +126,7 @@ public interface MessageEventExtensions = this.sendTo(subject) @JvmSynthetic - public suspend fun String.send(): MessageReceipt = this.toMessage().sendTo(subject) + public suspend fun String.send(): MessageReceipt = PlainText(this).sendTo(subject) // region 引用回复 /** diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessageReceipt.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessageReceipt.kt index eb126bd8d..b5224d59a 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessageReceipt.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessageReceipt.kt @@ -165,7 +165,7 @@ public suspend inline fun MessageReceipt.quoteReply(message: Me */ @JvmSynthetic public suspend inline fun MessageReceipt.quoteReply(message: String): MessageReceipt { - return this.quoteReply(message.toMessage()) + return this.quoteReply(PlainText(message)) } diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/code/internal/impl.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/code/internal/impl.kt index db9ec7f49..b14f26eec 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/code/internal/impl.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/code/internal/impl.kt @@ -20,11 +20,11 @@ internal val codeRegex = Regex("""(?:\[mirai:([^\]]*)?:(.*?)?\])|(?:\[mirai:([^: internal fun String.parseMiraiCodeImpl(): MessageChain = buildMessageChain { forEachMiraiCode { origin, name, args -> if (name == null) { - add(origin.toMessage()) + add(PlainText(origin)) return@forEachMiraiCode } val parser = MiraiCodeParsers[name] ?: kotlin.run { - add(origin.toMessage()) + add(PlainText(origin)) return@forEachMiraiCode } parser.argsRegex.matchEntire(args) @@ -35,7 +35,7 @@ internal fun String.parseMiraiCodeImpl(): MessageChain = buildMessageChain { }.getOrNull() } ?.let(::add) - ?: add(origin.toMessage()) + ?: add(PlainText(origin)) } } diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt index 6b8af58ba..a27a532be 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt @@ -419,7 +419,7 @@ public class ForwardMessageBuilder private constructor( * 指定消息内容 */ @ForwardMessageDsl - public infix fun message(message: String): BuilderNode = this.apply { this.message = message.toMessage() } + public infix fun message(message: String): BuilderNode = this.apply { this.message = PlainText(message) } /** 添加一条消息 */ @ForwardMessageDsl @@ -431,7 +431,7 @@ public class ForwardMessageBuilder private constructor( /** 添加一条消息 */ @ForwardMessageDsl - public infix fun says(message: String): ForwardMessageBuilder = this.says(message.toMessage()) + public infix fun says(message: String): ForwardMessageBuilder = this.says(PlainText(message)) /** 构造并添加一个 [MessageChain] */ @ForwardMessageDsl @@ -443,12 +443,12 @@ public class ForwardMessageBuilder private constructor( /** 添加一条消息, 自动按顺序调整时间 */ @ForwardMessageDsl - public infix fun Long.says(message: String): ForwardMessageBuilder = says(message.toMessage()) + public infix fun Long.says(message: String): ForwardMessageBuilder = says(PlainText(message)) /** 添加一条消息, 自动按顺序调整时间 */ @ForwardMessageDsl public infix fun Int.says(message: String): ForwardMessageBuilder = - this.toLong().and(0xFFFF_FFFF).says(message.toMessage()) + this.toLong().and(0xFFFF_FFFF).says(PlainText(message)) /** 添加一条消息, 自动按顺序调整时间 */ @ForwardMessageDsl diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Message.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Message.kt index 8465d80f9..3a74153de 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Message.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Message.kt @@ -184,11 +184,11 @@ public interface Message { // must be interface. Don't consider any changes. public /* final */ operator fun plus(another: SingleMessage): MessageChain = this.followedBy(another) /** 将 [another] 作为 [PlainText] 连接到这个消息的尾部. */ - public /* final */ operator fun plus(another: String): MessageChain = this.followedBy(another.toMessage()) + public /* final */ operator fun plus(another: String): MessageChain = this.followedBy(PlainText(another)) /** 将 [another] 作为 [PlainText] 连接到这个消息的尾部. */ public /* final */ operator fun plus(another: CharSequence): MessageChain = - this.followedBy(another.toString().toMessage()) + this.followedBy(PlainText(another.toString())) /** 将 [another] 按顺序连接到这个消息的尾部. */ public /* final */ operator fun plus(another: Iterable): MessageChain = diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt index f8374393c..2463cd78a 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt @@ -356,7 +356,7 @@ public fun Sequence.asMessageChain(): MessageChain = MessageChainImplBy @Suppress("FunctionName") @JvmName("newChain") public fun _____newChain______(messages: String): MessageChain { - return messages.toMessage().asMessageChain() + return PlainText(messages).asMessageChain() } /** diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChainBuilder.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChainBuilder.kt index da6cc5d5d..3bc0264c3 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChainBuilder.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChainBuilder.kt @@ -193,7 +193,7 @@ public open class MessageChainBuilder private constructor( private var cache: StringBuilder? = null private fun flushCache() { cache?.let { - container.add(it.toString().toMessage()) + container.add(PlainText(it.toString())) } cache = null } diff --git a/mirai-core/src/commonTest/kotlin/net/mamoe/mirai/message.data/CombinedMessageTest.kt b/mirai-core/src/commonTest/kotlin/net/mamoe/mirai/message.data/CombinedMessageTest.kt index 2c61c9479..7df42f35e 100644 --- a/mirai-core/src/commonTest/kotlin/net/mamoe/mirai/message.data/CombinedMessageTest.kt +++ b/mirai-core/src/commonTest/kotlin/net/mamoe/mirai/message.data/CombinedMessageTest.kt @@ -9,7 +9,7 @@ internal class CombinedMessageTest { @Test fun testAsSequence() { - var message: Message = "Hello ".toMessage() + var message: Message = PlainText("Hello ") message += "World" assertEquals( @@ -20,7 +20,7 @@ internal class CombinedMessageTest { @Test fun testAsSequence2() { - var message: Message = "Hello ".toMessage() + var message: Message = PlainText("Hello ") message += listOf( PlainText("W"), PlainText("o"),