fix: 工具私聊

ikechan8370 · Feb 12, 2025 · 2ad77d8 · 2ad77d8
1 parent 8417008
commit 2ad77d8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/utils/tools/SendDiceTool.js b/utils/tools/SendDiceTool.js
@@ -37,8 +37,11 @@ export class SendDiceTool extends AbstractTool {
         await group.sendMsg(segment.dice())
       }
     } else {
-      let friend = await e.bot.pickFriend(target)
-      await friend.sendMsg(segment.dice())
+      let user = e.bot.pickUser(target)
+      if (e.group_id) {
+        user = user.asMember(e.group_id)
+      }
+      await user.sendMsg(segment.dice())
     }
     if (num === 5) {
       logger.warn(1)

diff --git a/utils/tools/SendMessageToSpecificGroupOrUserTool.js b/utils/tools/SendMessageToSpecificGroupOrUserTool.js
@@ -37,7 +37,11 @@ export class SendMessageToSpecificGroupOrUserTool extends AbstractTool {
         await group.sendMsg(await convertFaces(msg, true, e))
         return 'msg has been sent to group' + target
       } else {
-        let user = await e.bot.pickFriend(target)
+        let user = e.bot.pickUser(target)
+        if (e.group_id) {
+          user = user.asMember(e.group_id)
+        }
+        // let user = await e.bot.pickFriend(target)
         await user.sendMsg(msg)
         return 'msg has been sent to user' + target
       }

diff --git a/utils/tools/SendPictureTool.js b/utils/tools/SendPictureTool.js
@@ -47,7 +47,10 @@ export class SendPictureTool extends AbstractTool {
         await group.sendMsg(pictures)
         return 'picture has been sent to group' + target
       } else {
-        let user = await e.bot.pickFriend(target)
+        let user = e.bot.pickUser(target)
+        if (e.group_id) {
+          user = user.asMember(e.group_id)
+        }
         await user.sendMsg(pictures)
         return 'picture has been sent to user' + target
       }

diff --git a/utils/tools/SendRPSTool.js b/utils/tools/SendRPSTool.js
@@ -30,8 +30,11 @@ export class SendRPSTool extends AbstractTool {
       let group = await e.bot.pickGroup(target, true)
       await group.sendMsg(segment.rps(num))
     } else {
-      let friend = await e.bot.pickFriend(target)
-      await friend.sendMsg(segment.rps(num))
+      let user = e.bot.pickUser(target)
+      if (e.group_id) {
+        user = user.asMember(e.group_id)
+      }
+      await user.sendMsg(segment.rps(num))
     }
   }