From d9ae470e062c64f4be2b6d8cea736786cd08bd60 Mon Sep 17 00:00:00 2001
From: LaoLittle <y1941803875@outlook.com>
Date: Mon, 27 Dec 2021 11:06:03 +0800
Subject: [PATCH] update

---
 src/main/kotlin/command/OpenConnection.kt      | 4 ++--
 src/main/kotlin/model/ConnGroupMessageEvent.kt | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/command/OpenConnection.kt b/src/main/kotlin/command/OpenConnection.kt
index 87e9bfe..91d55ae 100644
--- 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
index 7732839..0a01ff2 100644
--- 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()
\ No newline at end of file