github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-22 13:46:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix group detection; fix #1661

Browse Source
This commit is contained in:
Karlatemp 2021-11-12 21:33:44 +08:00
parent 92ab2bf50b
commit 4db04e2a76
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binary-compatibility-validator/android/api/binary-compatibility-validator-android.api
View File

@ -5027,7 +5027,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$
public final fun getGroup ()Lnet/mamoe/mirai/contact/Group; public final fun getGroup ()Lnet/mamoe/mirai/contact/Group;
public abstract fun getSender ()Lnet/mamoe/mirai/contact/Member; public abstract fun getSender ()Lnet/mamoe/mirai/contact/Member;
public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact; public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact;
public final fun getSubject ()Lnet/mamoe/mirai/contact/Group; public fun getSubject ()Lnet/mamoe/mirai/contact/Group;
public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot; public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot;
public final fun getTarget ()Lnet/mamoe/mirai/contact/Group; public final fun getTarget ()Lnet/mamoe/mirai/contact/Group;
} }

2
binary-compatibility-validator/api/binary-compatibility-validator.api
View File

@ -5027,7 +5027,7 @@ public abstract class net/mamoe/mirai/message/data/OnlineMessageSource$Incoming$
public final fun getGroup ()Lnet/mamoe/mirai/contact/Group; public final fun getGroup ()Lnet/mamoe/mirai/contact/Group;
public abstract fun getSender ()Lnet/mamoe/mirai/contact/Member; public abstract fun getSender ()Lnet/mamoe/mirai/contact/Member;
public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact; public synthetic fun getSubject ()Lnet/mamoe/mirai/contact/Contact;
public final fun getSubject ()Lnet/mamoe/mirai/contact/Group; public fun getSubject ()Lnet/mamoe/mirai/contact/Group;
public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot; public synthetic fun getTarget ()Lnet/mamoe/mirai/contact/ContactOrBot;
public final fun getTarget ()Lnet/mamoe/mirai/contact/Group; public final fun getTarget ()Lnet/mamoe/mirai/contact/Group;
} }

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

@ -558,9 +558,9 @@ public sealed class OnlineMessageSource : MessageSource() { // TODO: 2021/1/10 E
AbstractPolymorphicMessageKey<Incoming, FromGroup>(Incoming, { it.safeCast() }) AbstractPolymorphicMessageKey<Incoming, FromGroup>(Incoming, { it.safeCast() })
public abstract override val sender: Member public abstract override val sender: Member
public final override val subject: Group get() = sender.group public override val subject: Group get() = sender.group
public final override val target: Group get() = group public final override val target: Group get() = subject
public inline val group: Group get() = sender.group public inline val group: Group get() = subject
} }
public companion object Key : public companion object Key :

6
mirai-core/src/commonMain/kotlin/MiraiImpl.kt
View File

@ -467,9 +467,9 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
is OnlineMessageSourceToGroupImpl, is OnlineMessageSourceToGroupImpl,
is OnlineMessageSourceFromGroupImpl is OnlineMessageSourceFromGroupImpl
-> { -> {
val group = when (source) { val group: Group = when (source) {
is OnlineMessageSourceToGroupImpl -> source.target is OnlineMessageSourceToGroupImpl -> source.subject
is OnlineMessageSourceFromGroupImpl -> source.group is OnlineMessageSourceFromGroupImpl -> source.subject
else -> error("stub") else -> error("stub")
} }
if (bot.id != source.fromId) { if (bot.id != source.fromId) {

9
mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt
View File

@ -18,6 +18,7 @@ import net.mamoe.mirai.contact.Friend
import net.mamoe.mirai.contact.Member import net.mamoe.mirai.contact.Member
import net.mamoe.mirai.contact.Stranger import net.mamoe.mirai.contact.Stranger
import net.mamoe.mirai.internal.asQQAndroidBot import net.mamoe.mirai.internal.asQQAndroidBot
import net.mamoe.mirai.internal.contact.GroupImpl
import net.mamoe.mirai.internal.contact.checkIsGroupImpl import net.mamoe.mirai.internal.contact.checkIsGroupImpl
import net.mamoe.mirai.internal.contact.newAnonymous import net.mamoe.mirai.internal.contact.newAnonymous
import net.mamoe.mirai.internal.getGroupByUinOrCodeOrFail import net.mamoe.mirai.internal.getGroupByUinOrCodeOrFail
@ -174,13 +175,19 @@ internal class OnlineMessageSourceFromGroupImpl(
} }
override val originalMessage: MessageChain get() = originalMessageLazy.value override val originalMessage: MessageChain get() = originalMessageLazy.value
override val sender: Member by lazy { override val subject: GroupImpl by lazy {
val groupCode = msg.first().msgHead.groupInfo?.groupCode val groupCode = msg.first().msgHead.groupInfo?.groupCode
?: error("cannot find groupCode for OnlineMessageSourceFromGroupImpl. msg=${msg._miraiContentToString()}") ?: error("cannot find groupCode for OnlineMessageSourceFromGroupImpl. msg=${msg._miraiContentToString()}")
val group = bot.getGroup(groupCode)?.checkIsGroupImpl() val group = bot.getGroup(groupCode)?.checkIsGroupImpl()
?: error("cannot find group for OnlineMessageSourceFromGroupImpl. msg=${msg._miraiContentToString()}") ?: error("cannot find group for OnlineMessageSourceFromGroupImpl. msg=${msg._miraiContentToString()}")
group
}
override val sender: Member by lazy {
val group = subject
val member = group[msg.first().msgHead.fromUin] val member = group[msg.first().msgHead.fromUin]
if (member != null) return@lazy member if (member != null) return@lazy member