enhance: add poke_recall event handling and improve message processing

Author: linyuchen

doc/更新日志.txt

@@ -1,3 +1,12 @@
+V5.7.0
+更新时间
+
+* 新增撤回戳一戳事件，`sub_type: poke_recall`，其他内容与戳一戳一致
+* 修复日志中 message_sent 的 sub_type 没有正确显示
+* 修复 `get_friend_list` 获取不到新加的好友
+
+=================
+
 V5.6.1
 更新时间 2025-8-2 21:04:08
 

src/common/utils/upgrade.ts

@@ -5,8 +5,8 @@ import { log, fetchFile } from '.'
 import { TEMP_DIR } from '../globalVars'
 import { compare } from 'compare-versions'
 
-const downloadMirrors = ['https://ghgo.xyz/']
-const releasesMirrors = ['https://kkgithub.com/']
+const downloadMirrors = ['https://ghfast.top/']
+const releasesMirrors = ['https://ghfast.top/', 'https://kkgithub.com/']
 
 export async function checkNewVersion() {
   const latestVersion = await getRemoteVersion()

src/ntqqapi/core.ts

@@ -231,6 +231,25 @@ class Core extends Service {
       }
     })
 
+    registerReceiveHook<[Peer, string[]]>(ReceiveCmdS.DELETE_MSG, payload => {
+      // 撤回普通消息不会经过这里
+      // 撤回戳一戳会经过这里
+      const [peer, msgIds] = payload;
+      for (const msgId of msgIds) {
+        const msg = this.ctx.store.getMsgCache(msgId)
+        if (!msg) {
+          this.ctx.ntMsgApi.getMsgsByMsgId(peer, [msgId]).then(r=>{
+            for(const _msg of r.msgList) {
+              this.ctx.parallel('nt/message-deleted', _msg)
+            }
+          })
+        }
+        else{
+          this.ctx.parallel('nt/message-deleted', msg)
+        }
+      }
+    })
+
     registerReceiveHook<RawMessage>(ReceiveCmdS.SELF_SEND_MSG, payload => {
       sentMsgIds.set(payload.msgId, true)
     })
@@ -275,7 +294,6 @@ class Core extends Service {
       }
     })
 
-
     registerReceiveHook<number[]>('nodeIKernelMsgListener/onRecvSysMsg', payload => {
       this.ctx.parallel('nt/system-message-created', Uint8Array.from(payload))
     })

src/ntqqapi/hook.ts

