fix: 修复一点点好友戳一戳

clansty · Dec 18, 2024 · 64940dd · 64940dd
1 parent 1eeb755
commit 64940dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/main/src/client/NapCatClient/client.ts b/main/src/client/NapCatClient/client.ts
@@ -154,7 +154,8 @@ export class NapCatClient extends QQClient {
   }
 
   private async handlePoke(data: WSReceiveHandler['notice.notify.poke.group'] | WSReceiveHandler['notice.notify.poke.friend']) {
-    const chat = 'group_id' in data ? await this.pickGroup(data.group_id) : await this.pickFriend(data.user_id);
+    const nonSelfId = data.user_id === this.uin ? data.target_id : data.user_id;
+    const chat = 'group_id' in data ? await this.pickGroup(data.group_id) : await this.pickFriend(nonSelfId);
     const operator = 'sender_id' in data ? data.sender_id as number : data.user_id;
     const nors: any[] = data.raw_info?.filter(it => (it.type as any) === 'nor') || [];
     const event = new PokeEvent(chat, operator, data.target_id, nors[0]?.txt, nors[1]?.txt);
@@ -249,7 +250,7 @@ export class NapCatClient extends QQClient {
         message: {
           type: 'text',
           text: title,
-        }
+        },
       });
     }
     return res;

diff --git a/main/src/services/ForwardService.ts b/main/src/services/ForwardService.ts
@@ -671,7 +671,7 @@ export default class ForwardService {
       const tempFiles: FileResult[] = [];
       let chain: (string | SendableElem)[] = [];
       const senderId = Number(message.senderId || message.sender?.id) || helper.peerToId(message.peerId);
-      console.debug('senderId', senderId);
+      this.log.debug('senderId', senderId);
       // 这条消息在 tg 中被回复的时候显示的
       let brief = '', isSpoilerPhoto = false;
       let userDisplayName = helper.getUserDisplayName(message.sender);