Merge pull request #6 from lz1998/master

lz1998 · web-flow · commit d5ba1112ca9c · 2020-10-05T16:29:35.000+08:00
group/friend request/notice
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -28,7 +28,7 @@ plugins {
 }
 
 group = "net.lz1998"
-version = "0.0.8"
+version = "0.0.9"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 configurations {
diff --git a/src/main/kotlin/net/lz1998/mirai/entity/WebSocketBotClient.kt b/src/main/kotlin/net/lz1998/mirai/entity/WebSocketBotClient.kt
@@ -6,16 +6,14 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.lz1998.mirai.alias.BFrame
 import net.lz1998.mirai.alias.BFrameType
-import net.lz1998.mirai.ext.fileStrBasedDeviceInfo
-import net.lz1998.mirai.ext.friendRequestLru
-import net.lz1998.mirai.ext.groupRequestLru
-import net.lz1998.mirai.ext.messageSourceLru
+import net.lz1998.mirai.ext.*
 import net.lz1998.mirai.service.MyLoginSolver
 import net.lz1998.mirai.utils.*
 import net.lz1998.mirai.utils.toFrame
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.alsoLogin
 import net.mamoe.mirai.event.events.BotEvent
+import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent
 import net.mamoe.mirai.event.events.MemberJoinRequestEvent
 import net.mamoe.mirai.event.events.NewFriendRequestEvent
 import net.mamoe.mirai.event.subscribeAlways
@@ -112,6 +110,9 @@ class WebsocketBotClient(override var botId: Long, override var password: String
         bot.subscribeAlways<MemberJoinRequestEvent> {
             bot.groupRequestLru.put(it.eventId, it)
         }
+        bot.subscribeAlways<BotInvitedJoinGroupRequestEvent> {
+            bot.botInvitedGroupRequestLru.put(it.eventId, it)
+        }
         bot.subscribeAlways<NewFriendRequestEvent> {
             bot.friendRequestLru.put(it.eventId, it)
         }
diff --git a/src/main/kotlin/net/lz1998/mirai/ext/Bot.kt b/src/main/kotlin/net/lz1998/mirai/ext/Bot.kt
@@ -2,19 +2,27 @@ package net.lz1998.mirai.ext
 
 import com.fasterxml.jackson.databind.util.LRUMap
 import net.mamoe.mirai.Bot
+import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent
 import net.mamoe.mirai.event.events.MemberJoinRequestEvent
 import net.mamoe.mirai.event.events.NewFriendRequestEvent
 import net.mamoe.mirai.message.data.MessageSource
 
+// 消息记录，用于撤回
 val messageLru = LRUMap<Int, MessageSource>(128, 2048)
 val Bot.messageSourceLru
     get() = messageLru
 
-
+// 别人加群请求
 val memberJoinRequestEventLru = LRUMap<Long, MemberJoinRequestEvent>(16, 128)
 val Bot.groupRequestLru
     get() = memberJoinRequestEventLru
 
+// 机器人自己被邀请进群请求
+val botInvitedJoinGroupRequestEventLru = LRUMap<Long, BotInvitedJoinGroupRequestEvent>(8, 32)
+val Bot.botInvitedGroupRequestLru
+    get() = botInvitedJoinGroupRequestEventLru
+
+// 添加好友请求
 val newFriendRequestEventLru = LRUMap<Long, NewFriendRequestEvent>(16, 128)
 val Bot.friendRequestLru
     get() = newFriendRequestEventLru
diff --git a/src/main/kotlin/net/lz1998/mirai/utils/ApiHandler.kt b/src/main/kotlin/net/lz1998/mirai/utils/ApiHandler.kt
@@ -1,6 +1,7 @@
 package net.lz1998.mirai.utils
 
 import net.lz1998.mirai.alias.*
+import net.lz1998.mirai.ext.botInvitedGroupRequestLru
 import net.lz1998.mirai.ext.friendRequestLru
 import net.lz1998.mirai.ext.groupRequestLru
 import net.lz1998.mirai.ext.messageSourceLru
@@ -113,8 +114,12 @@ suspend fun handleSetFriendAddRequest(bot: Bot, req: BSetFriendAddRequestReq): B
 suspend fun handleSetGroupAddRequest(bot: Bot, req: BSetGroupAddRequestReq): BSetGroupAddRequestResp? {
     val approve = req.approve
     val flag = req.flag
-    val request = bot.groupRequestLru[flag.toLongOrNull()] ?: return null
-    if (approve) request.accept() else request.reject()
+    bot.groupRequestLru[flag.toLongOrNull()]?.let {
+        if (approve) it.accept() else it.reject()
+    }
+    bot.botInvitedGroupRequestLru[flag.toLongOrNull()]?.let {
+        if (approve) it.accept() else it.ignore()
+    }
     return BSetGroupAddRequestResp.newBuilder().build()
 }
 
diff --git a/src/main/kotlin/net/lz1998/mirai/utils/EventConverter.kt b/src/main/kotlin/net/lz1998/mirai/utils/EventConverter.kt
@@ -9,7 +9,12 @@ suspend fun BotEvent.toFrame(): BFrame? = when (this) {
     is GroupMessageEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
     is FriendMessageEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
     is MemberJoinEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
+    is BotJoinGroupEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
     is MemberLeaveEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
+    is MemberJoinRequestEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
+    is BotInvitedJoinGroupRequestEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
+    is NewFriendRequestEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
+    is FriendAddEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
     else -> null
 }
 
@@ -86,6 +91,27 @@ fun MemberJoinEvent.toProtoMessage(): BGroupIncreaseNoticeEvent {
             .build()
 }
 
+fun BotJoinGroupEvent.toProtoMessage(): BGroupIncreaseNoticeEvent {
+    val subType = when (this) {
+        is BotJoinGroupEvent.Invite -> "invite"
+        else -> "approve"
+    }
+    val operatorId = when (this) {
+        is BotJoinGroupEvent.Invite -> this.invitor.id
+        else -> 0L
+    }
+    return BGroupIncreaseNoticeEvent.newBuilder()
+            .setTime(System.currentTimeMillis())
+            .setSelfId(bot.id)
+            .setPostType("notice")
+            .setNoticeType("group_increase")
+            .setSubType(subType)
+            .setGroupId(this.group.id)
+            .setOperatorId(operatorId)
+            .setUserId(bot.id)
+            .build()
+}
+
 fun MemberLeaveEvent.toProtoMessage(): BGroupDecreaseNoticeEvent {
     val operatorId: Long
     val subType = when (this) {
@@ -110,10 +136,62 @@ fun MemberLeaveEvent.toProtoMessage(): BGroupDecreaseNoticeEvent {
             .build()
 }
 
+fun MemberJoinRequestEvent.toProtoMessage(): BGroupRequestEvent {
+    return BGroupRequestEvent.newBuilder()
+            .setTime(System.currentTimeMillis())
+            .setSelfId(bot.id)
+            .setPostType("request")
+            .setRequestType("group")
+            .setSubType("add")
+            .setGroupId(this.groupId)
+            .setUserId(this.fromId)
+            .setComment(this.message)
+            .setFlag(this.eventId.toString())
+            .build()
+}
+
+fun BotInvitedJoinGroupRequestEvent.toProtoMessage(): BGroupRequestEvent {
+    return BGroupRequestEvent.newBuilder()
+            .setTime(System.currentTimeMillis())
+            .setSelfId(bot.id)
+            .setPostType("request")
+            .setRequestType("group")
+            .setSubType("invite")
+            .setGroupId(this.groupId)
+            .setUserId(this.invitorId)
+            .setFlag(this.eventId.toString())
+            .build()
+}
+
+fun NewFriendRequestEvent.toProtoMessage(): BFriendRequestEvent {
+    return BFriendRequestEvent.newBuilder()
+            .setTime(System.currentTimeMillis())
+            .setSelfId(bot.id)
+            .setPostType("request")
+            .setRequestType("friend")
+            .setUserId(this.fromId)
+            .setComment(this.message)
+            .setFlag(this.eventId.toString())
+            .build()
+}
+
+fun FriendAddEvent.toProtoMessage(): BFriendAddNoticeEvent {
+    return BFriendAddNoticeEvent.newBuilder()
+            .setTime(System.currentTimeMillis())
+            .setSelfId(bot.id)
+            .setPostType("notice")
+            .setNoticeType("friend_add")
+            .setUserId(this.friend.id)
+            .build()
+}
+
 fun BGroupMessageEvent.toProtoFrame(botId: Long): BFrame = BFrame.newBuilder().setBotId(botId).setFrameType(BFrameType.GroupMessageEvent).setGroupMessageEvent(this).build()
 fun BPrivateMessageEvent.toProtoFrame(botId: Long): BFrame = BFrame.newBuilder().setBotId(botId).setFrameType(BFrameType.PrivateMessageEvent).setPrivateMessageEvent(this).build()
 fun BGroupIncreaseNoticeEvent.toProtoFrame(botId: Long): BFrame = BFrame.newBuilder().setBotId(botId).setFrameType(BFrameType.GroupIncreaseNoticeEvent).setGroupIncreaseNoticeEvent(this).build()
 fun BGroupDecreaseNoticeEvent.toProtoFrame(botId: Long): BFrame = BFrame.newBuilder().setBotId(botId).setFrameType(BFrameType.GroupDecreaseNoticeEvent).setGroupDecreaseNoticeEvent(this).build()
+fun BGroupRequestEvent.toProtoFrame(botId: Long): BFrame = BFrame.newBuilder().setBotId(botId).setFrameType(BFrameType.GroupRequestEvent).setGroupRequestEvent(this).build()
+fun BFriendRequestEvent.toProtoFrame(botId: Long): BFrame = BFrame.newBuilder().setBotId(botId).setFrameType(BFrameType.FriendRequestEvent).setFriendRequestEvent(this).build()
+fun BFriendAddNoticeEvent.toProtoFrame(botId: Long): BFrame = BFrame.newBuilder().setBotId(botId).setFrameType(BFrameType.FriendAddNoticeEvent).setFriendAddNoticeEvent(this).build()
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ plugins {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`group = "net.lz1998"`
`31`		`-version = "0.0.8"`
	`31`	`+version = "0.0.9"`
`32`	`32`	`java.sourceCompatibility = JavaVersion.VERSION_1_8`
`33`	`33`
`34`	`34`	`configurations {`