@@ -11,6 +11,7 @@ export enum ReceiveCmdS {
   UPDATE_MSG = 'nodeIKernelMsgListener/onMsgInfoListUpdate',
   UPDATE_ACTIVE_MSG = 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
   NEW_MSG = 'nodeIKernelMsgListener/onRecvMsg',
+  DELETE_MSG = 'nodeIKernelMsgListener/onMsgDelete',
   NEW_ACTIVE_MSG = 'nodeIKernelMsgListener/onRecvActiveMsg',
   SELF_SEND_MSG = 'nodeIKernelMsgListener/onAddSendMsg',
   USER_INFO = 'nodeIKernelProfileListener/onProfileSimpleChanged',

src/ntqqapi/types/msg.ts

@@ -292,6 +292,14 @@ export enum GrayTipElementSubType {
   JSON = 17,
 }
 
+export enum JsonGrayTipBusId {
+  AddedFriend = '19324',
+  Poke = '1061',
+  GroupMemberTitleChanged = '2407',
+  GroupEssenceMsg = '2401',
+  GroupNewMemberInvited = '19217',
+}
+
 export interface GrayTipElement {
   subElementType: GrayTipElementSubType
   revokeElement?: {
@@ -308,9 +316,10 @@ export interface GrayTipElement {
   groupElement?: TipGroupElement
   xmlElement?: TipXmlElement
   jsonGrayTipElement?: {
-    busiId: string
+    busiId: JsonGrayTipBusId
     jsonStr: string
     xmlToJsonParam?: {
+      templId: string
       templParam: Map<string, string>
     }
   }

src/onebot11/action/user/GetFriendList.ts

@@ -16,6 +16,7 @@ export class GetFriendList extends BaseAction<Payload, OB11User[]> {
 
   protected async _handle(payload: Payload) {
     const refresh = payload.no_cache
-    return OB11Entities.friendsV2(await this.ctx.ntFriendApi.getBuddyList())
+    return OB11Entities.friendsV2(await this.ctx.ntFriendApi.getBuddyV2(refresh))
+    // return OB11Entities.friendsV2(await this.ctx.ntFriendApi.getBuddyList())
   }
 }

src/onebot11/adapter.ts

@@ -1,6 +1,14 @@
 import { Context, Service } from 'cordis'
 import { OB11Entities } from './entities'
-import { FriendRequest, GroupNotify, GroupNotifyStatus, GroupNotifyType, RawMessage } from '../ntqqapi/types'
+import {
+  ChatType,
+  FriendRequest,
+  GroupNotify,
+  GroupNotifyStatus,
+  GroupNotifyType,
+  JsonGrayTipBusId,
+  RawMessage,
+} from '../ntqqapi/types'
 import { OB11GroupRequestEvent } from './event/request/OB11GroupRequest'
 import { OB11FriendRequestEvent } from './event/request/OB11FriendRequest'
 import { OB11GroupDecreaseEvent } from './event/notice/OB11GroupDecreaseEvent'
@@ -19,9 +27,16 @@ import { OB11GroupIncreaseEvent } from './event/notice/OB11GroupIncreaseEvent'
 import { FlashFileDownloadStatus, FlashFileUploadStatus } from '@/ntqqapi/types/flashfile'
 import {
   OB11FlashFile,
-  OB11FlashFileDownloadedEvent, OB11FlashFileDownloadingEvent,
-  OB11FlashFileUploadedEvent, OB11FlashFileUploadingEvent,
+  OB11FlashFileDownloadedEvent,
+  OB11FlashFileDownloadingEvent,
+  OB11FlashFileUploadedEvent,
+  OB11FlashFileUploadingEvent,
 } from '@/onebot11/event/notice/OB11FlashFileEvent'
+import {
+  OB11FriendPokeEvent,
+  OB11FriendPokeRecallEvent,
+  OB11GroupPokeRecallEvent,
+} from '@/onebot11/event/notice/OB11PokeEvent'
 
 declare module 'cordis' {
   interface Context {
@@ -196,10 +211,33 @@ class OneBot11Adapter extends Service {
       peerUid: message.peerUid,
       chatType: message.chatType,
     }
+    // 解析撤回戳一戳
+    const grayTipElement = message.elements.find(el => el.grayTipElement)?.grayTipElement
+    if (grayTipElement && grayTipElement.jsonGrayTipElement?.busiId == JsonGrayTipBusId.Poke){
+      const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr)
+      const templateParams = grayTipElement.jsonGrayTipElement?.xmlToJsonParam?.templParam
+      const fromUserUin = templateParams?.get('uin_str1') || '0'
+      const toUserUin = templateParams?.get('uin_str2') || '0'
+      let recallEvent: OB11FriendPokeRecallEvent | OB11GroupPokeRecallEvent;
+      if (peer.chatType === ChatType.Group) {
+         recallEvent = new OB11GroupPokeRecallEvent(parseInt(message.peerUid), parseInt(fromUserUin), parseInt(toUserUin), json)
+      }
+      else{
+        recallEvent = new OB11FriendPokeRecallEvent(parseInt(fromUserUin), parseInt(toUserUin), json)
+      }
+      return this.dispatch(recallEvent)
+    }
+    // OB11Entities.privateEvent(this.ctx, message).then(privateEvent => {
+    //   if (privateEvent?.sub_type === 'poke') {
+    //     (privateEvent as OB11FriendPokeEvent).sub_type = 'poke_recall'
+    //     this.dispatch(privateEvent)
+    //   }
+    // })
     const oriMessageId = this.ctx.store.getShortIdByMsgInfo(peer, message.msgId)
     if (!oriMessageId) {
       return
     }
+
     OB11Entities.recallEvent(this.ctx, message, oriMessageId).then((recallEvent) => {
       if (recallEvent) {
         this.dispatch(recallEvent)
@@ -401,6 +439,19 @@ class OneBot11Adapter extends Service {
         const event = new OB11GroupDecreaseEvent(tip.groupCode, userId, userId)
         this.dispatch(event)
       }
+      else if (msgType === 528 && subType === 321) {
+        // 私聊撤回戳一戳，不再从这里解析，应从 nt/message-deleted 事件中解析
+        const fromUin: string = sysMsg.routingHead?.fromUin.low
+        const toUin: string = sysMsg.routingHead?.toUin.low
+      }
+      else if (msgType === 732 && subType === 21) {
+        // 撤回群戳一戳，不再从这里解析，应从 nt/message-deleted 事件中解析
+        const fromUin: string = sysMsg.routingHead?.fromUin.low
+        const toUin: string = sysMsg.routingHead?.toUin.low  // 这个一直都是bot uin
+
+        // 这是个 tlv 格式数据
+        const content = sysMsg.body?.msgContent
+      }
     })
 
     this.ctx.on('nt/flash-file-download-status', input => {

src/onebot11/connect/http.ts

@@ -127,7 +127,7 @@ class OB11Http {
       if (!client.closed) {
         client.write(data)
         if ('post_type' in event) {
-          const eventName = event.post_type + '.' + event[event.post_type + '_type']
+          const eventName = event.getSummaryEventName()
           this.ctx.logger.info('OneBot V11 HTTP SSE 事件上报', eventName)
         }
       }

src/onebot11/connect/ws.ts

@@ -70,7 +70,7 @@ class OB11WebSocket {
     this.wsClients.forEach(({ socket, emitEvent }) => {
       if (emitEvent && socket.readyState === WebSocket.OPEN) {
         socket.send(JSON.stringify(event))
-        const eventName = event.post_type + '.' + event[event.post_type + '_type']
+        const eventName = event.getSummaryEventName()
         this.ctx.logger.info('WebSocket 事件上报', socket.url ?? '', eventName)
       }
     })
@@ -201,7 +201,7 @@ class OB11WebSocketReverse {
   public emitEvent(event: OB11BaseEvent) {
     if (this.wsClient && this.wsClient.readyState === WebSocket.OPEN) {
       this.wsClient.send(JSON.stringify(event))
-      const eventName = event.post_type + '.' + event[event.post_type + '_type']
+      const eventName = event.getSummaryEventName()
       this.ctx.logger.info('WebSocket 事件上报', this.wsClient.url ?? '', eventName)
     }
   }

src/onebot11/entities.ts

@@ -11,10 +11,12 @@ import {
 import {
   AtType,
   ChatType,
-  FaceIndex, FaceType,
+  FaceIndex,
+  FaceType,
   GrayTipElementSubType,
   GroupMember,
   GroupSimpleInfo,
+  JsonGrayTipBusId,
   Peer,
   RawMessage,
   Sex,
@@ -35,7 +37,6 @@ import { OB11FriendRecallNoticeEvent } from './event/notice/OB11FriendRecallNoti
 import { OB11GroupRecallNoticeEvent } from './event/notice/OB11GroupRecallNoticeEvent'
 import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent'
 import { OB11BaseNoticeEvent } from './event/notice/OB11BaseNoticeEvent'
-import { OB11GroupRequestEvent } from './event/request/OB11GroupRequest'
 import { GroupBanEvent } from './event/notice/OB11GroupBanEvent'
 import { GroupMsgEmojiLikeEvent } from './event/notice/OB11MsgEmojiLikeEvent'
 import { GroupEssenceEvent } from './event/notice/OB11GroupEssenceEvent'
@@ -44,6 +45,7 @@ import { Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
 import { pathToFileURL } from 'node:url'
 import OneBot11Adapter from './adapter'
+import { OB11GroupRequestEvent } from '@/onebot11/event/request/OB11GroupRequest'
 
 export namespace OB11Entities {
   export async function message(
@@ -77,6 +79,9 @@ export namespace OB11Entities {
       message: messagePostFormat === 'string' ? '' : [],
       message_format: messagePostFormat === 'string' ? 'string' : 'array',
       post_type: selfUin === msg.senderUin ? EventType.MESSAGE_SENT : EventType.MESSAGE,
+      getSummaryEventName(): string {
+        return this.post_type + '.' + this.message_type
+      }
     }
     if (debug) {
       resMsg.raw = msg
@@ -492,7 +497,7 @@ export namespace OB11Entities {
             )
           }
         }
-        if (grayTipElement.xmlElement?.templId === '10229' || grayTipElement.jsonGrayTipElement?.busiId === '19324') {
+        if (grayTipElement.xmlElement?.templId === '10229' || grayTipElement.jsonGrayTipElement?.busiId === JsonGrayTipBusId.AddedFriend) {
           ctx.logger.info('收到好友添加消息', msg.peerUid)
           const uin = +msg.peerUin || +(await ctx.ntUserApi.getUinByUid(msg.peerUid))
           return new OB11FriendAddNoticeEvent(uin)
@@ -550,15 +555,15 @@ export namespace OB11Entities {
               Number(param.templParam.get('uin_str2')),
               json.items
             )
-          } else if (grayTipElement.jsonGrayTipElement?.busiId === '2401' && json.items[2]) {
+          } else if (grayTipElement.jsonGrayTipElement?.busiId === JsonGrayTipBusId.GroupEssenceMsg && json.items[2]) {
             ctx.logger.info('收到群精华消息', json)
             return await GroupEssenceEvent.parse(ctx, new URL(json.items[2].jp))
-          } else if (grayTipElement.jsonGrayTipElement?.busiId === '2407') {
+          } else if (grayTipElement.jsonGrayTipElement?.busiId === JsonGrayTipBusId.GroupMemberTitleChanged) {
             ctx.logger.info('收到群成员新头衔消息', json)
             const memberUin = json.items[1].param[0]
             const title = json.items[3].txt
             return new OB11GroupTitleEvent(parseInt(msg.peerUid), parseInt(memberUin), title)
-          } else if (grayTipElement.jsonGrayTipElement?.busiId === '19217') {
+          } else if (grayTipElement.jsonGrayTipElement?.busiId === JsonGrayTipBusId.GroupNewMemberInvited) {
             ctx.logger.info('收到新人被邀请进群消息', grayTipElement)
             const userId = new URL(json.items[2].jp).searchParams.get('robot_uin')
             const operatorId = new URL(json.items[0].jp).searchParams.get('uin')