chore(core): 优化群组发送

diyigemt · Aug 9, 2023 · bddefc2 · bddefc2
1 parent a4e4450
commit bddefc2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/arona-core/src/main/kotlin/net/diyigemt/arona/Arona.kt b/arona-core/src/main/kotlin/net/diyigemt/arona/Arona.kt
@@ -34,10 +34,12 @@ import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.NormalMember
 import net.mamoe.mirai.contact.UserOrBot
-import net.mamoe.mirai.event.*
+import net.mamoe.mirai.event.Event
+import net.mamoe.mirai.event.EventChannel
 import net.mamoe.mirai.event.events.BotOnlineEvent
 import net.mamoe.mirai.event.events.GroupMessageEvent
 import net.mamoe.mirai.event.events.NudgeEvent
+import net.mamoe.mirai.event.globalEventChannel
 import net.mamoe.mirai.message.code.MiraiCode.deserializeMiraiCode
 import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.utils.info
@@ -170,11 +172,13 @@ object Arona : KotlinPlugin(
       sendMessageWithFile(block)
     } else {
       runWithArona {
-        groups.forEach { group0 ->
-          val group = it.groups[group0] ?: return@forEach
-          val message = block(group)
-          group.sendMessage(message)
-        }
+        groups
+          .intersect(AronaConfig.groups.toSet())
+          .forEach { group0 ->
+            val group = it.groups[group0] ?: return@forEach
+            val message = block(group)
+            group.sendMessage(message)
+          }
       }
     }
   }

diff --git a/arona-core/src/test/kotlin/TestSimple.kt b/arona-core/src/test/kotlin/TestSimple.kt
@@ -194,4 +194,11 @@ class TestSimple {
     }
   }
 
-}
+  @Test
+  fun testIntersect() {
+    val listA = listOf(1, 2, 3)
+    val listB = listOf(3, 4, 5)
+    println(listB.intersect(listA))
+  }
+
+}