EventManager: fix BotJoinGroupEvent threads

iTXTech · Sep 9, 2020 · df38050 · df38050
1 parent 6a9a315
commit df38050
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/src/main/kotlin/org/itxtech/mirainative/manager/EventManager.kt b/src/main/kotlin/org/itxtech/mirainative/manager/EventManager.kt
@@ -129,23 +129,27 @@ object EventManager {
                     )
                 }
             }
-            subscribeAlways<BotJoinGroupEvent.Invite> { ev ->
-                NativeBridge.eventGroupMemberJoin(
-                    Bridge.MEMBER_JOIN_INVITED_BY_ADMIN,
-                    getTimestamp(),
-                    group.id,
-                    ev.invitor.id,
-                    bot.id
-                )
+            subscribeAlways<BotJoinGroupEvent.Invite> {
+                launchEvent {
+                    NativeBridge.eventGroupMemberJoin(
+                        Bridge.MEMBER_JOIN_INVITED_BY_ADMIN,
+                        getTimestamp(),
+                        group.id,
+                        invitor.id,
+                        bot.id
+                    )
+                }
             }
             subscribeAlways<BotJoinGroupEvent.Active> {
-                NativeBridge.eventGroupMemberJoin(
-                    Bridge.MEMBER_JOIN_INVITED_BY_ADMIN,
-                    getTimestamp(),
-                    group.id,
-                    0,
-                    bot.id
-                )
+                launchEvent {
+                    NativeBridge.eventGroupMemberJoin(
+                        Bridge.MEMBER_JOIN_INVITED_BY_ADMIN,
+                        getTimestamp(),
+                        group.id,
+                        0,
+                        bot.id
+                    )
+                }
             }
 
             //加好友事件
@@ -191,11 +195,11 @@ object EventManager {
                     )
                 }
             }
-            subscribeAlways<BotLeaveEvent.Kick> { ev ->
+            subscribeAlways<BotLeaveEvent.Kick> {
                 launchEvent {
                     NativeBridge.eventGroupMemberLeave(
                         Bridge.MEMBER_LEAVE_KICK,
-                        getTimestamp(), group.id, ev.operator.id, bot.id
+                        getTimestamp(), group.id, operator.id, bot.id
                     )
                 }
             }