update

LaoLittle · Dec 27, 2021 · d9ae470 · d9ae470
1 parent 00a0a69
commit d9ae470
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/kotlin/command/OpenConnection.kt b/src/main/kotlin/command/OpenConnection.kt
@@ -60,8 +60,8 @@ object OpenConnection : SimpleCommand(
         }
         group.sendMessage("正在等待目标群 ${target.name} 同意...")
         GlobalEventChannel.subscribe<GroupMessageEvent> {
-            if (subject == target)
-                if (message.content == "同意") {
+            if (message.content == "同意")
+                if (subject == target) {
                     if (sender.isOperator()) {
                         connectedGroups.add(group)
                         connectedGroups.add(target)

diff --git a/src/main/kotlin/model/ConnGroupMessageEvent.kt b/src/main/kotlin/model/ConnGroupMessageEvent.kt
@@ -1,19 +1,19 @@
 package org.laolittle.plugin.groupconn.model
 
 import net.mamoe.mirai.contact.Group
-import net.mamoe.mirai.contact.User
+import net.mamoe.mirai.contact.Member
 import net.mamoe.mirai.event.AbstractEvent
 import net.mamoe.mirai.message.data.MessageChain
 
 data class ConnGroupMessageEvent(
     val message: MessageChain,
-    val sender: User,
+    val sender: Member,
     val group: Group,
     val target: Group
 ) : AbstractEvent()
 
 data class ConnGroupDisconnectEvent(
     val group: Group,
-    val sender: User
+    val sender: Member
 ) : AbstractEvent()
 // val connectingGroups: MutableSet<Group> = mutableSetOf()