@@ -22,16 +22,14 @@ import love.forte.simbot.CharSequenceID
2222import love.forte.simbot.ID
2323import love.forte.simbot.action.DeleteSupport
2424import love.forte.simbot.action.ReplySupport
25- import love.forte.simbot.component.mirai.message.MiraiQuoteReply
26- import love.forte.simbot.component.mirai.message.toOriginalMiraiMessage
2725import love.forte.simbot.literal
28- import love.forte.simbot.message.Message
29- import love.forte.simbot.message.MessageContent
3026import love.forte.simbot.message.SingleMessageReceipt
3127import net.mamoe.mirai.contact.Contact
3228import net.mamoe.mirai.message.MessageSerializers
33- import net.mamoe.mirai.message.data.*
34- import org.jetbrains.annotations.ApiStatus
29+ import net.mamoe.mirai.message.data.MessageSource
30+ import net.mamoe.mirai.message.data.MessageSourceBuilder
31+ import net.mamoe.mirai.message.data.MessageSourceKind
32+ import net.mamoe.mirai.message.data.buildMessageSource
3533import net.mamoe.mirai.message.MessageReceipt as OriginalMiraiMessageReceipt
3634
3735
@@ -64,30 +62,6 @@ public abstract class SimbotMiraiMessageReceipt<out C : Contact> : SingleMessage
6462 */
6563 public abstract val fullId: ID
6664
67- /* *
68- * @suppress '回执'并没有 Reply 的语义,将会择期取消对 ReplySupport 的实现。
69- * 如果希望达到'引用回复'的效果,参考使用 [MiraiQuoteReply].
70- */
71- @Deprecated(" Will remove." , level = DeprecationLevel .ERROR )
72- @ApiStatus.ScheduledForRemoval (inVersion = " 3.0.0.0" )
73- public abstract suspend fun reply (message : Message ): SimbotMiraiMessageReceipt <Contact >
74-
75- /* *
76- * @suppress '回执'并没有 Reply 的语义,将会择期取消对 ReplySupport 的实现。
77- * 如果希望达到'引用回复'的效果,参考使用 [MiraiQuoteReply].
78- */
79- @Deprecated(" Will remove." , level = DeprecationLevel .ERROR )
80- @ApiStatus.ScheduledForRemoval (inVersion = " 3.0.0.0" )
81- public abstract suspend fun reply (text : String ): SimbotMiraiMessageReceipt <Contact >
82-
83- /* *
84- * @suppress '回执'并没有 Reply 的语义,将会择期取消对 ReplySupport 的实现。
85- * 如果希望达到'引用回复'的效果,参考使用 [MiraiQuoteReply].
86- */
87- @Deprecated(" Will remove." , level = DeprecationLevel .ERROR )
88- @ApiStatus.ScheduledForRemoval (inVersion = " 3.0.0.0" )
89- public abstract suspend fun reply (message : MessageContent ): SimbotMiraiMessageReceipt <Contact >
90-
9165 /* *
9266 * 删除/撤回这条消息.
9367 */
@@ -115,32 +89,6 @@ internal class SimbotMiraiMessageReceiptImpl<out C : Contact>(
11589 receipt.recall()
11690 return true
11791 }
118-
119- @Deprecated(" Will remove." , level = DeprecationLevel .ERROR )
120- @ApiStatus.ScheduledForRemoval (inVersion = " 3.0.0.0" )
121- override suspend fun reply (message : Message ): SimbotMiraiMessageReceipt <Contact > {
122- val quote = receipt.quote()
123- val sendMessage = message.toOriginalMiraiMessage(receipt.target)
124- val newReceipt = receipt.target.sendMessage(quote + sendMessage)
125- return SimbotMiraiMessageReceiptImpl (newReceipt)
126- }
127-
128- @Deprecated(" Will remove." , level = DeprecationLevel .ERROR )
129- @ApiStatus.ScheduledForRemoval (inVersion = " 3.0.0.0" )
130- override suspend fun reply (text : String ): SimbotMiraiMessageReceipt <Contact > {
131- val quote = receipt.quote()
132- val newReceipt = receipt.target.sendMessage(quote + text.toPlainText())
133- return SimbotMiraiMessageReceiptImpl (newReceipt)
134- }
135-
136- @Deprecated(" Will remove." , level = DeprecationLevel .ERROR )
137- @ApiStatus.ScheduledForRemoval (inVersion = " 3.0.0.0" )
138- override suspend fun reply (message : MessageContent ): SimbotMiraiMessageReceipt <Contact > {
139- val quote = receipt.quote()
140- val sendMessage = message.messages.toOriginalMiraiMessage(receipt.target)
141- val newReceipt = receipt.target.sendMessage(quote + sendMessage)
142- return SimbotMiraiMessageReceiptImpl (newReceipt)
143- }
14492}
14593
14694
0 commit comments