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

Fix MessageSource.key, add MessageSource.isAboutFriend and MessageSource.isAboutGroup

Browse Source
This commit is contained in:
Him188 2020-04-07 09:00:39 +08:00
parent 0aaeaea793
commit a797dac5ba
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageSource.kt
View File

@ -9,7 +9,7 @@
@file:JvmMultifileClass
@file:JvmName("MessageUtils")
@file:Suppress("NOTHING_TO_INLINE")
@file:Suppress("NOTHING_TO_INLINE", "unused")
package net.mamoe.mirai.message.data
@ -40,13 +40,15 @@ import kotlin.jvm.JvmSynthetic
* @see OnlineMessageSource 在线消息的 [MessageSource]
* @see OfflineMessageSource 离线消息的 [MessageSource]
*/
@OptIn(MiraiExperimentalAPI::class)
@SinceMirai("0.33.0")
sealed class MessageSource : Message, MessageMetadata {
sealed class MessageSource : Message, MessageMetadata, ConstrainSingle<OnlineMessageSource> {
companion object Key : Message.Key<MessageSource> {
override val typeName: String
get() = "MessageSource"
override val typeName: String get() = "MessageSource"
}
final override val key: Message.Key<OnlineMessageSource> get() = OnlineMessageSource
/**
* 所属 [Bot]
*/
@ -107,14 +109,11 @@ sealed class MessageSource : Message, MessageMetadata {
*/
@SinceMirai("0.33.0")
@OptIn(MiraiExperimentalAPI::class)
sealed class OnlineMessageSource : MessageSource(), ConstrainSingle<OnlineMessageSource> {
sealed class OnlineMessageSource : MessageSource() {
companion object Key : Message.Key<OnlineMessageSource> {
override val typeName: String
get() = "OnlineMessageSource"
override val typeName: String get() = "OnlineMessageSource"
}
override val key: Message.Key<OnlineMessageSource> get() = Key
/**
* 消息发送人. 可能为 [机器人][Bot] 或 [好友][QQ] 或 [群员][Member].
* 即类型必定为 [Bot], [QQ] 或 [Member]
@ -138,8 +137,7 @@ sealed class OnlineMessageSource : MessageSource(), ConstrainSingle<OnlineMessag
*/
sealed class Outgoing : OnlineMessageSource() {
companion object Key : Message.Key<Outgoing> {
override val typeName: String
get() = "OnlineMessageSource.Outgoing"
override val typeName: String get() = "OnlineMessageSource.Outgoing"
}
abstract override val sender: Bot
@ -150,8 +148,7 @@ sealed class OnlineMessageSource : MessageSource(), ConstrainSingle<OnlineMessag
abstract class ToFriend : Outgoing() {
companion object Key : Message.Key<ToFriend> {
override val typeName: String
get() = "OnlineMessageSource.Outgoing.ToFriend"
override val typeName: String get() = "OnlineMessageSource.Outgoing.ToFriend"
}
abstract override val target: QQ
@ -161,8 +158,7 @@ sealed class OnlineMessageSource : MessageSource(), ConstrainSingle<OnlineMessag
abstract class ToGroup : Outgoing() {
companion object Key : Message.Key<ToGroup> {
override val typeName: String
get() = "OnlineMessageSource.Outgoing.ToGroup"
override val typeName: String get() = "OnlineMessageSource.Outgoing.ToGroup"
}
abstract override val target: Group
@ -211,6 +207,22 @@ sealed class OnlineMessageSource : MessageSource(), ConstrainSingle<OnlineMessag
}
}
// inline for future removal
inline fun MessageSource.isAboutGroup(): Boolean {
return when (this) {
is OnlineMessageSource -> subject is Group
is OfflineMessageSource -> kind == OfflineMessageSource.Kind.GROUP
}
}
// inline for future removal
inline fun MessageSource.isAboutFriend(): Boolean {
return when (this) {
is OnlineMessageSource -> subject !is Group
is OfflineMessageSource -> kind == OfflineMessageSource.Kind.FRIEND
}
}
/**
* 引用这条消息
*/