optimize

src/ntqqapi/core.ts

@@ -173,9 +173,10 @@ class Core extends Service {
     })
 
     registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], payload => {
+      const startTime = this.startTime / 1000
       for (const message of payload.msgList) {
         // 过滤启动之前的消息
-        if (parseInt(message.msgTime) < this.startTime / 1000) {
+        if (parseInt(message.msgTime) < startTime) {
           continue
         }
         if (message.senderUin && message.senderUin !== '0') {
@@ -202,16 +203,18 @@ class Core extends Service {
           this.ctx.parallel('nt/message-deleted', msg)
         } else if (sentMsgIds.get(msg.msgId)) {
           sentMsgIds.delete(msg.msgId)
+          if (msg.sendStatus === 2) {
             this.ctx.parallel('nt/message-sent', msg)
           }
         }
+      }
     })
 
     registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, payload => {
       sentMsgIds.set(payload.msgRecord.msgId, true)
     })
 
-    const groupNotifyFlags: string[] = []
+    const groupNotifyIgnore: string[] = []
     registerReceiveHook<{
       doubt: boolean
       oldestUnreadSeq: string
@@ -225,13 +228,11 @@ class Core extends Service {
           return
         }
         for (const notify of notifies) {
-          const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type
+          const notifyTime = Math.trunc(+notify.seq / 1000)
-          const notifyTime = parseInt(notify.seq) / 1000
+          if (groupNotifyIgnore.includes(notify.seq) || notifyTime < this.startTime) {
-          if (groupNotifyFlags.includes(flag) || notifyTime < this.startTime) {
             continue
           }
-          groupNotifyFlags.shift()
+          groupNotifyIgnore.push(notify.seq)
-          groupNotifyFlags.push(flag)
           this.ctx.parallel('nt/group-notify', notify)
         }
       }

src/ntqqapi/types/msg.ts

@@ -438,6 +438,10 @@ export interface RawMessage {
     likesCnt: string
     isClicked: boolean
   }[]
+  msgAttrs: Map<number, {
+    attrType: number
+    attrId: string
+  }>
 }
 
 export interface Peer {

src/onebot11/action/user/SetFriendAddRequest.ts

@@ -23,11 +23,11 @@ export default class SetFriendAddRequest extends BaseAction<Payload, null> {
     if (payload.remark) {
       await this.ctx.ntFriendApi.setBuddyRemark(uid, payload.remark)
     }
-    await this.ctx.ntMsgApi.activateChat({
+    /*await this.ctx.ntMsgApi.activateChat({
       peerUid: uid,
       chatType: ChatType.C2C,
       guildId: ''
-    })
+    })*/
     return null
   }
 }

src/onebot11/entities.ts

@@ -71,7 +71,7 @@ export namespace OB11Entities {
       sub_type: 'friend',
       message: messagePostFormat === 'string' ? '' : [],
       message_format: messagePostFormat === 'string' ? 'string' : 'array',
-      post_type: selfUin == msg.senderUin ? EventType.MESSAGE_SENT : EventType.MESSAGE,
+      post_type: selfUin === msg.senderUin ? EventType.MESSAGE_SENT : EventType.MESSAGE,
     }
     if (debug) {
       resMsg.raw = msg
@@ -376,11 +376,23 @@ export namespace OB11Entities {
     if (msg.chatType !== ChatType.C2C) {
       return
     }
+    if (msg.msgType !== 5) {
+      return
+    }
+
     for (const element of msg.elements) {
       if (element.grayTipElement) {
         const { grayTipElement } = element
         if (grayTipElement.jsonGrayTipElement?.busiId === '1061') {
           const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr)
+          const param = grayTipElement.jsonGrayTipElement.xmlToJsonParam
+          if (param) {
+            return new OB11FriendPokeEvent(
+              Number(param.templParam.get('uin_str1')),
+              Number(param.templParam.get('uin_str2')),
+              json.items
+            )
+          }
           const pokedetail: Dict[] = json.items
           //筛选item带有uid的元素
           const poke_uid = pokedetail.filter(item => item.uid)
@@ -405,31 +417,15 @@ export namespace OB11Entities {
     if (msg.chatType !== ChatType.Group) {
       return
     }
-    /**if (msg.senderUin) {
+    if (msg.msgType !== 5 && msg.msgType !== 3) {
-      const member = await ctx.ntGroupApi.getGroupMember(msg.peerUid, msg.senderUin)
+      return
-      if (member && member.cardName !== msg.sendMemberName) {
-        const event = new OB11GroupCardEvent(
-          parseInt(msg.peerUid),
-          parseInt(msg.senderUin),
-          msg.sendMemberName!,
-          member.cardName,
-        )
-        member.cardName = msg.sendMemberName!
-        return event
     }
-    }*/
+
     for (const element of msg.elements) {
       const grayTipElement = element.grayTipElement
       const groupElement = grayTipElement?.groupElement
       if (groupElement) {
-        if (groupElement.type === TipGroupElementType.MemberIncrease) {
+        if (groupElement.type === TipGroupElementType.Ban) {
-          /*ctx.logger.info('收到群成员增加消息', groupElement)
-          const { memberUid, adminUid } = groupElement
-          const memberUin = await ctx.ntUserApi.getUinByUid(memberUid)
-          const operatorUin = adminUid ? await ctx.ntUserApi.getUinByUid(adminUid) : memberUin
-          return new OB11GroupIncreaseEvent(+msg.peerUid, +memberUin, +operatorUin)*/
-        }
-        else if (groupElement.type === TipGroupElementType.Ban) {
           ctx.logger.info('收到群成员禁言提示', groupElement)
           const memberUid = groupElement.shutUp?.member.uid
           const adminUid = groupElement.shutUp?.admin.uid