Merge remote-tracking branch 'origin/main'

Author: linyuchen

src/ntqqapi/api/group.ts

@@ -73,6 +73,9 @@ export class NTQQGroupApi extends Service {
       ],
       {
         resultCmd: 'nodeIKernelGroupListener/onMemberInfoChange',
+        resultCb: result=> {
+          return result[0] === groupCode && result[2].has(uid)
+        }
       },
     )
     return data[2].get(uid)!

src/ntqqapi/api/user.ts

@@ -55,6 +55,7 @@ export class NTQQUserApi extends Service {
       ],
       {
         resultCmd: 'nodeIKernelProfileListener/onUserDetailInfoChanged',
+        resultCb: payload => payload.simpleInfo.uid === uid,
       },
     )
     return result.simpleInfo

src/ntqqapi/log.ts

@@ -57,12 +57,17 @@ export async function logSummaryMessage(ctx: Context, message: RawMessage) {
     peerName = `群] ${message.peerName}(${message.peerUid}) ${sender}(${senderUin})`
   }
   else if (message.chatType == ChatType.C2C) {
-    const senderInfo = (await ctx.ntUserApi.getUserDetailInfo(message.senderUid)).coreInfo
-    sender = senderInfo.remark || senderInfo.nick
-    peerName = `私] ${sender}(${senderUin})`
+    try {
+      const userUid = message.peerUid
+      const userInfo = (await ctx.ntUserApi.getUserDetailInfo(userUid)).coreInfo
+      sender = userInfo.remark || userInfo.nick
+      peerName = `私] ${sender}(${userInfo.uin})`
+    }catch (e) {
+      return
+    }
   }
   else if (message.chatType == ChatType.TempC2CFromGroup) {
-    peerName = `临] ${sender}(${senderUin})`
+    peerName = `临] ${message.peerName}(${message.peerUin})`
   }
   const padTime = (t: number) => t.toString().padStart(2, '0')
   const logMsg = `[${direction}-${peerName}：\n${summary}`

src/ntqqapi/ntcall.ts

@@ -124,13 +124,13 @@ export function invoke<
         removeReceiveHook(hookId)
         timeoutId && clearTimeout(timeoutId)
       })
-      pmhq.call(funcName, args).then(r => firstResult = r)
+      pmhq.call(funcName, args).then(r => firstResult = r).catch(reject)
     }
     else {
       pmhq.call(funcName, args).then(r=>{
         resolve(r)
         timeoutId && clearTimeout(timeoutId)
-      })
+      }).catch(reject)
     }
   })
 }

src/onebot11/adapter.ts

@@ -206,7 +206,7 @@ class OneBot11Adapter extends Service {
       if (recallEvent) {
         this.dispatch(recallEvent)
       }
-    })
+    }).catch(e => this.ctx.logger.error('handling recall events', e))
   }
 
   private async handleFriendRequest(req: FriendRequest) {