mirror of
https://github.com/mamoe/mirai.git
synced 2025-02-20 00:01:36 +08:00
Replace deprecated String.toMessage
This commit is contained in:
parent
fdede76f11
commit
679d61a6b1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message
mirai-core/src
commonMain/kotlin/net.mamoe.mirai
contact
message
commonTest/kotlin/net/mamoe/mirai/message.data
@ -327,7 +327,7 @@ internal fun List<ImMsgBody.Elem>.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 {
|
||||
|
@ -72,7 +72,7 @@ public abstract class Contact : ContactOrBot, CoroutineScope, ContactJavaFriendl
|
||||
@kotlin.internal.InlineOnly
|
||||
@JvmSynthetic
|
||||
public suspend inline fun sendMessage(message: String): MessageReceipt<Contact> {
|
||||
return sendMessage(message.toMessage())
|
||||
return sendMessage(PlainText(message))
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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<Friend> {
|
||||
return sendMessage(message.toMessage())
|
||||
return sendMessage(PlainText(message))
|
||||
}
|
||||
|
||||
final override fun toString(): String = "Friend($id)"
|
||||
|
@ -155,7 +155,7 @@ public abstract class Group : Contact(), CoroutineScope {
|
||||
@kotlin.internal.InlineOnly
|
||||
@JvmSynthetic
|
||||
public suspend inline fun sendMessage(message: String): MessageReceipt<Group> {
|
||||
return sendMessage(message.toMessage())
|
||||
return sendMessage(PlainText(message))
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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<Member> {
|
||||
return sendMessage(message.toMessage())
|
||||
return sendMessage(PlainText(message))
|
||||
}
|
||||
|
||||
public final override fun toString(): String = "Member($id)"
|
||||
|
@ -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<User> {
|
||||
return sendMessage(message.toMessage())
|
||||
return sendMessage(PlainText(message))
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -109,7 +109,7 @@ public interface MessageEventExtensions<out TSender : User, out TSubject : Conta
|
||||
|
||||
@JvmSynthetic
|
||||
public suspend fun reply(plain: String): MessageReceipt<TSubject> =
|
||||
subject.sendMessage(plain.toMessage().asMessageChain()) as MessageReceipt<TSubject>
|
||||
subject.sendMessage(PlainText(plain).asMessageChain()) as MessageReceipt<TSubject>
|
||||
|
||||
// endregion
|
||||
|
||||
@ -126,7 +126,7 @@ public interface MessageEventExtensions<out TSender : User, out TSubject : Conta
|
||||
public suspend fun Message.send(): MessageReceipt<TSubject> = this.sendTo(subject)
|
||||
|
||||
@JvmSynthetic
|
||||
public suspend fun String.send(): MessageReceipt<TSubject> = this.toMessage().sendTo(subject)
|
||||
public suspend fun String.send(): MessageReceipt<TSubject> = PlainText(this).sendTo(subject)
|
||||
|
||||
// region 引用回复
|
||||
/**
|
||||
|
@ -165,7 +165,7 @@ public suspend inline fun <C : Contact> MessageReceipt<C>.quoteReply(message: Me
|
||||
*/
|
||||
@JvmSynthetic
|
||||
public suspend inline fun <C : Contact> MessageReceipt<C>.quoteReply(message: String): MessageReceipt<C> {
|
||||
return this.quoteReply(message.toMessage())
|
||||
return this.quoteReply(PlainText(message))
|
||||
}
|
||||
|
||||
|
||||
|
@ -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))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
@ -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<Message>): MessageChain =
|
||||
|
@ -356,7 +356,7 @@ public fun Sequence<Message>.asMessageChain(): MessageChain = MessageChainImplBy
|
||||
@Suppress("FunctionName")
|
||||
@JvmName("newChain")
|
||||
public fun _____newChain______(messages: String): MessageChain {
|
||||
return messages.toMessage().asMessageChain()
|
||||
return PlainText(messages).asMessageChain()
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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"),
|
||||
|
Loading…
Reference in New Issue
Block a user