Merge pull request #2 from lz1998/master

friend group request

Author: lz1998

build.gradle.kts

@@ -26,7 +26,7 @@ plugins {
 }
 
 group = "net.lz1998"
-version = "0.0.3"
+version = "0.0.6"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 configurations {

src/main/kotlin/net/lz1998/mirai/entity/WebSocketBotClient.kt

@@ -4,13 +4,17 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import net.lz1998.mirai.ext.friendRequestLru
+import net.lz1998.mirai.ext.groupRequestLru
 import net.lz1998.mirai.ext.messageSourceLru
 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.MemberJoinRequestEvent
+import net.mamoe.mirai.event.events.NewFriendRequestEvent
 import net.mamoe.mirai.event.subscribeAlways
 import net.mamoe.mirai.message.MessageEvent
 import okhttp3.*
@@ -103,6 +107,12 @@ class WebsocketBotClient(override var botId: Long, override var password: String
             val messageSource = this.source // 撤回消息用
             bot.messageSourceLru.put(messageSource.id, messageSource)
         }
+        bot.subscribeAlways<MemberJoinRequestEvent> {
+            bot.groupRequestLru.put(it.eventId, it)
+        }
+        bot.subscribeAlways<NewFriendRequestEvent> {
+            bot.friendRequestLru.put(it.eventId, it)
+        }
     }
 
     override suspend fun login() {
@@ -125,6 +135,8 @@ class WebsocketBotClient(override var botId: Long, override var password: String
             OnebotFrame.Frame.MessageType.SetGroupNameReq -> respBuilder.setGroupNameResp = handleSetGroupName(bot, req.setGroupNameReq)
             OnebotFrame.Frame.MessageType.SetGroupLeaveReq -> respBuilder.setGroupLeaveResp = handleSetGroupLeave(bot, req.setGroupLeaveReq)
             OnebotFrame.Frame.MessageType.SetGroupSpecialTitleReq -> respBuilder.setGroupSpecialTitleResp = handleSetGroupSpecialTitle(bot, req.setGroupSpecialTitleReq)
+            OnebotFrame.Frame.MessageType.SetFriendAddRequestReq -> respBuilder.setFriendAddRequestResp = handleSetFriendAddRequest(bot, req.setFriendAddRequestReq)
+            OnebotFrame.Frame.MessageType.SetGroupAddRequestReq -> respBuilder.setGroupAddRequestResp = handleSetGroupAddRequest(bot, req.setGroupAddRequestReq)
             OnebotFrame.Frame.MessageType.GetLoginInfoReq -> respBuilder.getLoginInfoResp = handleGetLoginInfo(bot, req.getLoginInfoReq)
             OnebotFrame.Frame.MessageType.GetFriendListReq -> respBuilder.getFriendListResp = handleGetFriendList(bot, req.getFriendListReq)
             OnebotFrame.Frame.MessageType.GetGroupInfoReq -> respBuilder.getGroupInfoResp = handleGetGroupInfo(bot, req.getGroupInfoReq)

src/main/kotlin/net/lz1998/mirai/ext/Bot.kt

@@ -2,8 +2,19 @@ package net.lz1998.mirai.ext
 
 import com.fasterxml.jackson.databind.util.LRUMap
 import net.mamoe.mirai.Bot
+import net.mamoe.mirai.event.events.MemberJoinRequestEvent
+import net.mamoe.mirai.event.events.NewFriendRequestEvent
 import net.mamoe.mirai.message.data.MessageSource
 
-val lru = LRUMap<Int, MessageSource>(128, 1024)
+val messageLru = LRUMap<Int, MessageSource>(128, 2048)
 val Bot.messageSourceLru
-    get() = lru
+    get() = messageLru
+
+
+val memberJoinRequestEventLru = LRUMap<Long, MemberJoinRequestEvent>(16, 128)
+val Bot.groupRequestLru
+    get() = memberJoinRequestEventLru
+
+val newFriendRequestEventLru = LRUMap<Long, NewFriendRequestEvent>(16, 128)
+val Bot.friendRequestLru
+    get() = newFriendRequestEventLru

src/main/kotlin/net/lz1998/mirai/utils/ApiHandler.kt

@@ -1,5 +1,7 @@
 package net.lz1998.mirai.utils
 
+import net.lz1998.mirai.ext.friendRequestLru
+import net.lz1998.mirai.ext.groupRequestLru
 import net.lz1998.mirai.ext.messageSourceLru
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.MemberPermission
@@ -100,7 +102,21 @@ suspend fun handleSetGroupSpecialTitle(bot: Bot, req: OnebotApi.SetGroupSpecialT
     return OnebotApi.SetGroupSpecialTitleResp.newBuilder().build()
 }
 
-// TODO 处理好友/群请求
+suspend fun handleSetFriendAddRequest(bot: Bot, req: OnebotApi.SetFriendAddRequestReq): OnebotApi.SetFriendAddRequestResp? {
+    val approve = req.approve
+    val flag = req.flag
+    val request = bot.friendRequestLru[flag.toLongOrNull()] ?: return null
+    if (approve) request.accept() else request.reject()
+    return OnebotApi.SetFriendAddRequestResp.newBuilder().build()
+}
+
+suspend fun handleSetGroupAddRequest(bot: Bot, req: OnebotApi.SetGroupAddRequestReq): OnebotApi.SetGroupAddRequestResp? {
+    val approve = req.approve
+    val flag = req.flag
+    val request = bot.groupRequestLru[flag.toLongOrNull()] ?: return null
+    if (approve) request.accept() else request.reject()
+    return OnebotApi.SetGroupAddRequestResp.newBuilder().build()
+}
 
 suspend fun handleGetLoginInfo(bot: Bot, req: OnebotApi.GetLoginInfoReq): OnebotApi.GetLoginInfoResp {
     return OnebotApi.GetLoginInfoResp.newBuilder().setUserId(bot.id).setNickname(bot.nick).build()