github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-24 14:30:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add more details in MessageSource.toString

Browse Source
This commit is contained in:
Him188 2022-05-23 17:40:30 +01:00
parent 3e38f359ba
commit 7687749030
3 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mirai-core-api/compatibility-validation/android/api/android.api
View File

@ -4842,7 +4842,7 @@ public abstract class net/mamoe/mirai/message/data/MessageSource : net/mamoe/mir
public static final fun recall (Lnet/mamoe/mirai/message/data/MessageSource;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public static final fun recallIn (Lnet/mamoe/mirai/message/data/MessageChain;J)Lnet/mamoe/mirai/message/action/AsyncRecallResult;
public static final fun recallIn (Lnet/mamoe/mirai/message/data/MessageSource;J)Lnet/mamoe/mirai/message/action/AsyncRecallResult;
public final fun toString ()Ljava/lang/String;
public abstract fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/MessageSource$Key : net/mamoe/mirai/message/data/AbstractMessageKey {
@ -5079,6 +5079,7 @@ public abstract class net/mamoe/mirai/message/data/OfflineMessageSource : net/ma
public static final field Key Lnet/mamoe/mirai/message/data/OfflineMessageSource$Key;
public fun <init> ()V
public abstract fun getKind ()Lnet/mamoe/mirai/message/data/MessageSourceKind;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OfflineMessageSource$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5118,6 +5119,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$
public final fun getSubject ()Lnet/mamoe/mirai/contact/Friend;
public final fun getTarget ()Lnet/mamoe/mirai/Bot;
public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$FromFriend$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5131,6 +5133,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$
public fun getSubject ()Lnet/mamoe/mirai/contact/Group;
public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot;
public final fun getTarget ()Lnet/mamoe/mirai/contact/Group;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$FromGroup$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5143,6 +5146,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$
public final fun getSubject ()Lnet/mamoe/mirai/contact/Stranger;
public final fun getTarget ()Lnet/mamoe/mirai/Bot;
public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$FromStranger$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5156,6 +5160,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$
public final fun getSubject ()Lnet/mamoe/mirai/contact/Member;
public final fun getTarget ()Lnet/mamoe/mirai/Bot;
public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$FromTemp$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5183,6 +5188,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$
public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact;
public final fun getSubject ()Lnet/mamoe/mirai/contact/Friend;
public abstract fun getTarget ()Lnet/mamoe/mirai/contact/Friend;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$ToFriend$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5193,6 +5199,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$
public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact;
public final fun getSubject ()Lnet/mamoe/mirai/contact/Group;
public abstract fun getTarget ()Lnet/mamoe/mirai/contact/Group;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$ToGroup$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5203,6 +5210,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$
public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact;
public final fun getSubject ()Lnet/mamoe/mirai/contact/Stranger;
public abstract fun getTarget ()Lnet/mamoe/mirai/contact/Stranger;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$ToStranger$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5214,6 +5222,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$
public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact;
public final fun getSubject ()Lnet/mamoe/mirai/contact/Member;
public abstract fun getTarget ()Lnet/mamoe/mirai/contact/Member;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$ToTemp$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {

11
mirai-core-api/compatibility-validation/jvm/api/jvm.api
View File

@ -4842,7 +4842,7 @@ public abstract class net/mamoe/mirai/message/data/MessageSource : net/mamoe/mir
public static final fun recall (Lnet/mamoe/mirai/message/data/MessageSource;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public static final fun recallIn (Lnet/mamoe/mirai/message/data/MessageChain;J)Lnet/mamoe/mirai/message/action/AsyncRecallResult;
public static final fun recallIn (Lnet/mamoe/mirai/message/data/MessageSource;J)Lnet/mamoe/mirai/message/action/AsyncRecallResult;
public final fun toString ()Ljava/lang/String;
public abstract fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/MessageSource$Key : net/mamoe/mirai/message/data/AbstractMessageKey {
@ -5079,6 +5079,7 @@ public abstract class net/mamoe/mirai/message/data/OfflineMessageSource : net/ma
public static final field Key Lnet/mamoe/mirai/message/data/OfflineMessageSource$Key;
public fun <init> ()V
public abstract fun getKind ()Lnet/mamoe/mirai/message/data/MessageSourceKind;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OfflineMessageSource$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5118,6 +5119,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$
public final fun getSubject ()Lnet/mamoe/mirai/contact/Friend;
public final fun getTarget ()Lnet/mamoe/mirai/Bot;
public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$FromFriend$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5131,6 +5133,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$
public fun getSubject ()Lnet/mamoe/mirai/contact/Group;
public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot;
public final fun getTarget ()Lnet/mamoe/mirai/contact/Group;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$FromGroup$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5143,6 +5146,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$
public final fun getSubject ()Lnet/mamoe/mirai/contact/Stranger;
public final fun getTarget ()Lnet/mamoe/mirai/Bot;
public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$FromStranger$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5156,6 +5160,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$
public final fun getSubject ()Lnet/mamoe/mirai/contact/Member;
public final fun getTarget ()Lnet/mamoe/mirai/Bot;
public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$FromTemp$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5183,6 +5188,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$
public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact;
public final fun getSubject ()Lnet/mamoe/mirai/contact/Friend;
public abstract fun getTarget ()Lnet/mamoe/mirai/contact/Friend;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$ToFriend$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5193,6 +5199,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$
public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact;
public final fun getSubject ()Lnet/mamoe/mirai/contact/Group;
public abstract fun getTarget ()Lnet/mamoe/mirai/contact/Group;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$ToGroup$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5203,6 +5210,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$
public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact;
public final fun getSubject ()Lnet/mamoe/mirai/contact/Stranger;
public abstract fun getTarget ()Lnet/mamoe/mirai/contact/Stranger;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$ToStranger$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
@ -5214,6 +5222,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$
public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact;
public final fun getSubject ()Lnet/mamoe/mirai/contact/Member;
public abstract fun getTarget ()Lnet/mamoe/mirai/contact/Member;
public final fun toString ()Ljava/lang/String;
}
public final class net/mamoe/mirai/message/data/OnlineMessageSource$Outgoing$ToTemp$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {

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

@ -180,11 +180,7 @@ public sealed class MessageSource : Message, MessageMetadata, ConstrainSingle {
*/
public abstract val originalMessage: MessageChain // see OutgoingMessageSourceInternal.originalMessage
/**
* 返回 `"[mirai:source:${ids.contentToString()},${internalIds.contentToString()}]"`
*/
public final override fun toString(): String =
"[mirai:source:${ids.contentToString()},${internalIds.contentToString()}]"
public abstract override fun toString(): String
@MiraiInternalApi
override fun <D, R> accept(visitor: MessageVisitor<D, R>, data: D): R {
@ -486,7 +482,10 @@ public sealed class OnlineMessageSource : MessageSource() { // TODO: 2021/1/10 E
public abstract override val target: Friend
public final override val subject: Friend get() = target
// final override fun toString(): String = "OnlineMessageSource.ToFriend(target=${target.ids})"
final override fun toString(): String {
return "[mirai:source:ids=${ids.contentToString()}, internalIds=${internalIds.contentToString()}, from $fromId to friend $targetId at $time]"
}
}
@NotStableForInheritance
@ -496,7 +495,10 @@ public sealed class OnlineMessageSource : MessageSource() { // TODO: 2021/1/10 E
public abstract override val target: Stranger
public final override val subject: Stranger get() = target
// final override fun toString(): String = "OnlineMessageSource.ToFriend(target=${target.ids})"
final override fun toString(): String {
return "[mirai:source:ids=${ids.contentToString()}, internalIds=${internalIds.contentToString()}, from $fromId to stranger $targetId at $time]"
}
}
@NotStableForInheritance
@ -506,6 +508,10 @@ public sealed class OnlineMessageSource : MessageSource() { // TODO: 2021/1/10 E
public abstract override val target: Member
public val group: Group get() = target.group
public final override val subject: Member get() = target
final override fun toString(): String {
return "[mirai:source:ids=${ids.contentToString()}, internalIds=${internalIds.contentToString()}, from $fromId to group temp $targetId at $time]"
}
}
@NotStableForInheritance
@ -514,6 +520,10 @@ public sealed class OnlineMessageSource : MessageSource() { // TODO: 2021/1/10 E
public abstract override val target: Group
public final override val subject: Group get() = target
final override fun toString(): String {
return "[mirai:source:ids=${ids.contentToString()}, internalIds=${internalIds.contentToString()}, from $fromId to group $targetId at $time]"
}
}
}
@ -534,7 +544,10 @@ public sealed class OnlineMessageSource : MessageSource() { // TODO: 2021/1/10 E
public abstract override val sender: Friend
public final override val subject: Friend get() = sender
public final override val target: Bot get() = sender.bot
// final override fun toString(): String = "OnlineMessageSource.FromFriend(from=${sender.ids})"
final override fun toString(): String {
return "[mirai:source:ids=${ids.contentToString()}, internalIds=${internalIds.contentToString()}, from friend $fromId to $targetId at $time]"
}
}
@NotStableForInheritance
@ -546,6 +559,9 @@ public sealed class OnlineMessageSource : MessageSource() { // TODO: 2021/1/10 E
public inline val group: Group get() = sender.group
public final override val subject: Member get() = sender
public final override val target: Bot get() = sender.bot
final override fun toString(): String {
return "[mirai:source:ids=${ids.contentToString()}, internalIds=${internalIds.contentToString()}, from group temp $fromId to $targetId at $time]"
}
}
@NotStableForInheritance
@ -556,6 +572,10 @@ public sealed class OnlineMessageSource : MessageSource() { // TODO: 2021/1/10 E
public abstract override val sender: Stranger
public final override val subject: Stranger get() = sender
public final override val target: Bot get() = sender.bot
final override fun toString(): String {
return "[mirai:source:ids=${ids.contentToString()}, internalIds=${internalIds.contentToString()}, from stranger $fromId to $targetId at $time]"
}
}
@NotStableForInheritance
@ -567,6 +587,10 @@ public sealed class OnlineMessageSource : MessageSource() { // TODO: 2021/1/10 E
public override val subject: Group get() = sender.group
public final override val target: Group get() = subject
public inline val group: Group get() = subject
final override fun toString(): String {
return "[mirai:source:ids=${ids.contentToString()}, internalIds=${internalIds.contentToString()}, from group $fromId to $targetId at $time]"
}
}
public companion object Key :
@ -590,4 +614,8 @@ public abstract class OfflineMessageSource : MessageSource() { // TODO: 2021/1/1
* 消息种类
*/
public abstract val kind: MessageSourceKind
final override fun toString(): String {
return "[mirai:source:ids=${ids.contentToString()}, internalIds=${internalIds.contentToString()}, from $fromId to $targetId at $time]"
}
}