From 2ad77d8112f7716c2e6f05dfea348d4b2a3cad32 Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Wed, 12 Feb 2025 15:43:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A5=E5=85=B7=E7=A7=81=E8=81=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/tools/SendDiceTool.js                         | 7 +++++--
 utils/tools/SendMessageToSpecificGroupOrUserTool.js | 6 +++++-
 utils/tools/SendPictureTool.js                      | 5 ++++-
 utils/tools/SendRPSTool.js                          | 7 +++++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/utils/tools/SendDiceTool.js b/utils/tools/SendDiceTool.js
index ae3df91..400cb4f 100644
--- 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
index d445d3f..220d538 100644
--- 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
index dc9da3f..2af3bbc 100644
--- 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
index 0481ba3..762946c 100644
--- 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))
     }
   }