Merge pull request #448 from LLOneBot/dev

release: 3.33.8

manifest.json

@@ -4,7 +4,7 @@
   "name": "LLOneBot",
   "slug": "LLOneBot",
   "description": "实现 OneBot 11 协议，用于 QQ 机器人开发",
-  "version": "3.33.2",
+  "version": "3.33.8",
   "icon": "./icon.webp",
   "authors": [
     {

package.json

@@ -18,7 +18,6 @@
   "license": "MIT",
   "dependencies": {
     "@minatojs/driver-sqlite": "^4.6.0",
-    "compressing": "^1.10.1",
     "cordis": "^3.18.1",
     "cors": "^2.8.5",
     "cosmokit": "^1.6.2",
@@ -41,8 +40,8 @@
     "electron-vite": "^2.3.0",
     "protobufjs-cli": "^1.1.3",
     "typescript": "^5.6.2",
-    "vite": "^5.4.6",
+    "vite": "^5.4.7",
     "vite-plugin-cp": "^4.0.8"
   },
-  "packageManager": "yarn@4.4.1"
+  "packageManager": "yarn@4.5.0"
 }

src/common/utils/file.ts

@@ -6,14 +6,6 @@ import { randomUUID, createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
 import { fileTypeFromFile } from 'file-type'
 
-export function isGIF(path: string) {
-  const buffer = Buffer.alloc(4)
-  const fd = fs.openSync(path, 'r')
-  fs.readSync(fd, buffer, 0, 4, 0)
-  fs.closeSync(fd)
-  return buffer.toString() === 'GIF8'
-}
-
 // 定义一个异步函数来检查文件是否存在
 export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
   return new Promise((resolve, reject) => {
@@ -198,26 +190,3 @@ export async function uri2local(uri: string, filename?: string, needExt?: boolea
 
   return { success: false, errMsg: '未知文件类型', fileName: '', path: '', isLocal: false }
 }
-
-export async function copyFolder(sourcePath: string, destPath: string) {
-  try {
-    const entries = await fsPromise.readdir(sourcePath, { withFileTypes: true })
-    await fsPromise.mkdir(destPath, { recursive: true })
-    for (const entry of entries) {
-      const srcPath = path.join(sourcePath, entry.name)
-      const dstPath = path.join(destPath, entry.name)
-      if (entry.isDirectory()) {
-        await copyFolder(srcPath, dstPath)
-      } else {
-        try {
-          await fsPromise.copyFile(srcPath, dstPath)
-        } catch (error) {
-          console.error(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`)
-          // 这里可以决定是否要继续复制其他文件
-        }
-      }
-    }
-  } catch (error) {
-    console.error('复制文件夹时出错:', error)
-  }
-}

src/common/utils/misc.ts

@@ -12,8 +12,9 @@ export function calcQQLevel(level: QQLevel) {
 
 /** QQ Build Version  */
 export function getBuildVersion(): number {
-  const version: string = globalThis.LiteLoader.versions.qqnt
-  return +version.split('-')[1]
+  //const version: string = globalThis.LiteLoader.versions.qqnt
+  //return +version.split('-')[1]
+  return +globalThis.LiteLoader.package.qqnt.buildVersion
 }
 
 /** 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象 */
@@ -37,3 +38,10 @@ export function mergeNewProperties(newObj: Dict, oldObj: Dict) {
 export function filterNullable<T>(array: T[]) {
   return array.filter(e => !isNullable(e)) as NonNullable<T>[]
 }
+
+export function parseBool(value: string) {
+  if (['', 'true', '1'].includes(value)) {
+    return true
+  }
+  return false
+}

src/common/utils/upgrade.ts

@@ -1,9 +1,8 @@
 import path from 'node:path'
-import compressing from 'compressing'
 import { writeFile } from 'node:fs/promises'
 import { version } from '../../version'
-import { copyFolder, log, fetchFile } from '.'
-import { PLUGIN_DIR, TEMP_DIR } from '../globalVars'
+import { log, fetchFile } from '.'
+import { TEMP_DIR } from '../globalVars'
 
 const downloadMirrorHosts = ['https://ghp.ci/']
 const releasesMirrorHosts = ['https://kkgithub.com']
@@ -27,49 +26,21 @@ export async function checkNewVersion() {
   return { result: false, version: version }
 }
 
-export async function upgradeLLOneBot() {
+export async function upgradeLLOneBot(): Promise<boolean> {
   const latestVersion = await getRemoteVersion()
   if (latestVersion && latestVersion != '') {
     const downloadUrl = `https://github.com/LLOneBot/LLOneBot/releases/download/v${latestVersion}/LLOneBot.zip`
     const filePath = path.join(TEMP_DIR, './update-' + latestVersion + '.zip')
-    let downloadSuccess = false
     // 多镜像下载
     for (const mirrorGithub of downloadMirrorHosts) {
       try {
         const res = await fetchFile(mirrorGithub + downloadUrl)
         await writeFile(filePath, res.data)
-        downloadSuccess = true
-        break
+        return globalThis.LiteLoader.api.plugin.install(filePath)
       } catch (e) {
         log('llonebot upgrade error', e)
       }
     }
-    if (!downloadSuccess) {
-      log('llonebot upgrade error', 'download failed')
-      return false
-    }
-    const temp_ver_dir = path.join(TEMP_DIR, 'LLOneBot' + latestVersion)
-    const uncompressedPromise = async function () {
-      return new Promise<boolean>(resolve => {
-        compressing.zip
-          .uncompress(filePath, temp_ver_dir)
-          .then(() => {
-            resolve(true)
-          })
-          .catch(reason => {
-            log('llonebot upgrade failed, ', reason)
-            if (reason?.errno == -4082) {
-              resolve(true)
-            }
-            resolve(false)
-          })
-      })
-    }
-    const uncompressedResult = await uncompressedPromise()
-    // 复制文件
-    await copyFolder(temp_ver_dir, PLUGIN_DIR)
-
-    return uncompressedResult
   }
   return false
 }

src/main/store.ts

@@ -30,7 +30,7 @@ export default class Store extends Service {
 
   constructor(protected ctx: Context) {
     super(ctx, 'store', true)
-    this.cache = new LimitedHashTable<string, number>(1000)
+    this.cache = new LimitedHashTable(1000)
     this.initDatabase()
   }
 

src/ntqqapi/api/file.ts

@@ -23,7 +23,6 @@ import { fileTypeFromFile } from 'file-type'
 import { copyFile, stat, unlink } from 'node:fs/promises'
 import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
-import { TEMP_DIR } from '@/common/globalVars'
 
 declare module 'cordis' {
   interface Context {
@@ -73,7 +72,7 @@ export class NTQQFileApi extends Service {
   }
 
   // 上传文件到QQ的文件夹
-  async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType = 0) {
+  async uploadFile(filePath: string, elementType = ElementType.Pic, elementSubType = 0) {
     const fileMd5 = await calculateFileMD5(filePath)
     let fileName = path.basename(filePath)
     if (!fileName.includes('.')) {
@@ -107,8 +106,8 @@ export class NTQQFileApi extends Service {
     chatType: ChatType,
     peerUid: string,
     elementId: string,
-    thumbPath: string,
-    sourcePath: string,
+    thumbPath = '',
+    sourcePath = '',
     timeout = 1000 * 60 * 2,
     force = false
   ) {
@@ -147,13 +146,7 @@ export class NTQQFileApi extends Service {
         timeout
       }
     )
-    let filePath = data.notifyInfo.filePath
-    if (filePath.startsWith('\\')) {
-      const downloadPath = TEMP_DIR
-      filePath = path.join(downloadPath, filePath)
-      // 下载路径是下载文件夹的相对路径
-    }
-    return filePath
+    return data.notifyInfo.filePath
   }
 
   async getImageSize(filePath: string) {
@@ -201,6 +194,27 @@ export class NTQQFileApi extends Service {
     this.ctx.logger.error('图片url获取失败', element)
     return ''
   }
+
+  async downloadFileForModelId(peer: Peer, fileModelId: string, timeout = 2 * Time.minute) {
+    const data = await invoke<{ notifyInfo: OnRichMediaDownloadCompleteParams }>(
+      'nodeIKernelRichMediaService/downloadFileForModelId',
+      [
+        {
+          peer,
+          fileModelIdList: [fileModelId],
+          save_path: ''
+        },
+        null,
+      ],
+      {
+        cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
+        cmdCB: payload => payload.notifyInfo.fileModelId === fileModelId,
+        timeout,
+        afterFirstCmd: false
+      }
+    )
+    return data.notifyInfo.filePath
+  }
 }
 
 export class NTQQFileCacheApi extends Service {
@@ -222,7 +236,7 @@ export class NTQQFileCacheApi extends Service {
   }
 
   scanCache() {
-    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { classNameIsRegister: true })
+    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { registerEvent: true })
     return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [null, null], { timeout: 300 * Time.second })
   }
 

src/ntqqapi/api/friend.ts

@@ -1,8 +1,7 @@
-import { Friend, FriendV2, SimpleInfo, CategoryFriend } from '../types'
+import { Friend, FriendV2, SimpleInfo, CategoryFriend, BuddyListReqType } from '../types'
 import { ReceiveCmdS } from '../hook'
 import { invoke, NTMethod, NTClass } from '../ntcall'
 import { getSession } from '@/ntqqapi/wrapper'
-import { BuddyListReqType } from '../services'
 import { Dict, pick } from 'cosmokit'
 import { Service, Context } from 'cordis'
 
@@ -62,117 +61,60 @@ export class NTQQFriendApi extends Service {
   }
 
   async getBuddyV2(refresh = false): Promise<FriendV2[]> {
-    const session = getSession()
-    if (session) {
-      const uids: string[] = []
-      const buddyService = session.getBuddyService()
-      const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
-      uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
-      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
-      return Array.from(data.values())
-    } else {
-      const data = await invoke<{
-        buddyCategory: CategoryFriend[]
-        userSimpleInfos: Record<string, SimpleInfo>
-      }>(
-        'getBuddyList',
-        [refresh],
-        {
-          className: NTClass.NODE_STORE_API,
-          cbCmd: ReceiveCmdS.FRIENDS,
-          afterFirstCmd: false,
-        }
-      )
-      const uids = data.buddyCategory.flatMap(item => item.buddyUids)
-      return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!))
-    }
+    const data = await invoke<{
+      buddyCategory: CategoryFriend[]
+      userSimpleInfos: Record<string, SimpleInfo>
+    }>(
+      'getBuddyList',
+      [refresh],
+      {
+        className: NTClass.NODE_STORE_API,
+        cbCmd: ReceiveCmdS.FRIENDS,
+        afterFirstCmd: false,
+      }
+    )
+    const uids = data.buddyCategory.flatMap(item => item.buddyUids)
+    return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!))
   }
 
   /** uid => uin */
   async getBuddyIdMap(refresh = false): Promise<Map<string, string>> {
     const retMap: Map<string, string> = new Map()
-    const session = getSession()
-    if (session) {
-      const uids: string[] = []
-      const buddyService = session.getBuddyService()
-      const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
-      uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
-      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
-      for (const [, item] of data) {
-        if (retMap.size > 5000) {
-          break
-        }
-        retMap.set(item.uid!, item.uin!)
+    const data = await invoke<{
+      buddyCategory: CategoryFriend[]
+      userSimpleInfos: Record<string, SimpleInfo>
+    }>(
+      'getBuddyList',
+      [refresh],
+      {
+        className: NTClass.NODE_STORE_API,
+        cbCmd: ReceiveCmdS.FRIENDS,
+        afterFirstCmd: false,
       }
-    } else {
-      const data = await invoke<{
-        buddyCategory: CategoryFriend[]
-        userSimpleInfos: Record<string, SimpleInfo>
-      }>(
-        'getBuddyList',
-        [refresh],
-        {
-          className: NTClass.NODE_STORE_API,
-          cbCmd: ReceiveCmdS.FRIENDS,
-          afterFirstCmd: false,
-        }
-      )
-      for (const item of Object.values(data.userSimpleInfos)) {
-        if (retMap.size > 5000) {
-          break
-        }
-        retMap.set(item.uid!, item.uin!)
+    )
+    for (const item of Object.values(data.userSimpleInfos)) {
+      if (retMap.size > 5000) {
+        break
       }
+      retMap.set(item.uid!, item.uin!)
     }
     return retMap
   }
 
-  async getBuddyV2ExWithCate(refresh = false) {
-    const session = getSession()
-    if (session) {
-      const uids: string[] = []
-      const categoryMap: Map<string, Dict> = new Map()
-      const buddyService = session.getBuddyService()
-      const buddyListV2 = (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data
-      uids.push(
-        ...buddyListV2.flatMap(item => {
-          item.buddyUids.forEach(uid => {
-            categoryMap.set(uid, { categoryId: item.categoryId, categroyName: item.categroyName })
-          })
-          return item.buddyUids
-        }))
-      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
-      return Array.from(data).map(([key, value]) => {
-        const category = categoryMap.get(key)
-        return category ? { ...value, categoryId: category.categoryId, categroyName: category.categroyName } : value
-      })
-    } else {
-      const data = await invoke<{
-        buddyCategory: CategoryFriend[]
-        userSimpleInfos: Record<string, SimpleInfo>
-      }>(
-        'getBuddyList',
-        [refresh],
-        {
-          className: NTClass.NODE_STORE_API,
-          cbCmd: ReceiveCmdS.FRIENDS,
-          afterFirstCmd: false,
-        }
-      )
-      const category: Map<number, Pick<CategoryFriend, 'buddyUids' | 'categroyName'>> = new Map()
-      for (const item of data.buddyCategory) {
-        category.set(item.categoryId, pick(item, ['buddyUids', 'categroyName']))
+  async getBuddyV2WithCate(refresh = false) {
+    const data = await invoke<{
+      buddyCategory: CategoryFriend[]
+      userSimpleInfos: Record<string, SimpleInfo>
+    }>(
+      'getBuddyList',
+      [refresh],
+      {
+        className: NTClass.NODE_STORE_API,
+        cbCmd: ReceiveCmdS.FRIENDS,
+        afterFirstCmd: false,
       }
-      return Object.values(data.userSimpleInfos)
-        .filter(v => v.baseInfo && category.get(v.baseInfo.categoryId)?.buddyUids.includes(v.uid!))
-        .map(value => {
-          return {
-            ...value,
-            categoryId: value.baseInfo.categoryId,
-            categroyName: category.get(value.baseInfo.categoryId)?.categroyName
-          }
-        })
-    }
+    )
+    return data
   }
 
   async isBuddy(uid: string): Promise<boolean> {

src/ntqqapi/api/group.ts

@@ -7,7 +7,8 @@ import {
   GroupRequestOperateTypes,
   GetFileListParam,
   OnGroupFileInfoUpdateParams,
-  PublishGroupBulletinReq
+  PublishGroupBulletinReq,
+  GroupAllInfo
 } from '../types'
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
@@ -65,32 +66,30 @@ export class NTQQGroupApi extends Service {
     return result.result.infos
   }
 
-  async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
-    const groupCodeStr = groupCode.toString()
-    const memberUinOrUidStr = memberUinOrUid.toString()
-    if (!this.groupMembers.has(groupCodeStr)) {
+  async getGroupMember(groupCode: string, memberUinOrUid: string) {
+    if (!this.groupMembers.has(groupCode)) {
       try {
         // 更新群成员列表
-        this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
+        this.groupMembers.set(groupCode, await this.getGroupMembers(groupCode))
       }
       catch (e) {
-        return null
+        return
       }
     }
-    let members = this.groupMembers.get(groupCodeStr)!
+    let members = this.groupMembers.get(groupCode)!
     const getMember = () => {
       let member: GroupMember | undefined = undefined
-      if (isNumeric(memberUinOrUidStr)) {
-        member = Array.from(members.values()).find(member => member.uin === memberUinOrUidStr)
+      if (isNumeric(memberUinOrUid)) {
+        member = Array.from(members.values()).find(member => member.uin === memberUinOrUid)
       } else {
-        member = members.get(memberUinOrUidStr)
+        member = members.get(memberUinOrUid)
       }
       return member
     }
     let member = getMember()
     if (!member) {
-      this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
-      members = this.groupMembers.get(groupCodeStr)!
+      this.groupMembers.set(groupCode, await this.getGroupMembers(groupCode))
+      members = this.groupMembers.get(groupCode)!
       member = getMember()
     }
     return member
@@ -106,12 +105,11 @@ export class NTQQGroupApi extends Service {
   }
 
   async getSingleScreenNotifies(num: number) {
-    invoke(ReceiveCmdS.GROUP_NOTIFY, [], { classNameIsRegister: true })
+    invoke(ReceiveCmdS.GROUP_NOTIFY, [], { registerEvent: true })
     return (await invoke<GroupNotifies>(
       'nodeIKernelGroupService/getSingleScreenNotifies',
       [{ doubt: false, startSeq: '', number: num }, null],
       {
-
         cbCmd: ReceiveCmdS.GROUP_NOTIFY,
         afterFirstCmd: false,
       }
@@ -159,12 +157,7 @@ export class NTQQGroupApi extends Service {
     }
   }
 
-  async kickMember(
-    groupCode: string,
-    kickUids: string[],
-    refuseForever = false,
-    kickReason = '',
-  ) {
+  async kickMember(groupCode: string, kickUids: string[], refuseForever = false, kickReason = '') {
     const session = getSession()
     if (session) {
       return session.getGroupService().kickMember(groupCode, kickUids, refuseForever, kickReason)
@@ -220,17 +213,7 @@ export class NTQQGroupApi extends Service {
   }
 
   async getGroupRemainAtTimes(groupCode: string) {
-    return await invoke<
-      GeneralCallResult & {
-        atInfo: {
-          canAtAll: boolean
-          RemainAtAllCountForUin: number
-          RemainAtAllCountForGroup: number
-          atTimesMsg: string
-          canNotAtAllMsg: ''
-        }
-      }
-    >(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }, null])
+    return await invoke(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }, null])
   }
 
   async removeGroupEssence(groupCode: string, msgId: string) {
@@ -290,7 +273,7 @@ export class NTQQGroupApi extends Service {
   }
 
   async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
-    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { classNameIsRegister: true })
+    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { registerEvent: true })
     const data = await invoke<{ fileInfo: OnGroupFileInfoUpdateParams }>(
       'nodeIKernelRichMediaService/getGroupFileList',
       [
@@ -306,7 +289,7 @@ export class NTQQGroupApi extends Service {
         cmdCB: (payload, result) => payload.fileInfo.reqId === result
       }
     )
-    return data.fileInfo.item
+    return data.fileInfo
   }
 
   async publishGroupBulletin(groupCode: string, req: PublishGroupBulletinReq) {
@@ -335,4 +318,33 @@ export class NTQQGroupApi extends Service {
       }
     }, null])
   }
+
+  async getGroupHonorList(groupCode: string) {
+    // 还缺点东西
+    return await invoke('nodeIKernelGroupService/getGroupHonorList', [{
+      req: {
+        groupCode: [+groupCode]
+      }
+    }, null])
+  }
+
+  async getGroupAllInfo(groupCode: string, timeout = 1000) {
+    invoke('nodeIKernelGroupListener/onGroupAllInfoChange', [], { registerEvent: true })
+    return await invoke<{ groupAll: GroupAllInfo }>(
+      'nodeIKernelGroupService/getGroupAllInfo',
+      [
+        {
+          groupCode,
+          source: 4
+        },
+        null
+      ],
+      {
+        cbCmd: 'nodeIKernelGroupListener/onGroupAllInfoChange',
+        afterFirstCmd: false,
+        cmdCB: payload => payload.groupAll.groupCode === groupCode,
+        timeout
+      }
+    )
+  }
 }

src/ntqqapi/api/msg.ts

@@ -1,6 +1,6 @@
 import { invoke, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
-import { RawMessage, SendMessageElement, Peer, ChatType2 } from '../types'
+import { RawMessage, SendMessageElement, Peer, ChatType } from '../types'
 import { getSession } from '@/ntqqapi/wrapper'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
@@ -11,16 +11,6 @@ declare module 'cordis' {
   }
 }
 
-function generateMsgId() {
-  const timestamp = Math.floor(Date.now() / 1000)
-  const random = Math.floor(Math.random() * Math.pow(2, 32))
-  const buffer = Buffer.alloc(8)
-  buffer.writeUInt32BE(timestamp, 0)
-  buffer.writeUInt32BE(random, 4)
-  const msgId = BigInt('0x' + buffer.toString('hex')).toString()
-  return msgId
-}
-
 export class NTQQMsgApi extends Service {
   static inject = ['ntUserApi']
 
@@ -28,7 +18,7 @@ export class NTQQMsgApi extends Service {
     super(ctx, 'ntMsgApi', true)
   }
 
-  async getTempChatInfo(chatType: ChatType2, peerUid: string) {
+  async getTempChatInfo(chatType: ChatType, peerUid: string) {
     const session = getSession()
     if (session) {
       return session.getMsgService().getTempChatInfo(chatType, peerUid)
@@ -60,7 +50,7 @@ export class NTQQMsgApi extends Service {
   }
 
   async activateChat(peer: Peer) {
-    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 20 }, null])
+    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 1 }, null])
   }
 
   async activateChatAndGetHistory(peer: Peer) {
@@ -102,7 +92,7 @@ export class NTQQMsgApi extends Service {
   }
 
   async sendMsg(peer: Peer, msgElements: SendMessageElement[], timeout = 10000) {
-    const msgId = generateMsgId()
+    const msgId = await this.generateMsgUniqueId(peer.chatType)
     peer.guildId = msgId
     const data = await invoke<{ msgList: RawMessage[] }>(
       'nodeIKernelMsgService/sendMsg',
@@ -275,4 +265,14 @@ export class NTQQMsgApi extends Service {
       forceRefresh: true
     }, null])
   }
+
+  async generateMsgUniqueId(chatType: number) {
+    const uniqueId = await invoke('nodeIKernelMsgService/generateMsgUniqueId', [{ chatType }])
+    if (typeof uniqueId === 'string') {
+      return uniqueId
+    } else {
+      const random = Math.trunc(Math.random() * 100)
+      return `${Date.now()}${random}`
+    }
+  }
 }

src/ntqqapi/api/user.ts

@@ -1,9 +1,8 @@
+import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg, UserDetailSource, ProfileBizType } from '../types'
 import { invoke } from '../ntcall'
-import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg } from '../types'
 import { getBuildVersion } from '@/common/utils'
 import { getSession } from '@/ntqqapi/wrapper'
 import { RequestUtil } from '@/common/utils/request'
-import { UserDetailSource, ProfileBizType } from '../services'
 import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
@@ -157,30 +156,24 @@ export class NTQQUserApi extends Service {
     return uid
   }
 
-  async getUidByUinV2(uin: string) {
-    const session = getSession()
-    if (session) {
-      let uid = (await session.getGroupService().getUidByUins([uin])).uids.get(uin)
-      if (uid) return uid
-      uid = (await session.getProfileService().getUidByUin('FriendsServiceImpl', [uin])).get(uin)
-      if (uid) return uid
-      uid = (await session.getUixConvertService().getUid([uin])).uidInfo.get(uin)
-      if (uid) return uid
-    } else {
-      let uid = (await invoke('nodeIKernelGroupService/getUidByUins', [{ uin: [uin] }])).uids.get(uin)
-      if (uid) return uid
-      uid = (await invoke('nodeIKernelProfileService/getUidByUin', [{ callFrom: 'FriendsServiceImpl', uin: [uin] }])).get(uin)
-      if (uid) return uid
-      uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
-      if (uid) return uid
+  async getUidByUinV2(uin: string, groupCode?: string) {
+    let uid = (await invoke('nodeIKernelGroupService/getUidByUins', [{ uin: [uin] }])).uids.get(uin)
+    if (uid) return uid
+    uid = (await invoke('nodeIKernelProfileService/getUidByUin', [{ callFrom: 'FriendsServiceImpl', uin: [uin] }])).get(uin)
+    if (uid) return uid
+    uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
+    if (uid) return uid
+    const unveifyUid = (await this.getUserDetailInfoByUinV2(uin)).detail.uid
+    if (!unveifyUid.includes('*')) return unveifyUid
+    if (groupCode) {
+      const member = await this.ctx.ntGroupApi.getGroupMember(groupCode, uin)
+      return member?.uid
     }
-    const unveifyUid = (await this.getUserDetailInfoByUinV2(uin)).detail.uid //从QQ Native 特殊转换
-    if (unveifyUid.indexOf('*') == -1) return unveifyUid
   }
 
-  async getUidByUin(uin: string) {
+  async getUidByUin(uin: string, groupCode?: string) {
     if (getBuildVersion() >= 26702) {
-      return this.getUidByUinV2(uin)
+      return this.getUidByUinV2(uin, groupCode)
     }
     return this.getUidByUinV1(uin)
   }
@@ -249,7 +242,7 @@ export class NTQQUserApi extends Service {
     if (session) {
       return await session.getTicketService().forceFetchClientKey('')
     } else {
-      return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ domain: '' }, null])
+      return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ url: '' }, null])
     }
   }
 

src/ntqqapi/api/webapi.ts

@@ -17,39 +17,6 @@ export enum WebHonorType {
   EMOTION = 'emotion'
 }
 
-export interface WebApiGroupMember {
-  uin: number
-  role: number
-  g: number
-  join_time: number
-  last_speak_time: number
-  lv: {
-    point: number
-    level: number
-  }
-  card: string
-  tags: string
-  flag: number
-  nick: string
-  qage: number
-  rm: number
-}
-
-interface WebApiGroupMemberRet {
-  ec: number
-  errcode: number
-  em: string
-  cache: number
-  adm_num: number
-  levelname: unknown
-  mems: WebApiGroupMember[]
-  count: number
-  svr_time: number
-  max_count: number
-  search_count: number
-  extmode: number
-}
-
 export class NTQQWebApi extends Service {
   static inject = ['ntUserApi']
 
@@ -57,47 +24,6 @@ export class NTQQWebApi extends Service {
     super(ctx, 'ntWebApi', true)
   }
 
-  async getGroupMembers(groupCode: string): Promise<WebApiGroupMember[]> {
-    const memberData: Array<WebApiGroupMember> = new Array<WebApiGroupMember>()
-    const cookieObject = await this.ctx.ntUserApi.getCookies('qun.qq.com')
-    const cookieStr = this.cookieToString(cookieObject)
-    const retList: Promise<WebApiGroupMemberRet>[] = []
-    const params = new URLSearchParams({
-      st: '0',
-      end: '40',
-      sort: '1',
-      gc: groupCode,
-      bkn: this.genBkn(cookieObject.skey)
-    })
-    const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>(`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${params}`, 'POST', '', { 'Cookie': cookieStr })
-    if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
-      return []
-    } else {
-      for (const member of fastRet.mems) {
-        memberData.push(member)
-      }
-    }
-    const pageNum = Math.ceil(fastRet.count / 40)
-    //遍历批量请求
-    for (let i = 2; i <= pageNum; i++) {
-      params.set('st', String((i - 1) * 40))
-      params.set('end', String(i * 40))
-      const ret = RequestUtil.HttpGetJson<WebApiGroupMemberRet>(`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${params}`, 'POST', '', { 'Cookie': cookieStr })
-      retList.push(ret)
-    }
-    //批量等待
-    for (let i = 1; i <= pageNum; i++) {
-      const ret = await (retList[i])
-      if (!ret?.count || ret?.errcode !== 0 || !ret?.mems) {
-        continue
-      }
-      for (const member of ret.mems) {
-        memberData.push(member)
-      }
-    }
-    return memberData
-  }
-
   genBkn(sKey: string) {
     sKey = sKey || ''
     let hash = 5381
@@ -108,10 +34,9 @@ export class NTQQWebApi extends Service {
     return (hash & 0x7FFFFFFF).toString()
   }
 
-  //实现未缓存 考虑2h缓存
-  async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
-    const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => {
-      const url = 'https://qun.qq.com/interactive/honorlist?gc=' + Internal_groupCode + '&type=' + Internal_type.toString()
+  async getGroupHonorInfo(groupCode: string, getType: string) {
+    const getDataInternal = async (groupCode: string, type: number) => {
+      const url = 'https://qun.qq.com/interactive/honorlist?gc=' + groupCode + '&type=' + type
       let resJson
       try {
         const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': cookieStr })
@@ -119,7 +44,7 @@ export class NTQQWebApi extends Service {
         if (match) {
           resJson = JSON.parse(match[1].trim())
         }
-        if (Internal_type === 1) {
+        if (type === 1) {
           return resJson?.talkativeList
         } else {
           return resJson?.actorList

src/ntqqapi/core.ts

@@ -1,4 +1,4 @@
-import fs from 'node:fs'
+import { unlink } from 'node:fs/promises'
 import { Service, Context } from 'cordis'
 import { registerCallHook, registerReceiveHook, ReceiveCmdS } from './hook'
 import { Config as LLOBConfig } from '../common/types'
@@ -13,7 +13,6 @@ import {
   GroupMember,
   CategoryFriend,
   SimpleInfo,
-  User,
   ChatType
 } from './types'
 import { selfInfo } from '../common/globalVars'
@@ -53,29 +52,24 @@ class Core extends Service {
 
   private registerListener() {
     registerReceiveHook<{
-      data: CategoryFriend[]
+      data?: CategoryFriend[]
+      userSimpleInfos?: Map<string, SimpleInfo> //V2
+      buddyCategory?: CategoryFriend[] //V2
     }>(ReceiveCmdS.FRIENDS, (payload) => {
-      type V2data = { userSimpleInfos: Map<string, SimpleInfo> }
-      let friendList: User[] = []
-      if ('userSimpleInfos' in payload) {
-        friendList = Object.values((payload as unknown as V2data).userSimpleInfos).map((v: SimpleInfo) => {
-          return {
-            ...v.coreInfo,
-          }
-        })
-      } else {
-        for (const fData of payload.data) {
-          friendList.push(...fData.buddyList)
-        }
+      let uids: string[] = []
+      if (payload.buddyCategory) {
+        uids = payload.buddyCategory.flatMap(item => item.buddyUids)
+      } else if (payload.data) {
+        uids = payload.data.flatMap(item => item.buddyList.map(e => e.uid))
       }
-      this.ctx.logger.info('好友列表变动', friendList.length)
-      for (const friend of friendList) {
-        this.ctx.ntMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend })
+      for (const uid of uids) {
+        this.ctx.ntMsgApi.activateChat({ peerUid: uid, chatType: ChatType.C2C })
       }
+      this.ctx.logger.info('好友列表变动', uids.length)
     })
 
     // 自动清理新消息文件
-    registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
+    registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
       if (!this.config.autoDeleteFile) {
         return
       }
@@ -94,9 +88,7 @@ class Core extends Service {
             }
             for (const path of pathList) {
               if (path) {
-                fs.unlink(path, () => {
-                  this.ctx.logger.info('删除文件成功', path)
-                })
+                unlink(path).then(() => this.ctx.logger.info('删除文件成功', path))
               }
             }
           }, this.config.autoDeleteFileSecond! * 1000)
@@ -124,7 +116,7 @@ class Core extends Service {
           if (activatedPeerUids.includes(contact.id)) continue
           activatedPeerUids.push(contact.id)
           const peer = { peerUid: contact.id, chatType: contact.chatType }
-          if (contact.chatType === ChatType.temp) {
+          if (contact.chatType === ChatType.TempC2CFromGroup) {
             this.ctx.ntMsgApi.activateChatAndGetHistory(peer).then(() => {
               this.ctx.ntMsgApi.getMsgHistory(peer, '', 20).then(({ msgList }) => {
                 const lastTempMsg = msgList.at(-1)
@@ -144,12 +136,12 @@ class Core extends Service {
     registerCallHook(NTMethod.DELETE_ACTIVE_CHAT, async (payload) => {
       const peerUid = payload[0] as string
       this.ctx.logger.info('激活的聊天窗口被删除，准备重新激活', peerUid)
-      let chatType = ChatType.friend
+      let chatType = ChatType.C2C
       if (isNumeric(peerUid)) {
-        chatType = ChatType.group
+        chatType = ChatType.Group
       }
       else if (!(await this.ctx.ntFriendApi.isBuddy(peerUid))) {
-        chatType = ChatType.temp
+        chatType = ChatType.TempC2CFromGroup
       }
       const peer = { peerUid, chatType }
       await this.ctx.sleep(1000)
@@ -223,7 +215,7 @@ class Core extends Service {
       this.ctx.parallel('nt/friend-request', payload.data.buddyReqs)
     })
 
-    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { classNameIsRegister: true })
+    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { registerEvent: true })
 
     registerReceiveHook<{
       msgBuf: number[]

src/ntqqapi/entities.ts

@@ -1,5 +1,6 @@
 import ffmpeg from 'fluent-ffmpeg'
 import faceConfig from './helper/face_config.json'
+import pathLib from 'node:path'
 import {
   AtType,
   ElementType,
@@ -27,11 +28,11 @@ import { isNullable } from 'cosmokit'
 export namespace SendElementEntities {
   export function text(content: string): SendTextElement {
     return {
-      elementType: ElementType.TEXT,
+      elementType: ElementType.Text,
       elementId: '',
       textElement: {
         content,
-        atType: AtType.notAt,
+        atType: AtType.Unknown,
         atUid: '',
         atTinyId: '',
         atNtUid: '',
@@ -41,7 +42,7 @@ export namespace SendElementEntities {
 
   export function at(atUid: string, atNtUid: string, atType: AtType, display: string): SendTextElement {
     return {
-      elementType: ElementType.TEXT,
+      elementType: ElementType.Text,
       elementId: '',
       textElement: {
         content: display,
@@ -55,7 +56,7 @@ export namespace SendElementEntities {
 
   export function reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement {
     return {
-      elementType: ElementType.REPLY,
+      elementType: ElementType.Reply,
       elementId: '',
       replyElement: {
         replayMsgSeq: msgSeq, // raw.msgSeq
@@ -67,7 +68,7 @@ export namespace SendElementEntities {
   }
 
   export async function pic(ctx: Context, picPath: string, summary = '', subType: 0 | 1 = 0, isFlashPic?: boolean): Promise<SendPicElement> {
-    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(picPath, ElementType.PIC, subType)
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(picPath, ElementType.Pic, subType)
     if (fileSize === 0) {
       throw '文件异常，大小为 0'
     }
@@ -80,7 +81,7 @@ export namespace SendElementEntities {
       fileName: fileName,
       sourcePath: path,
       original: true,
-      picType: imageSize.type === 'gif' ? PicType.gif : PicType.jpg,
+      picType: imageSize.type === 'gif' ? PicType.GIF : PicType.JPEG,
       picSubType: subType,
       fileUuid: '',
       fileSubId: '',
@@ -90,7 +91,7 @@ export namespace SendElementEntities {
     }
     ctx.logger.info('图片信息', picElement)
     return {
-      elementType: ElementType.PIC,
+      elementType: ElementType.Pic,
       elementId: '',
       picElement,
     }
@@ -103,7 +104,7 @@ export namespace SendElementEntities {
       throw new Error('文件异常，大小为 0')
     }
     const element: SendFileElement = {
-      elementType: ElementType.FILE,
+      elementType: ElementType.File,
       elementId: '',
       fileElement: {
         fileName,
@@ -122,7 +123,7 @@ export namespace SendElementEntities {
       throw `文件${filePath}异常，不存在`
     }
     ctx.logger.info('复制视频到QQ目录', filePath)
-    const { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.VIDEO)
+    const { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.Video)
 
     ctx.logger.info('复制视频到QQ目录完成', path)
     if (fileSize === 0) {
@@ -132,7 +133,6 @@ export namespace SendElementEntities {
     if (fileSize > 1024 * 1024 * maxMB) {
       throw `视频过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
     }
-    const pathLib = require('path')
     let thumbDir = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`)
     thumbDir = pathLib.dirname(thumbDir)
     // log("thumb 目录", thumb)
@@ -200,7 +200,7 @@ export namespace SendElementEntities {
     thumbPath.set(0, _thumbPath)
     const thumbMd5 = await calculateFileMD5(_thumbPath)
     const element: SendVideoElement = {
-      elementType: ElementType.VIDEO,
+      elementType: ElementType.Video,
       elementId: '',
       videoElement: {
         fileName: fileName || _fileName,
@@ -212,17 +212,7 @@ export namespace SendElementEntities {
         thumbSize,
         thumbWidth: videoInfo.width,
         thumbHeight: videoInfo.height,
-        fileSize: '' + fileSize,
-        // fileUuid: "",
-        // transferStatus: 0,
-        // progress: 0,
-        // invalidState: 0,
-        // fileSubId: "",
-        // fileBizId: null,
-        // originVideoMd5: "",
-        // fileFormat: 2,
-        // import_rich_media_context: null,
-        // sourceVideoCodecFormat: 2
+        fileSize: String(fileSize),
       },
     }
     ctx.logger.info('videoElement', element)
@@ -235,7 +225,7 @@ export namespace SendElementEntities {
       throw '语音转换失败, 请检查语音文件是否正常'
     }
     // log("生成语音", silkPath, duration);
-    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(silkPath, ElementType.PTT)
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(silkPath, ElementType.Ptt)
     if (fileSize === 0) {
       throw '文件异常，大小为0'
     }
@@ -243,14 +233,13 @@ export namespace SendElementEntities {
       unlink(silkPath)
     }
     return {
-      elementType: ElementType.PTT,
+      elementType: ElementType.Ptt,
       elementId: '',
       pttElement: {
         fileName: fileName,
         filePath: path,
         md5HexStr: md5,
-        fileSize: fileSize,
-        // duration: Math.max(1, Math.round(fileSize / 1024 / 3)), // 一秒钟大概是3kb大小, 小于1秒的按1秒算
+        fileSize: String(fileSize),
         duration: duration,
         formatType: 1,
         voiceType: 1,
@@ -279,7 +268,7 @@ export namespace SendElementEntities {
       faceType = 3;
     }
     return {
-      elementType: ElementType.FACE,
+      elementType: ElementType.Face,
       elementId: '',
       faceElement: {
         faceIndex: faceId,
@@ -295,7 +284,8 @@ export namespace SendElementEntities {
 
   export function mface(emojiPackageId: number, emojiId: string, key: string, summary?: string): SendMarketFaceElement {
     return {
-      elementType: ElementType.MFACE,
+      elementType: ElementType.MarketFace,
+      elementId: '',
       marketFaceElement: {
         imageWidth: 300,
         imageHeight: 300,
@@ -312,10 +302,10 @@ export namespace SendElementEntities {
     // 随机1到6
     if (isNullable(resultId)) resultId = Math.floor(Math.random() * 6) + 1
     return {
-      elementType: ElementType.FACE,
+      elementType: ElementType.Face,
       elementId: '',
       faceElement: {
-        faceIndex: FaceIndex.dice,
+        faceIndex: FaceIndex.Dice,
         faceType: 3,
         faceText: '[骰子]',
         packId: '1',
@@ -334,7 +324,7 @@ export namespace SendElementEntities {
     // 实际测试并不能控制结果
     if (isNullable(resultId)) resultId = Math.floor(Math.random() * 3) + 1
     return {
-      elementType: ElementType.FACE,
+      elementType: ElementType.Face,
       elementId: '',
       faceElement: {
         faceIndex: FaceIndex.RPS,
@@ -353,7 +343,7 @@ export namespace SendElementEntities {
 
   export function ark(data: string): SendArkElement {
     return {
-      elementType: ElementType.ARK,
+      elementType: ElementType.Ark,
       elementId: '',
       arkElement: {
         bytesData: data,
@@ -365,7 +355,7 @@ export namespace SendElementEntities {
 
   export function shake(): SendFaceElement {
     return {
-      elementType: ElementType.FACE,
+      elementType: ElementType.Face,
       elementId: '',
       faceElement: {
         faceIndex: 1,

src/ntqqapi/ntcall.ts

@@ -13,8 +13,7 @@ import {
   NodeIKernelUixConvertService,
   NodeIKernelRichMediaService,
   NodeIKernelTicketService,
-  NodeIKernelTipOffService,
-  NodeIKernelSearchService,
+  NodeIKernelTipOffService
 } from './services'
 
 export enum NTClass {
@@ -94,13 +93,12 @@ interface NTService {
   nodeIKernelRichMediaService: NodeIKernelRichMediaService
   nodeIKernelTicketService: NodeIKernelTicketService
   nodeIKernelTipOffService: NodeIKernelTipOffService
-  nodeIKernelSearchService: NodeIKernelSearchService
 }
 
 interface InvokeOptions<ReturnType> {
   className?: NTClass
   channel?: NTChannel
-  classNameIsRegister?: boolean
+  registerEvent?: boolean
   cbCmd?: string | string[]
   cmdCB?: (payload: ReturnType, result: unknown) => boolean
   afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
@@ -117,7 +115,7 @@ export function invoke<
   const timeout = options.timeout ?? 5000
   const afterFirstCmd = options.afterFirstCmd ?? true
   let eventName = className + '-' + channel[channel.length - 1]
-  if (options.classNameIsRegister) {
+  if (options.registerEvent) {
     eventName += '-register'
   }
   return new Promise<R>((resolve, reject) => {

src/ntqqapi/services/NodeIKernelBuddyService.ts

@@ -1,125 +1,27 @@
+import { BuddyListReqType } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
 
-export enum BuddyListReqType {
-  KNOMAL,
-  KLETTER
-}
-
 export interface NodeIKernelBuddyService {
-  // 26702 以上
   getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {
-    data: Array<{
-      categoryId: number,
-      categorySortId: number,
-      categroyName: string,
-      categroyMbCount: number,
-      onlineCount: number,
-      buddyUids: Array<string>
-    }>
+    data: {
+      categoryId: number
+      categorySortId: number
+      categroyName: string
+      categroyMbCount: number
+      onlineCount: number
+      buddyUids: string[]
+    }[]
   }>
 
-  //26702 以上
-  getBuddyListFromCache(callFrom: string): Promise<Array<
-    {
-      categoryId: number,//9999应该跳过 那是兜底数据吧
-      categorySortId: number,//排序方式
-      categroyName: string,//分类名
-      categroyMbCount: number,//不懂
-      onlineCount: number,//在线数目
-      buddyUids: Array<string>//Uids
-    }>>
-
-  addKernelBuddyListener(listener: unknown): number
-
-  getAllBuddyCount(): number
-
-  removeKernelBuddyListener(listener: unknown): void
-
-  getBuddyList(nocache: boolean): Promise<GeneralCallResult>
-
-  getBuddyNick(uid: number): string
-
-  getBuddyRemark(uid: number): string
-
   setBuddyRemark(uid: number, remark: string): void
 
-  getAvatarUrl(uid: number): string
-
   isBuddy(uid: string): boolean
 
-  getCategoryNameWithUid(uid: number): string
-
-  getTargetBuddySetting(uid: number): unknown
-
-  getTargetBuddySettingByType(uid: number, type: number): unknown
-
-  getBuddyReqUnreadCnt(): number
-
-  getBuddyReq(): unknown
-
-  delBuddyReq(uid: number): void
-
-  clearBuddyReqUnreadCnt(): void
-
-  reqToAddFriends(uid: number, msg: string): void
-
-  setSpacePermission(uid: number, permission: number): void
-
   approvalFriendRequest(arg: {
     friendUid: string
     reqTime: string
     accept: boolean
   }): Promise<void>
 
-  delBuddy(uid: number): void
-
-  delBatchBuddy(uids: number[]): void
-
-  getSmartInfos(uid: number): unknown
-
-  setBuddyCategory(uid: number, category: number): void
-
-  setBatchBuddyCategory(uids: number[], category: number): void
-
-  addCategory(category: string): void
-
-  delCategory(category: string): void
-
-  renameCategory(oldCategory: string, newCategory: string): void
-
-  resortCategory(categorys: string[]): void
-
-  pullCategory(uid: number, category: string): void
-
-  setTop(uid: number, isTop: boolean): void
-
-  SetSpecialCare(uid: number, isSpecialCare: boolean): void
-
-  setMsgNotify(uid: number, isNotify: boolean): void
-
-  hasBuddyList(): boolean
-
-  setBlock(uid: number, isBlock: boolean): void
-
-  isBlocked(uid: number): boolean
-
-  modifyAddMeSetting(setting: unknown): void
-
-  getAddMeSetting(): unknown
-
-  getDoubtBuddyReq(): unknown
-
-  getDoubtBuddyUnreadNum(): number
-
-  approvalDoubtBuddyReq(uid: number, isAgree: boolean): void
-
-  delDoubtBuddyReq(uid: number): void
-
-  delAllDoubtBuddyReq(): void
-
-  reportDoubtBuddyReqUnread(): void
-
   getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>
-
-  isNull(): boolean
 }

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -1,79 +1,39 @@
 import {
-  GroupExtParam,
   GroupMember,
   GroupMemberRole,
   GroupNotifyType,
   GroupRequestOperateTypes,
 } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
-import { Dict } from 'cosmokit'
 
 export interface NodeIKernelGroupService {
-  getMemberCommonInfo(Req: {
-    groupCode: string,
-    startUin: string,
-    identifyFlag: string,
-    uinList: string[],
-    memberCommonFilter: {
-      memberUin: number,
-      uinFlag: number,
-      uinFlagExt: number,
-      uinMobileFlag: number,
-      shutUpTime: number,
-      privilege: number,
-    },
-    memberNum: number,
-    filterMethod: string,
-    onlineFlag: string,
-    realSpecialTitleFlag: number
-  }): Promise<unknown>
-
-  //26702
-  getGroupMemberLevelInfo(groupCode: string): Promise<unknown>
-
-  //26702
-  getGroupHonorList(groupCodes: Array<string>): unknown
+  getGroupHonorList(req: { groupCode: number[] }): Promise<{
+    errCode: number
+    errMsg: string
+    groupMemberHonorList: {
+      honorList: {
+        groupCode: string
+        id: number[]
+        isGray: number
+      }[]
+      cacheTs: number
+      honorInfos: unknown[]
+      joinTime: number
+    }
+  }>
 
   getUinByUids(uins: string[]): Promise<{
-    errCode: number,
-    errMsg: string,
+    errCode: number
+    errMsg: string
     uins: Map<string, string>
   }>
 
   getUidByUins(uins: string[]): Promise<{
-    errCode: number,
-    errMsg: string,
+    errCode: number
+    errMsg: string
     uids: Map<string, string>
   }>
 
-  //26702(其实更早 但是我不知道)
-  checkGroupMemberCache(arrayList: Array<string>): Promise<unknown>
-
-  //26702(其实更早 但是我不知道)
-  getGroupLatestEssenceList(groupCode: string): Promise<unknown>
-
-  //26702(其实更早 但是我不知道)
-  shareDigest(Req: {
-    appId: string,
-    appType: number,
-    msgStyle: number,
-    recvUin: string,
-    sendType: number,
-    clientInfo: {
-      platform: number
-    },
-    richMsg: {
-      usingArk: boolean,
-      title: string,
-      summary: string,
-      url: string,
-      pictureUrl: string,
-      brief: string
-    }
-  }): Promise<unknown>
-
-  isEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
-
   queryCachedEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<{
     items: {
       groupCode: string
@@ -89,33 +49,10 @@ export interface NodeIKernelGroupService {
     }[]
   }>
 
-  fetchGroupEssenceList(req: { groupCode: string, pageStart: number, pageLimit: number }, arg: unknown): Promise<unknown>
-
-  //26702
-  getAllMemberList(groupCode: string, forceFetch: boolean): Promise<{
-    errCode: number,
-    errMsg: string,
-    result: {
-      ids: Array<{
-        uid: string,
-        index: number//0
-      }>,
-      infos: Dict,
-      finish: true,
-      hasRobot: false
-    }
-  }>
-
   setHeader(uid: string, path: string): unknown
 
-  addKernelGroupListener(listener: unknown): number
-
-  removeKernelGroupListener(listenerId: unknown): void
-
   createMemberListScene(groupCode: string, scene: string): string
 
-  destroyMemberListScene(sceneId: string): void
-
   getNextMemberList(sceneId: string, a: undefined, num: number): Promise<{
     errCode: number
     errMsg: string
@@ -130,97 +67,33 @@ export interface NodeIKernelGroupService {
     }
   }>
 
-  getPrevMemberList(): unknown
-
-  monitorMemberList(): unknown
-
-  searchMember(sceneId: string, keywords: string[]): unknown
-
-  getMemberInfo(group_id: string, uids: string[], forceFetch: boolean): Promise<GeneralCallResult>
-  //getMemberInfo  [ '56729xxxx', [ 'u_4Nj08cwW5Hxxxxx' ], true ]
-
   kickMember(groupCode: string, memberUids: string[], refuseForever: boolean, kickReason: string): Promise<void>
 
   modifyMemberRole(groupCode: string, uid: string, role: GroupMemberRole): void
 
   modifyMemberCardName(groupCode: string, uid: string, cardName: string): void
 
-  getTransferableMemberInfo(groupCode: string): unknown//获取整个群的
-
-  transferGroup(uid: string): void
-
-  getGroupList(force: boolean): Promise<GeneralCallResult>
-
-  getGroupExtList(force: boolean): Promise<GeneralCallResult>
-
-  getGroupDetailInfo(groupCode: string): unknown
-
-  getMemberExtInfo(param: GroupExtParam): Promise<unknown>//req
-
-  getGroupAllInfo(): unknown
-
-  getDiscussExistInfo(): unknown
-
-  getGroupConfMember(): unknown
-
-  getGroupMsgMask(): unknown
-
-  getGroupPortrait(): void
-
   modifyGroupName(groupCode: string, groupName: string, arg: false): void
 
-  modifyGroupRemark(groupCode: string, remark: string): void
-
-  modifyGroupDetailInfo(groupCode: string, arg: unknown): void
-
-  setGroupMsgMask(groupCode: string, arg: unknown): void
-
-  changeGroupShieldSettingTemp(groupCode: string, arg: unknown): void
-
-  inviteToGroup(arg: unknown): void
-
-  inviteMembersToGroup(args: unknown[]): void
-
-  inviteMembersToGroupWithMsg(args: unknown): void
-
-  createGroup(arg: unknown): void
-
-  createGroupWithMembers(arg: unknown): void
-
   quitGroup(groupCode: string): void
 
-  destroyGroup(groupCode: string): void
-  //获取单屏群通知列表
-  getSingleScreenNotifies(force: boolean, start_seq: string, num: number): Promise<GeneralCallResult>
-
-  clearGroupNotifies(groupCode: string): void
-
-  getGroupNotifiesUnreadCount(unknown: boolean): Promise<GeneralCallResult>
-
-  clearGroupNotifiesUnreadCount(groupCode: string): void
+  getSingleScreenNotifies(force: boolean, startSeq: string, num: number): Promise<GeneralCallResult>
 
   operateSysNotify(
     doubt: boolean,
     operateMsg: {
-      operateType: GroupRequestOperateTypes, // 2 拒绝
+      operateType: GroupRequestOperateTypes // 2 拒绝
       targetMsg: {
-        seq: string,  // 通知序列号
-        type: GroupNotifyType,
-        groupCode: string,
+        seq: string  // 通知序列号
+        type: GroupNotifyType
+        groupCode: string
         postscript: string
       }
-    }): Promise<void>
-
-  setTop(groupCode: string, isTop: boolean): void
-
-  getGroupBulletin(groupCode: string): unknown
-
-  deleteGroupBulletin(groupCode: string, seq: string): void
+    }
+  ): Promise<void>
 
   publishGroupBulletin(groupCode: string, pskey: string, data: unknown): Promise<GeneralCallResult>
 
-  publishInstructionForNewcomers(groupCode: string, arg: unknown): void
-
   uploadGroupBulletinPic(groupCode: string, pskey: string, imagePath: string): Promise<{
     errCode: number
     errMsg: string
@@ -231,45 +104,23 @@ export interface NodeIKernelGroupService {
     }
   }>
 
-  downloadGroupBulletinRichMedia(groupCode: string): unknown
-
-  getGroupBulletinList(groupCode: string): unknown
-
-  getGroupStatisticInfo(groupCode: string): unknown
-
-  getGroupRemainAtTimes(groupCode: string): number
-
-  getJoinGroupNoVerifyFlag(groupCode: string): unknown
-
-  getGroupArkInviteState(groupCode: string): unknown
-
-  reqToJoinGroup(groupCode: string, arg: unknown): void
+  getGroupRemainAtTimes(groupCode: string): Promise<GeneralCallResult & {
+    atInfo: {
+      canAtAll: boolean
+      RemainAtAllCountForUin: number
+      RemainAtAllCountForGroup: number
+      atTimesMsg: string
+      canNotAtAllMsg: ''
+    }
+  }>
 
   setGroupShutUp(groupCode: string, shutUp: boolean): void
 
-  getGroupShutUpMemberList(groupCode: string): unknown[]
-
   setMemberShutUp(groupCode: string, memberTimes: { uid: string, timeStamp: number }[]): Promise<void>
 
   getGroupRecommendContactArkJson(groupCode: string): Promise<GeneralCallResult & { arkJson: string }>
 
-  getJoinGroupLink(groupCode: string): unknown
+  addGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
 
-  modifyGroupExtInfo(groupCode: string, arg: unknown): void
-
-  //需要提前判断是否存在 高版本新增
-  addGroupEssence(param: {
-    groupCode: string
-    msgRandom: number,
-    msgSeq: number
-  }): Promise<unknown>
-
-  //需要提前判断是否存在 高版本新增
-  removeGroupEssence(param: {
-    groupCode: string
-    msgRandom: number,
-    msgSeq: number
-  }): Promise<unknown>
-
-  isNull(): boolean
+  removeGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
 }

src/ntqqapi/services/NodeIKernelMsgService.ts

@@ -1,474 +1,76 @@
-import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/ntqqapi/types'
+import { ElementType, MessageElement, Peer, RawMessage, QueryMsgsParams, TmpChatInfoApi } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
-import { Dict } from 'cosmokit'
-
-export interface QueryMsgsParams {
-  chatInfo: Peer,
-  filterMsgType: [],
-  filterSendersUid: string[],
-  filterMsgFromTime: string,
-  filterMsgToTime: string,
-  pageLimit: number,
-  isReverseOrder: boolean,
-  isIncludeCurrent: boolean
-}
-
-export interface TmpChatInfoApi {
-  errMsg: string
-  result: number
-  tmpChatInfo?: TmpChatInfo
-}
-
-export interface TmpChatInfo {
-  chatType: number
-  fromNick: string
-  groupCode: string
-  peerUid: string
-  sessionType: number
-  sig: string
-}
 
 export interface NodeIKernelMsgService {
   generateMsgUniqueId(chatType: number, time: string): string
 
-  addKernelMsgListener(nodeIKernelMsgListener: unknown): number
-
-  sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
+  sendMsg(msgId: string, peer: Peer, msgElements: MessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
 
   recallMsg(peer: Peer, msgIds: string[]): Promise<GeneralCallResult>
 
-  addKernelMsgImportToolListener(arg: Dict): unknown
-
-  removeKernelMsgListener(args: unknown): unknown
-
-  addKernelTempChatSigListener(...args: unknown[]): unknown
-
-  removeKernelTempChatSigListener(...args: unknown[]): unknown
-
-  setAutoReplyTextList(AutoReplyText: Array<unknown>, i2: number): unknown
-
-  getAutoReplyTextList(...args: unknown[]): unknown
-
-  getOnLineDev(): void
-
-  kickOffLine(DevInfo: Dict): unknown
-
   setStatus(args: { status: number, extStatus: number, batteryStatus: number }): Promise<GeneralCallResult>
 
-  fetchStatusMgrInfo(): unknown
-
-  fetchStatusUnitedConfigInfo(): unknown
-
-  getOnlineStatusSmallIconBasePath(): unknown
-
-  getOnlineStatusSmallIconFileNameByUrl(Url: string): unknown
-
-  downloadOnlineStatusSmallIconByUrl(arg0: number, arg1: string): unknown
-
-  getOnlineStatusBigIconBasePath(): unknown
-
-  downloadOnlineStatusBigIconByUrl(arg0: number, arg1: string): unknown
-
-  getOnlineStatusCommonPath(arg: string): unknown
-
-  getOnlineStatusCommonFileNameByUrl(Url: string): unknown
-
-  downloadOnlineStatusCommonByUrl(arg0: string, arg1: string): unknown
-
-  // this.tokenType = i2
-  // this.apnsToken = bArr
-  // this.voipToken = bArr2
-  // this.profileId = str
-
-  setToken(arg: Dict): unknown
-
-  switchForeGround(): unknown
-
-  switchBackGround(arg: Dict): unknown
-
-  //hex
-  setTokenForMqq(token: string): unknown
-
-  switchForeGroundForMqq(...args: unknown[]): unknown
-
-  switchBackGroundForMqq(...args: unknown[]): unknown
-
-  getMsgSetting(...args: unknown[]): unknown
-
-  setMsgSetting(...args: unknown[]): unknown
-
-  addSendMsg(...args: unknown[]): unknown
-
-  cancelSendMsg(...args: unknown[]): unknown
-
-  switchToOfflineSendMsg(peer: Peer, MsgId: string): unknown
-
-  reqToOfflineSendMsg(...args: unknown[]): unknown
-
-  refuseReceiveOnlineFileMsg(peer: Peer, MsgId: string): unknown
-
-  resendMsg(...args: unknown[]): unknown
-
-  reeditRecallMsg(...args: unknown[]): unknown
-
-  //调用请检查除开commentElements其余参数不能为null
   forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise<GeneralCallResult>
 
   forwardMsgWithComment(...args: unknown[]): Promise<GeneralCallResult>
 
-  forwardSubMsgWithComment(...args: unknown[]): unknown
-
-  forwardRichMsgInVist(...args: unknown[]): unknown
-
-  forwardFile(...args: unknown[]): unknown
-  //Array<Msg>, Peer from, Peer to
-  multiForwardMsg(...args: unknown[]): unknown
-
   multiForwardMsgWithComment(...args: unknown[]): unknown
 
-  deleteRecallMsg(...args: unknown[]): unknown
+  getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  deleteRecallMsgForLocal(...args: unknown[]): unknown
-
-  addLocalGrayTipMsg(...args: unknown[]): unknown
-
-  addLocalJsonGrayTipMsg(...args: unknown[]): unknown
-
-  addLocalJsonGrayTipMsgExt(...args: unknown[]): unknown
-
-  IsLocalJsonTipValid(...args: unknown[]): unknown
-
-  addLocalAVRecordMsg(...args: unknown[]): unknown
-
-  addLocalTofuRecordMsg(...args: unknown[]): unknown
-
-  addLocalRecordMsg(Peer: Peer, msgId: string, ele: MessageElement, attr: Array<unknown> | number, front: boolean): Promise<unknown>
-
-  deleteMsg(Peer: Peer, msgIds: Array<string>): Promise<unknown>
-
-  updateElementExtBufForUI(...args: unknown[]): unknown
-
-  updateMsgRecordExtPbBufForUI(...args: unknown[]): unknown
-
-  startMsgSync(...args: unknown[]): unknown
-
-  startGuildMsgSync(...args: unknown[]): unknown
-
-  isGuildChannelSync(...args: unknown[]): unknown
-
-  getMsgUniqueId(UniqueId: string): string
-
-  isMsgMatched(...args: unknown[]): unknown
-
-  getOnlineFileMsgs(...args: unknown[]): unknown
-
-  getAllOnlineFileMsgs(...args: unknown[]): unknown
-
-  getLatestDbMsgs(peer: Peer, cnt: number): Promise<unknown>
-
-  getLastMessageList(peer: Peer[]): Promise<unknown>
-
-  getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & {
-    msgList: RawMessage[]
-  }>
-
-  getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>
-
-  getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
-    msgList: RawMessage[]
-  }>
-
-  // this.$peer = contact
-  // this.$msgTime = j2
-  // this.$clientSeq = j3
-  // this.$cnt = i2
-
-  getMsgsWithMsgTimeAndClientSeqForC2C(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
-
-  getMsgsWithStatus(params: {
-    peer: Peer
-    msgId: string
-    msgTime: unknown
-    cnt: unknown
-    queryOrder: boolean
-    isIncludeSelf: boolean
-    appid: unknown
-  }): Promise<GeneralCallResult & { msgList: RawMessage[] }>
-
-  getMsgsBySeqRange(peer: Peer, startSeq: string, endSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+  getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
   getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
   getMsgsByMsgId(peer: Peer, ids: string[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  getRecallMsgsByMsgId(peer: Peer, MsgId: string[]): Promise<unknown>
-
   getMsgsBySeqList(peer: Peer, seqList: string[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  getSingleMsg(Peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+  getSingleMsg(peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  getSourceOfReplyMsg(peer: Peer, MsgId: string, SourceSeq: string): unknown
-
-  getSourceOfReplyMsgV2(peer: Peer, RootMsgId: string, ReplyMsgId: string): unknown
-
-  getMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown
-
-  getSourceOfReplyMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown
-
-  getMsgsByTypeFilter(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilter: { type: number, subtype: Array<number> }): unknown
-
-  getMsgsByTypeFilters(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilters: Array<{ type: number, subtype: Array<number> }>): unknown
-
-  getMsgWithAbstractByFilterParam(...args: unknown[]): unknown
-
-  queryMsgsWithFilter(...args: unknown[]): unknown
-
-  // this.chatType = i2
-  // this.peerUid = str
-  // this.chatInfo = new ChatInfo()
-  // this.filterMsgType = new ArrayList<>()
-  // this.filterSendersUid = new ArrayList<>()
-  // this.chatInfo = chatInfo
-  // this.filterMsgType = arrayList
-  // this.filterSendersUid = arrayList2
-  // this.filterMsgFromTime = j2
-  // this.filterMsgToTime = j3
-  // this.pageLimit = i2
-  // this.isReverseOrder = z
-  // this.isIncludeCurrent = z2
-  //queryMsgsWithFilterEx(0L, 0L, 0L, new QueryMsgsParams(new ChatInfo(2, str), new ArrayList(), new ArrayList(), 0L, 0L, 250, false, true))
   queryMsgsWithFilterEx(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<GeneralCallResult & {
     msgList: RawMessage[]
   }>
-  //queryMsgsWithFilterEx(this.$msgId, this.$msgTime, this.$msgSeq, this.$param)
-  queryFileMsgsDesktop(...args: unknown[]): unknown
-
-  setMsgRichInfoFlag(...args: unknown[]): unknown
-
-  queryPicOrVideoMsgs(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<unknown>
-
-  queryPicOrVideoMsgsDesktop(...args: unknown[]): unknown
-
-  queryEmoticonMsgs(msgId: string, msgTime: string, msgSeq: string, Params: QueryMsgsParams): Promise<unknown>
-
-  queryTroopEmoticonMsgs(msgId: string, msgTime: string, msgSeq: string, Params: QueryMsgsParams): Promise<unknown>
-
-  queryMsgsAndAbstractsWithFilter(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): unknown
-
-  setFocusOnGuild(...args: unknown[]): unknown
-
-  setFocusSession(...args: unknown[]): unknown
-
-  enableFilterUnreadInfoNotify(...args: unknown[]): unknown
-
-  enableFilterMsgAbstractNotify(...args: unknown[]): unknown
-
-  onScenesChangeForSilenceMode(...args: unknown[]): unknown
-
-  getContactUnreadCnt(...args: unknown[]): unknown
-
-  getUnreadCntInfo(...args: unknown[]): unknown
-
-  getGuildUnreadCntInfo(...args: unknown[]): unknown
-
-  getGuildUnreadCntTabInfo(...args: unknown[]): unknown
-
-  getAllGuildUnreadCntInfo(...args: unknown[]): unknown
-
-  getAllJoinGuildCnt(...args: unknown[]): unknown
-
-  getAllDirectSessionUnreadCntInfo(...args: unknown[]): unknown
-
-  getCategoryUnreadCntInfo(...args: unknown[]): unknown
-
-  getGuildFeedsUnreadCntInfo(...args: unknown[]): unknown
-
-  setUnVisibleChannelCntInfo(...args: unknown[]): unknown
-
-  setUnVisibleChannelTypeCntInfo(...args: unknown[]): unknown
-
-  setVisibleGuildCntInfo(...args: unknown[]): unknown
 
   setMsgRead(peer: Peer): Promise<GeneralCallResult>
 
-  setAllC2CAndGroupMsgRead(): Promise<unknown>
-
-  setGuildMsgRead(...args: unknown[]): unknown
-
-  setAllGuildMsgRead(...args: unknown[]): unknown
-
-  setMsgReadAndReport(...args: unknown[]): unknown
-
-  setSpecificMsgReadAndReport(...args: unknown[]): unknown
-
-  setLocalMsgRead(...args: unknown[]): unknown
-
-  setGroupGuildMsgRead(...args: unknown[]): unknown
-
-  getGuildGroupTransData(...args: unknown[]): unknown
-
-  setGroupGuildBubbleRead(...args: unknown[]): unknown
-
-  getGuildGroupBubble(...args: unknown[]): unknown
-
-  fetchGroupGuildUnread(...args: unknown[]): unknown
-
-  setGroupGuildFlag(...args: unknown[]): unknown
-
-  setGuildUDCFlag(...args: unknown[]): unknown
-
-  setGuildTabUserFlag(...args: unknown[]): unknown
-
-  setBuildMode(flag: number/*0 1 3*/): unknown
-
-  setConfigurationServiceData(...args: unknown[]): unknown
-
-  setMarkUnreadFlag(...args: unknown[]): unknown
-
-  getChannelEventFlow(...args: unknown[]): unknown
-
-  getMsgEventFlow(...args: unknown[]): unknown
-
-  getRichMediaFilePathForMobileQQSend(...args: unknown[]): unknown
-
   getRichMediaFilePathForGuild(arg: {
-    md5HexStr: string,
-    fileName: string,
-    elementType: ElementType,
-    elementSubType: number,
-    thumbSize: 0,
-    needCreate: true,
-    downloadType: 1,
+    md5HexStr: string
+    fileName: string
+    elementType: ElementType
+    elementSubType: number
+    thumbSize: 0
+    needCreate: true
+    downloadType: 1
     file_uuid: ''
   }): string
 
-  assembleMobileQQRichMediaFilePath(...args: unknown[]): unknown
-
-  getFileThumbSavePathForSend(...args: unknown[]): unknown
-
-  getFileThumbSavePath(...args: unknown[]): unknown
-
-  //猜测居多
-  translatePtt2Text(MsgId: string, Peer: Dict, MsgElement: Dict): unknown
-
-  setPttPlayedState(...args: unknown[]): unknown
-  // NodeIQQNTWrapperSession fetchFavEmojiList [
-  //   "",
-  //   48,
-  //   true,
-  //   true
-  // ]
   fetchFavEmojiList(str: string, num: number, uk1: boolean, uk2: boolean): Promise<GeneralCallResult & {
-    emojiInfoList: Array<{
-      uin: string,
-      emoId: number,
-      emoPath: string,
-      isExist: boolean,
-      resId: string,
-      url: string,
-      md5: string,
-      emoOriginalPath: string,
-      thumbPath: string,
-      RomaingType: string,
-      isAPNG: false,
-      isMarkFace: false,
-      eId: string,
-      epId: string,
-      ocrWord: string,
-      modifyWord: string,
-      exposeNum: number,
-      clickNum: number,
+    emojiInfoList: {
+      uin: string
+      emoId: number
+      emoPath: string
+      isExist: boolean
+      resId: string
+      url: string
+      md5: string
+      emoOriginalPath: string
+      thumbPath: string
+      RomaingType: string
+      isAPNG: false
+      isMarkFace: false
+      eId: string
+      epId: string
+      ocrWord: string
+      modifyWord: string
+      exposeNum: number
+      clickNum: number
       desc: string
-    }>
+    }[]
   }>
 
-  addFavEmoji(...args: unknown[]): unknown
-
-  fetchMarketEmoticonList(...args: unknown[]): unknown
-
-  fetchMarketEmoticonShowImage(...args: unknown[]): unknown
-
-  fetchMarketEmoticonAioImage(...args: unknown[]): unknown
-
-  fetchMarketEmotionJsonFile(...args: unknown[]): unknown
-
-  getMarketEmoticonPath(...args: unknown[]): unknown
-
-  getMarketEmoticonPathBySync(...args: unknown[]): unknown
-
-  fetchMarketEmoticonFaceImages(...args: unknown[]): unknown
-
-  fetchMarketEmoticonAuthDetail(...args: unknown[]): unknown
-
-  getFavMarketEmoticonInfo(...args: unknown[]): unknown
-
-  addRecentUsedFace(...args: unknown[]): unknown
-
-  getRecentUsedFaceList(...args: unknown[]): unknown
-
-  getMarketEmoticonEncryptKeys(...args: unknown[]): unknown
-
-  downloadEmojiPic(...args: unknown[]): unknown
-
-  deleteFavEmoji(...args: unknown[]): unknown
-
-  modifyFavEmojiDesc(...args: unknown[]): unknown
-
-  queryFavEmojiByDesc(...args: unknown[]): unknown
-
-  getHotPicInfoListSearchString(...args: unknown[]): unknown
-
-  getHotPicSearchResult(...args: unknown[]): unknown
-
-  getHotPicHotWords(...args: unknown[]): unknown
-
-  getHotPicJumpInfo(...args: unknown[]): unknown
-
-  getEmojiResourcePath(...args: unknown[]): unknown
-
-  JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: unknown): unknown
-
-  getMsgAbstracts(...args: unknown[]): unknown
-
-  getMsgAbstract(...args: unknown[]): unknown
-
-  getMsgAbstractList(...args: unknown[]): unknown
-
-  getMsgAbstractListBySeqRange(...args: unknown[]): unknown
-
-  refreshMsgAbstracts(...args: unknown[]): unknown
-
-  refreshMsgAbstractsByGuildIds(...args: unknown[]): unknown
-
-  getRichMediaElement(...args: unknown[]): unknown
-
-  cancelGetRichMediaElement(...args: unknown[]): unknown
-
-  refuseGetRichMediaElement(...args: unknown[]): unknown
-
-  switchToOfflineGetRichMediaElement(...args: unknown[]): unknown
-
   downloadRichMedia(...args: unknown[]): unknown
 
-  getFirstUnreadMsgSeq(args: {
-    peerUid: string
-    guildId: string
-  }): unknown
-
-  getFirstUnreadCommonMsg(...args: unknown[]): unknown
-
-  getFirstUnreadAtmeMsg(...args: unknown[]): unknown
-
-  getFirstUnreadAtallMsg(...args: unknown[]): unknown
-
-  getNavigateInfo(...args: unknown[]): unknown
-
-  getChannelFreqLimitInfo(...args: unknown[]): unknown
-
-  getRecentUseEmojiList(...args: unknown[]): unknown
-
-  getRecentEmojiList(...args: unknown[]): unknown
-
   setMsgEmojiLikes(...args: unknown[]): unknown
 
   getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, cookie: string, bForward: boolean, number: number): Promise<{
@@ -484,235 +86,7 @@ export interface NodeIKernelMsgService {
     isFirstPage: boolean
   }>
 
-  setMsgEmojiLikesForRole(...args: unknown[]): unknown
-
-  clickInlineKeyboardButton(...args: unknown[]): unknown
-
-  setCurOnScreenMsg(...args: unknown[]): unknown
-
-  setCurOnScreenMsgForMsgEvent(...args: unknown[]): unknown
-
-  getMiscData(key: string): unknown
-
-  setMiscData(key: string, value: string): unknown
-
-  getBookmarkData(...args: unknown[]): unknown
-
-  setBookmarkData(...args: unknown[]): unknown
-
-  sendShowInputStatusReq(ChatType: number, EventType: number, toUid: string): Promise<unknown>
-
-  queryCalendar(...args: unknown[]): unknown
-
-  queryFirstMsgSeq(peer: Peer, ...args: unknown[]): unknown
-
-  queryRoamCalendar(...args: unknown[]): unknown
-
-  queryFirstRoamMsg(...args: unknown[]): unknown
-
-  fetchLongMsg(peer: Peer, msgId: string): unknown
-
-  fetchLongMsgWithCb(...args: unknown[]): unknown
-
-  setIsStopKernelFetchLongMsg(...args: unknown[]): unknown
-
-  insertGameResultAsMsgToDb(...args: unknown[]): unknown
-
-  getMultiMsg(...args: unknown[]): Promise<GeneralCallResult & {
-    msgList: RawMessage[]
-  }>
-
-  setDraft(...args: unknown[]): unknown
-
-  getDraft(...args: unknown[]): unknown
-
-  deleteDraft(...args: unknown[]): unknown
-
-  getRecentHiddenSesionList(...args: unknown[]): unknown
-
-  setRecentHiddenSession(...args: unknown[]): unknown
-
-  delRecentHiddenSession(...args: unknown[]): unknown
-
-  getCurHiddenSession(...args: unknown[]): unknown
-
-  setCurHiddenSession(...args: unknown[]): unknown
-
-  setReplyDraft(...args: unknown[]): unknown
-
-  getReplyDraft(...args: unknown[]): unknown
-
-  deleteReplyDraft(...args: unknown[]): unknown
-
-  getFirstUnreadAtMsg(peer: Peer): unknown
-
-  clearMsgRecords(...args: unknown[]): unknown//设置已读后调用我觉得比较好 清理记录 现在别了
-
-  IsExistOldDb(...args: unknown[]): unknown
-
-  canImportOldDbMsg(...args: unknown[]): unknown
-
-  setPowerStatus(z: boolean): unknown
-
-  canProcessDataMigration(...args: unknown[]): unknown
-
-  importOldDbMsg(...args: unknown[]): unknown
-
-  stopImportOldDbMsgAndroid(...args: unknown[]): unknown
-
-  isMqqDataImportFinished(...args: unknown[]): unknown
-
-  getMqqDataImportTableNames(...args: unknown[]): unknown
-
-  getCurChatImportStatusByUin(...args: unknown[]): unknown
-
-  getDataImportUserLevel(): unknown
-
-  getMsgQRCode(...args: unknown[]): unknown
-
-  getGuestMsgAbstracts(...args: unknown[]): unknown
-
-  getGuestMsgByRange(...args: unknown[]): unknown
-
-  getGuestMsgAbstractByRange(...args: unknown[]): unknown
-
-  registerSysMsgNotification(...args: unknown[]): unknown
-
-  unregisterSysMsgNotification(...args: unknown[]): unknown
-
-  enterOrExitAio(...args: unknown[]): unknown
-
-  // this.peerUid = ""
-  // this.peerNickname = ""
-  // this.fromGroupCode = ""
-  // this.sig = new byte[0]
-  // this.selfUid = ""
-  // this.selfPhone = ""
-  // this.chatType = i2
-  // this.peerUid = str
-  // this.peerNickname = str2
-  // this.fromGroupCode = str3
-  // this.sig = bArr
-  // this.selfUid = str4
-  // this.selfPhone = str5
-  // this.gameSession = tempChatGameSession
-  prepareTempChat(args: unknown): unknown//主动临时消息 不做
-
-  sendSsoCmdReqByContend(cmd: string, param: string): Promise<unknown>
-
-  getTempChatInfo(ChatType: number, Uid: string): Promise<TmpChatInfoApi>
-
-  setContactLocalTop(...args: unknown[]): unknown
-
-  switchAnonymousChat(...args: unknown[]): unknown
-
-  renameAnonyChatNick(...args: unknown[]): unknown
-
-  getAnonymousInfo(...args: unknown[]): unknown
-
-  updateAnonymousInfo(...args: unknown[]): unknown
-
-  sendSummonMsg(peer: Peer, MsgElement: unknown, MsgAttributeInfo: unknown): Promise<unknown>//频道的东西
-
-  outputGuildUnreadInfo(...args: unknown[]): unknown
-
-  checkMsgWithUrl(...args: unknown[]): unknown
-
-  checkTabListStatus(...args: unknown[]): unknown
-
-  getABatchOfContactMsgBoxInfo(...args: unknown[]): unknown
-
-  insertMsgToMsgBox(peer: Peer, msgId: string, arg: 2006): unknown
-
-  isHitEmojiKeyword(...args: unknown[]): unknown
-
-  getKeyWordRelatedEmoji(...args: unknown[]): unknown
-
-  recordEmoji(...args: unknown[]): unknown
-
-  fetchGetHitEmotionsByWord(args: Dict): Promise<unknown>//表情推荐？
-
-  deleteAllRoamMsgs(...args: unknown[]): unknown//漫游消息？
-
-  packRedBag(...args: unknown[]): unknown
-
-  grabRedBag(...args: unknown[]): unknown
-
-  pullDetail(...args: unknown[]): unknown
-
-  selectPasswordRedBag(...args: unknown[]): unknown
-
-  pullRedBagPasswordList(...args: unknown[]): unknown
-
-  requestTianshuAdv(...args: unknown[]): unknown
-
-  tianshuReport(...args: unknown[]): unknown
-
-  tianshuMultiReport(...args: unknown[]): unknown
-
-  GetMsgSubType(a0: number, a1: number): unknown
-
-  setIKernelPublicAccountAdapter(...args: unknown[]): unknown
-  //tempChatGameSession有关
-  createUidFromTinyId(fromTinyId: string, toTinyId: string): unknown
-
-  dataMigrationGetDataAvaiableContactList(...args: unknown[]): unknown
-
-  dataMigrationGetMsgList(...args: unknown[]): unknown
-
-  dataMigrationStopOperation(...args: unknown[]): unknown
-
-  dataMigrationImportMsgPbRecord(DataMigrationMsgInfo: Array<{
-    extensionData: string //"Hex"
-    extraData: string //""
-    chatType: number
-    chatUin: string
-    msgType: number
-    msgTime: string
-    msgSeq: string
-    msgRandom: string
-  }>, DataMigrationResourceInfo: {
-    extraData: string
-    filePath: string
-    fileSize: string
-    msgRandom: string
-    msgSeq: string
-    msgSubType: number
-    msgType: number
-  }): unknown
-
-  dataMigrationGetResourceLocalDestinyPath(...args: unknown[]): unknown
-
-  dataMigrationSetIOSPathPrefix(...args: unknown[]): unknown
-
-  getServiceAssistantSwitch(...args: unknown[]): unknown
-
-  setServiceAssistantSwitch(...args: unknown[]): unknown
-
-  setSubscribeFolderUsingSmallRedPoint(...args: unknown[]): unknown
-
-  clearGuildNoticeRedPoint(...args: unknown[]): unknown
-
-  clearFeedNoticeRedPoint(...args: unknown[]): unknown
-
-  clearFeedSquareRead(...args: unknown[]): unknown
-
-  IsC2CStyleChatType(...args: unknown[]): unknown
-
-  IsTempChatType(uin: number): unknown//猜的
-
-  getGuildInteractiveNotification(...args: unknown[]): unknown
-
-  getGuildNotificationAbstract(...args: unknown[]): unknown
-
-  setFocusOnBase(...args: unknown[]): unknown
-
-  queryArkInfo(...args: unknown[]): unknown
-
-  queryUserSecQuality(...args: unknown[]): unknown
-
-  getGuildMsgAbFlag(...args: unknown[]): unknown
-
-  getGroupMsgStorageTime(): unknown//这是嘛啊
+  getMultiMsg(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
+  getTempChatInfo(chatType: number, uid: string): Promise<TmpChatInfoApi>
 }

src/ntqqapi/services/NodeIKernelProfileLikeService.ts

@@ -3,10 +3,6 @@ import { GeneralCallResult } from './common'
 import { Dict } from 'cosmokit'
 
 export interface NodeIKernelProfileLikeService {
-  addKernelProfileLikeListener(listener: NodeIKernelProfileLikeService): void
-
-  removeKernelProfileLikeListener(listener: unknown): void
-
   setBuddyProfileLike(...args: unknown[]): { result: number, errMsg: string, succCounts: number }
 
   getBuddyProfileLike(req: BuddyProfileLikeReq): Promise<GeneralCallResult & {
@@ -26,8 +22,4 @@ export interface NodeIKernelProfileLikeService {
       start: number
     }
   }>
-
-  getProfileLikeScidResourceInfo(...args: unknown[]): void
-
-  isNull(): boolean
-}
+}

src/ntqqapi/services/NodeIKernelProfileService.ts

@@ -1,106 +1,18 @@
-import { AnyCnameRecord } from 'node:dns'
 import { SimpleInfo } from '../types'
 import { GeneralCallResult } from './common'
 
-export enum UserDetailSource {
-  KDB,
-  KSERVER
-}
-
-export enum ProfileBizType {
-  KALL,
-  KBASEEXTEND,
-  KVAS,
-  KQZONE,
-  KOTHER
-}
-
 export interface NodeIKernelProfileService {
-  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>//uin->uid
+  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>
 
   getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string, string>>
 
-  // {
-  //   coreInfo: CoreInfo,
-  //   baseInfo: BaseInfo,
-  //   status: null,
-  //   vasInfo: null,
-  //   relationFlags: null,
-  //   otherFlags: null,
-  //   intimate: null
-  // }
   getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise<Map<string, SimpleInfo>>
 
   fetchUserDetailInfo(trace: string, uids: string[], arg2: number, arg3: number[]): Promise<unknown>
 
-  addKernelProfileListener(listener: unknown): number
-
-  removeKernelProfileListener(listenerId: number): void
-
-  prepareRegionConfig(...args: unknown[]): unknown
-
-  getLocalStrangerRemark(): Promise<AnyCnameRecord>
-
-  enumCountryOptions(): Array<string>
-
-  enumProvinceOptions(Country: string): Array<string>
-
-  enumCityOptions(Country: string, Province: string): unknown
-
-  enumAreaOptions(...args: unknown[]): unknown
-
-  //SimpleInfo
-  // this.uid = ""
-  // this.uid = str
-  // this.uin = j2
-  // this.isBuddy = z
-  // this.coreInfo = coreInfo
-  // this.baseInfo = baseInfo
-  // this.status = statusInfo
-  // this.vasInfo = vasInfo
-  // this.relationFlags = relationFlag
-  // this.otherFlags = otherFlag
-  // this.intimate = intimate
-
-  modifySelfProfile(...args: unknown[]): Promise<unknown>
-
-  modifyDesktopMiniProfile(param: unknown): Promise<GeneralCallResult>
-
-  setNickName(NickName: string): Promise<unknown>
-
-  setLongNick(longNick: string): Promise<unknown>
-
-  setBirthday(...args: unknown[]): Promise<unknown>
-
-  setGander(...args: unknown[]): Promise<unknown>
-
   setHeader(arg: string): Promise<GeneralCallResult>
 
-  setRecommendImgFlag(...args: unknown[]): Promise<unknown>
-
-  getUserSimpleInfo(force: boolean, uids: string[],): Promise<unknown>
-
-  getUserDetailInfo(uid: string): Promise<unknown>
-
-  getUserDetailInfoWithBizInfo(uid: string, Biz: unknown[]): Promise<GeneralCallResult>
+  getUserDetailInfoWithBizInfo(uid: string, biz: unknown[]): Promise<GeneralCallResult>
 
   getUserDetailInfoByUin(uin: string): Promise<unknown>
-
-  getZplanAvatarInfos(args: string[]): Promise<unknown>
-
-  getStatus(uid: string): Promise<unknown>
-
-  startStatusPolling(isForceReset: boolean): Promise<unknown>
-
-  getSelfStatus(): Promise<unknown>
-
-  setdisableEmojiShortCuts(...args: unknown[]): unknown
-
-  getProfileQzonePicInfo(uid: string, type: number, force: boolean): Promise<unknown>
-
-  //profileService.getCoreInfo("UserRemarkServiceImpl::getStrangerRemarkByUid", arrayList)
-  getCoreInfo(name: string, arg: unknown[]): unknown
-
-  //m429253e12.getOtherFlag("FriendListInfoCache_getKernelDataAndPutCache", new ArrayList<>())
-  isNull(): boolean
-}
+}

src/ntqqapi/services/NodeIKernelRichMediaService.ts

@@ -1,191 +1,23 @@
-import { GetFileListParam, MessageElement, Peer } from '../types'
+import { GetFileListParam, Peer } from '../types'
 import { GeneralCallResult } from './common'
 
-export enum UrlFileDownloadType {
-  KUNKNOWN,
-  KURLFILEDOWNLOADPRIVILEGEICON,
-  KURLFILEDOWNLOADPHOTOWALL,
-  KURLFILEDOWNLOADQZONE,
-  KURLFILEDOWNLOADCOMMON,
-  KURLFILEDOWNLOADINSTALLAPP
-}
-
-export enum RMBizTypeEnum {
-  KUNKNOWN,
-  KC2CFILE,
-  KGROUPFILE,
-  KC2CPIC,
-  KGROUPPIC,
-  KDISCPIC,
-  KC2CVIDEO,
-  KGROUPVIDEO,
-  KC2CPTT,
-  KGROUPPTT,
-  KFEEDCOMMENTPIC,
-  KGUILDFILE,
-  KGUILDPIC,
-  KGUILDPTT,
-  KGUILDVIDEO
-}
-
-export interface CommonFileInfo {
-  bizType: number
-  chatType: number
-  elemId: string
-  favId: string
-  fileModelId: string
-  fileName: string
-  fileSize: string
-  md5: string
-  md510m: string
-  msgId: string
-  msgTime: string
-  parent: string
-  peerUid: string
-  picThumbPath: Array<string>
-  sha: string
-  sha3: string
-  subId: string
-  uuid: string
-}
-
 export interface NodeIKernelRichMediaService {
-  //getVideoPlayUrl(peer, msgId, elemId, videoCodecFormat, VideoRequestWay.KHAND, cb)
-  // public enum VideoCodecFormatType {
-  //     KCODECFORMATH264,
-  //     KCODECFORMATH265,
-  //     KCODECFORMATH266,
-  //     KCODECFORMATAV1
-  // }
-  // public enum VideoRequestWay {
-  //     KUNKNOW,
-  //     KHAND,
-  //     KAUTO
-  // }
-  getVideoPlayUrl(peer: Peer, msgId: string, elemId: string, videoCodecFormat: number, VideoRequestWay: number): Promise<unknown>
-
-  //exParams (RMReqExParams)
-  // this.downSourceType = i2
-  // this.triggerType = i3
-  //peer, msgId, elemId, videoCodecFormat, exParams
-  // 1 0 频道在用
-  // 1 1
-  // 0 2
-
-  // public static final int KCOMMONREDENVELOPEMSGTYPEINMSGBOX = 1007
-  // public static final int KDOWNSOURCETYPEAIOINNER = 1
-  // public static final int KDOWNSOURCETYPEBIGSCREEN = 2
-  // public static final int KDOWNSOURCETYPEHISTORY = 3
-  // public static final int KDOWNSOURCETYPEUNKNOWN = 0
-
-  // public static final int KTRIGGERTYPEAUTO = 1
-  // public static final int KTRIGGERTYPEMANUAL = 0
-
   getVideoPlayUrlV2(peer: Peer, msgId: string, elemId: string, videoCodecFormat: number, exParams: { downSourceType: number, triggerType: number }): Promise<GeneralCallResult & {
     urlResult: {
-      v4IpUrl: [],
-      v6IpUrl: [],
-      domainUrl: Array<{
-        url: string,
-        isHttps: boolean,
+      v4IpUrl: []
+      v6IpUrl: []
+      domainUrl: {
+        url: string
+        isHttps: boolean
         httpsDomain: string
-      }>,
+      }[]
       videoCodecFormat: number
     }
   }>
 
-  getRichMediaFileDir(elementType: number, downType: number, isTemp: boolean): unknown
+  deleteGroupFolder(groupCode: string, folderId: string): Promise<GeneralCallResult & { groupFileCommonResult: { retCode: number, retMsg: string, clientWording: string } }>
 
-  // this.senderUid = ""
-  // this.peerUid = ""
-  // this.guildId = ""
-  // this.elem = new MsgElement()
-  // this.downloadType = i2
-  // this.thumbSize = i3
-  // this.msgId = j2
-  // this.msgRandom = j3
-  // this.msgSeq = j4
-  // this.msgTime = j5
-  // this.chatType = i4
-  // this.senderUid = str
-  // this.peerUid = str2
-  // this.guildId = str3
-  // this.elem = msgElement
-  // this.useHttps = num
-
-  getVideoPlayUrlInVisit(arg: {
-    downloadType: number,
-    thumbSize: number,
-    msgId: string,
-    msgRandom: string,
-    msgSeq: string,
-    msgTime: string,
-    chatType: number,
-    senderUid: string,
-    peerUid: string,
-    guildId: string,
-    ele: MessageElement,
-    useHttps: boolean
-  }): Promise<unknown>
-
-  //arg双端number
-  isFileExpired(arg: number): unknown
-
-  deleteGroupFolder(GroupCode: string, FolderId: string): Promise<GeneralCallResult & { groupFileCommonResult: { retCode: number, retMsg: string, clientWording: string } }>
-
-  //参数与getVideoPlayUrlInVisit一样
-  downloadRichMediaInVisit(arg: {
-    downloadType: number,
-    thumbSize: number,
-    msgId: string,
-    msgRandom: string,
-    msgSeq: string,
-    msgTime: string,
-    chatType: number,
-    senderUid: string,
-    peerUid: string,
-    guildId: string,
-    ele: MessageElement,
-    useHttps: boolean
-  }): unknown
-  //arg3为“”
-  downloadFileForModelId(peer: Peer, ModelId: string[], arg3: string): unknown
-  //第三个参数 Array<Type>
-  // this.fileId = ""
-  // this.fileName = ""
-  // this.fileId = str
-  // this.fileName = str2
-  // this.fileSize = j2
-  // this.fileModelId = j3
-
-  downloadFileForFileUuid(peer: Peer, uuid: string, arg3: {
-    fileId: string,
-    fileName: string,
-    fileSize: string,
-    fileModelId: string
-  }[]): Promise<unknown>
-
-  downloadFileByUrlList(fileDownloadTyp: UrlFileDownloadType, urlList: Array<string>): unknown
-
-  downloadFileForFileInfo(fileInfo: CommonFileInfo[], savePath: string): unknown
-
-  createGroupFolder(GroupCode: string, FolderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: unknown, groupItem: Array<unknown> } }>
-
-  downloadFile(commonFile: CommonFileInfo, arg2: unknown, arg3: unknown, savePath: string): unknown
-
-  downloadGroupFolder(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  renameGroupFolder(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  deleteTransferInfo(arg1: unknown, arg2: unknown): unknown
-
-  cancelTransferTask(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  cancelUrlDownload(arg: unknown): unknown
-
-  updateOnlineVideoElemStatus(arg: unknown): unknown
-
-  getGroupSpace(arg: unknown): unknown
+  createGroupFolder(groupCode: string, folderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: unknown, groupItem: unknown[] } }>
 
   getGroupFileList(groupCode: string, params: GetFileListParam): Promise<GeneralCallResult & {
     groupSpaceResult: {
@@ -198,69 +30,14 @@ export interface NodeIKernelRichMediaService {
     }
   }>
 
-  getGroupFileInfo(arg1: unknown, arg2: unknown): unknown
-
-  getGroupTransferList(arg1: unknown, arg2: unknown): unknown
-
-  renameGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown
-
   moveGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown
 
-  transGroupFile(arg1: unknown, arg2: unknown): unknown
-
-  searchGroupFile(
-    keywords: Array<string>,
-    param: {
-      groupIds: Array<string>,
-      fileType: number,
-      context: string,
-      count: number,
-      sortType: number,
-      groupNames: Array<string>
-    }): Promise<unknown>
-  searchGroupFileByWord(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown
-
-  deleteGroupFile(GroupCode: string, params: Array<number>, Files: Array<string>): Promise<GeneralCallResult & {
+  deleteGroupFile(groupCode: string, params: Array<number>, files: Array<string>): Promise<GeneralCallResult & {
     transGroupFileResult: {
       result: unknown
       successFileIdList: Array<unknown>
       failFileIdList: Array<unknown>
     }
   }>
+}
 
-  translateEnWordToZn(words: string[]): Promise<GeneralCallResult & { words: string[] }>
-
-  getScreenOCR(path: string): Promise<unknown>
-
-  batchGetGroupFileCount(Gids: Array<string>): Promise<GeneralCallResult & { groupCodes: Array<string>, groupFileCounts: Array<number> }>
-
-  queryPicDownloadSize(arg: unknown): unknown
-
-  searchGroupFile(arg1: unknown, arg2: unknown): unknown
-
-  searchMoreGroupFile(arg: unknown): unknown
-
-  cancelSearcheGroupFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  onlyDownloadFile(peer: Peer, arg2: unknown, arg3: Array<{
-    fileId: string,
-    fileName: string,
-    fileSize: string,
-    fileModelId: string
-  }
-  >): unknown
-
-  onlyUploadFile(arg1: unknown, arg2: unknown): unknown
-
-  isExtraLargePic(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  uploadRMFileWithoutMsg(arg: {
-    bizType: RMBizTypeEnum,
-    filePath: string,
-    peerUid: string,
-    transferId: string
-    useNTV2: string
-  }): Promise<unknown>
-
-  isNull(): boolean
-}

src/ntqqapi/services/NodeIKernelSearchService.ts

@@ -1,128 +0,0 @@
-import { ChatType } from '../types'
-
-export interface NodeIKernelSearchService {
-  addKernelSearchListener(...args: unknown[]): unknown// needs 1 arguments
-
-  removeKernelSearchListener(...args: unknown[]): unknown// needs 1 arguments
-
-  searchStranger(...args: unknown[]): unknown// needs 3 arguments
-
-  searchGroup(...args: unknown[]): unknown// needs 1 arguments
-
-  searchLocalInfo(keywords: string, unknown: number/*4*/): unknown
-
-  cancelSearchLocalInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  searchBuddyChatInfo(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreBuddyChatInfo(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchBuddyChatInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  searchContact(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreContact(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchContact(...args: unknown[]): unknown// needs 3 arguments
-
-  searchGroupChatInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  resetSearchGroupChatInfoSortType(...args: unknown[]): unknown// needs 3 arguments
-
-  resetSearchGroupChatInfoFilterMembers(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMoreGroupChatInfo(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchGroupChatInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  searchChatsWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMoreChatsWithKeywords(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchChatsWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchChatMsgs(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreChatMsgs(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchChatMsgs(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMsgWithKeywords(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreMsgWithKeywords(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchMsgWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchFileWithKeywords(keywords: string[], source: number): Promise<string>// needs 2 arguments
-
-  searchMoreFileWithKeywords(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchFileWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchAtMeChats(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMoreAtMeChats(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchAtMeChats(...args: unknown[]): unknown// needs 3 arguments
-
-  searchChatAtMeMsgs(...args: unknown[]): unknown// needs 1 arguments
-
-  searchMoreChatAtMeMsgs(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchChatAtMeMsgs(...args: unknown[]): unknown// needs 3 arguments
-
-  addSearchHistory(param: {
-    type: number,//4
-    contactList: [],
-    id: number,//-1
-    groupInfos: [],
-    msgs: [],
-    fileInfos: [
-      {
-        chatType: ChatType,
-        buddyChatInfo: Array<{ category_name: string, peerUid: string, peerUin: string, remark: string }>,
-        discussChatInfo: [],
-        groupChatInfo: Array<
-          {
-            groupCode: string,
-            isConf: boolean,
-            hasModifyConfGroupFace: boolean,
-            hasModifyConfGroupName: boolean,
-            groupName: string,
-            remark: string
-          }>,
-        dataLineChatInfo: [],
-        tmpChatInfo: [],
-        msgId: string,
-        msgSeq: string,
-        msgTime: string,
-        senderUid: string,
-        senderNick: string,
-        senderRemark: string,
-        senderCard: string,
-        elemId: string,
-        elemType: string,//3
-        fileSize: string,
-        filePath: string,
-        fileName: string,
-        hits: Array<
-          {
-            start: 12,
-            end: 14
-          }
-        >
-      }
-    ]
-
-  }): Promise<{
-    result: number,
-    errMsg: string,
-    id?: number
-  }>
-
-  removeSearchHistory(...args: unknown[]): unknown// needs 1 arguments
-
-  searchCache(...args: unknown[]): unknown// needs 3 arguments
-
-  clearSearchCache(...args: unknown[]): unknown// needs 1 arguments
-}

src/ntqqapi/services/NodeIKernelTicketService.ts

@@ -1,11 +1,10 @@
-import { forceFetchClientKeyRetType } from './common'
+import { GeneralCallResult } from './common'
 
 export interface NodeIKernelTicketService {
-  addKernelTicketListener(listener: unknown): void
-
-  removeKernelTicketListener(listenerId: unknown): void
-
-  forceFetchClientKey(arg: string): Promise<forceFetchClientKeyRetType>
-
-  isNull(): boolean
-}
+  forceFetchClientKey(arg: string): Promise<GeneralCallResult & {
+    url: string
+    keyIndex: string
+    clientKey: string
+    expireTime: string
+  }>
+}

src/ntqqapi/services/NodeIKernelTipOffService.ts

@@ -1,19 +1,5 @@
 import { GeneralCallResult } from './common'
 
 export interface NodeIKernelTipOffService {
-  addKernelTipOffListener(listener: unknown): void
-
-  removeKernelTipOffListener(listenerId: unknown): void
-
-  tipOffSendJsData(args: unknown[]): Promise<unknown> //2
-
-  getPskey(domainList: string[], nocache: boolean): Promise<GeneralCallResult & { domainPskeyMap: Map<string, string> }> //2
-
-  tipOffSendJsData(args: unknown[]): Promise<unknown> //2
-
-  tipOffMsgs(args: unknown[]): Promise<unknown> //1
-
-  encodeUinAesInfo(args: unknown[]): Promise<unknown> //2
-
-  isNull(): boolean
-}
+  getPskey(domainList: string[], nocache: boolean): Promise<GeneralCallResult & { domainPskeyMap: Map<string, string> }>
+}

src/ntqqapi/services/common.ts

@@ -1,16 +1,8 @@
 export enum GeneralCallResultStatus {
   OK = 0
-  // ERROR = 1
 }
 
 export interface GeneralCallResult {
   result: GeneralCallResultStatus
   errMsg: string
 }
-
-export interface forceFetchClientKeyRetType extends GeneralCallResult {
-  url: string
-  keyIndex: string
-  clientKey: string
-  expireTime: string
-}

src/ntqqapi/services/index.ts

@@ -9,4 +9,3 @@ export * from './NodeIKernelUixConvertService'
 export * from './NodeIKernelRichMediaService'
 export * from './NodeIKernelTicketService'
 export * from './NodeIKernelTipOffService'
-export * from './NodeIKernelSearchService'

src/ntqqapi/types/group.ts

@@ -78,3 +78,45 @@ export interface PublishGroupBulletinReq {
   pinned: number
   confirmRequired: number
 }
+
+export interface GroupAllInfo {
+  groupCode: string
+  ownerUid: string
+  groupFlag: number
+  groupFlagExt: number
+  maxMemberNum: number
+  memberNum: number
+  groupOption: number
+  classExt: number
+  groupName: string
+  fingerMemo: string
+  groupQuestion: string
+  certType: number
+  shutUpAllTimestamp: number
+  shutUpMeTimestamp: number //解除禁言时间
+  groupTypeFlag: number
+  privilegeFlag: number
+  groupSecLevel: number
+  groupFlagExt3: number
+  isConfGroup: number
+  isModifyConfGroupFace: number
+  isModifyConfGroupName: number
+  noFigerOpenFlag: number
+  noCodeFingerOpenFlag: number
+  groupFlagExt4: number
+  groupMemo: string
+  cmdUinMsgSeq: number
+  cmdUinJoinTime: number
+  cmdUinUinFlag: number
+  cmdUinMsgMask: number
+  groupSecLevelInfo: number
+  cmdUinPrivilege: number
+  cmdUinFlagEx2: number
+  appealDeadline: number
+  remarkName: number
+  isTop: boolean
+  richFingerMemo: string
+  groupAnswer: string
+  joinGroupAuth: string
+  isAllowModifyConfGroupName: number
+}

src/ntqqapi/types/msg.ts

@@ -1,125 +1,108 @@
 import { GroupMemberRole } from './group'
-
-export interface GetFileListParam {
-  sortType: number
-  fileCount: number
-  startIndex: number
-  sortOrder: number
-  showOnlinedocFolder: number
-  folderId?: string
-}
+import { GeneralCallResult } from '../services'
 
 export enum ElementType {
-  UNKNOWN = 0,
-  TEXT = 1,
-  PIC = 2,
-  FILE = 3,
-  PTT = 4,
-  VIDEO = 5,
-  FACE = 6,
-  REPLY = 7,
-  WALLET = 9,
-  GreyTip = 8, //Poke别叫戳一搓了 官方名字拍一拍 戳一戳是另一个名字
-  ARK = 10,
-  MFACE = 11,
-  LIVEGIFT = 12,
-  STRUCTLONGMSG = 13,
-  MARKDOWN = 14,
-  GIPHY = 15,
-  MULTIFORWARD = 16,
-  INLINEKEYBOARD = 17,
-  INTEXTGIFT = 18,
-  CALENDAR = 19,
-  YOLOGAMERESULT = 20,
-  AVRECORD = 21,
-  FEED = 22,
-  TOFURECORD = 23,
-  ACEBUBBLE = 24,
-  ACTIVITY = 25,
-  TOFU = 26,
-  FACEBUBBLE = 27,
-  SHARELOCATION = 28,
-  TASKTOPMSG = 29,
-  RECOMMENDEDMSG = 43,
-  ACTIONBAR = 44
+  Text = 1,
+  Pic = 2,
+  File = 3,
+  Ptt = 4,
+  Video = 5,
+  Face = 6,
+  Reply = 7,
+  GrayTip = 8,
+  Ark = 10,
+  MarketFace = 11,
+  LiveGift = 12,
+  StructLongMsg = 13,
+  Markdown = 14,
+  Giphy = 15,
+  MultiForward = 16,
+  InlineKeyboard = 17,
+  Calendar = 19,
+  YoloGameResult = 20,
+  AvRecord = 21,
+  TofuRecord = 23,
+  FaceBubble = 27,
+  ShareLocation = 28,
+  TaskTopMsg = 29,
+  RecommendedMsg = 43,
+  ActionBar = 44
 }
 
 export interface SendTextElement {
-  elementType: ElementType.TEXT
+  elementType: ElementType.Text
   elementId: ''
   textElement: TextElement
 }
 
 export interface SendPttElement {
-  elementType: ElementType.PTT
+  elementType: ElementType.Ptt
   elementId: ''
-  pttElement: {
-    fileName: string
-    filePath: string
-    md5HexStr: string
-    fileSize: number
-    duration: number // 单位是秒
-    formatType: number
-    voiceType: number
-    voiceChangeType: number
-    canConvert2Text: boolean
-    waveAmplitudes: number[]
-    fileSubId: ''
-    playState: number
-    autoConvertText: number
-  }
-}
-
-export enum PicType {
-  gif = 2000,
-  jpg = 1000,
-}
-
-export enum PicSubType {
-  normal = 0, // 普通图片，大图
-  face = 1, // 表情包小图
+  pttElement: Partial<PttElement>
 }
 
 export interface SendPicElement {
-  elementType: ElementType.PIC
+  elementType: ElementType.Pic
   elementId: ''
-  picElement: {
-    md5HexStr: string
-    fileSize: number | string
-    picWidth: number
-    picHeight: number
-    fileName: string
-    sourcePath: string
-    original: boolean
-    picType: PicType
-    picSubType: PicSubType
-    fileUuid: string
-    fileSubId: string
-    thumbFileSize: number
-    summary: string
-  }
+  picElement: Partial<PicElement>
 }
 
 export interface SendReplyElement {
-  elementType: ElementType.REPLY
+  elementType: ElementType.Reply
   elementId: ''
   replyElement: Partial<ReplyElement>
 }
 
 export interface SendFaceElement {
-  elementType: ElementType.FACE
+  elementType: ElementType.Face
   elementId: ''
   faceElement: FaceElement
 }
 
 export interface SendMarketFaceElement {
-  elementType: ElementType.MFACE
+  elementType: ElementType.MarketFace
+  elementId: ''
   marketFaceElement: MarketFaceElement
 }
 
+export interface SendFileElement {
+  elementType: ElementType.File
+  elementId: ''
+  fileElement: FileElement
+}
+
+export interface SendVideoElement {
+  elementType: ElementType.Video
+  elementId: ''
+  videoElement: VideoElement
+}
+
+export interface SendArkElement {
+  elementType: ElementType.Ark
+  elementId: ''
+  arkElement: ArkElement
+}
+
+export type SendMessageElement =
+  | SendTextElement
+  | SendPttElement
+  | SendPicElement
+  | SendReplyElement
+  | SendFaceElement
+  | SendMarketFaceElement
+  | SendFileElement
+  | SendVideoElement
+  | SendArkElement
+
+export enum AtType {
+  Unknown,
+  All,
+  One,
+}
+
 export interface TextElement {
   content: string
-  atType: number
+  atType: AtType
   atUid: string
   atTinyId: string
   atNtUid: string
@@ -156,91 +139,6 @@ export interface FileElement {
   fileBizId?: number
 }
 
-export interface SendFileElement {
-  elementType: ElementType.FILE
-  elementId: ''
-  fileElement: FileElement
-}
-
-export interface SendVideoElement {
-  elementType: ElementType.VIDEO
-  elementId: ''
-  videoElement: VideoElement
-}
-
-export interface SendArkElement {
-  elementType: ElementType.ARK
-  elementId: ''
-  arkElement: ArkElement
-}
-
-export type SendMessageElement =
-  | SendTextElement
-  | SendPttElement
-  | SendPicElement
-  | SendReplyElement
-  | SendFaceElement
-  | SendMarketFaceElement
-  | SendFileElement
-  | SendVideoElement
-  | SendArkElement
-
-export enum AtType {
-  notAt = 0,
-  atAll = 1,
-  atUser = 2,
-}
-
-export enum ChatType {
-  friend = 1,
-  group = 2,
-  temp = 100,
-}
-
-// 来自Android分析
-export enum ChatType2 {
-  KCHATTYPEADELIE = 42,
-  KCHATTYPEBUDDYNOTIFY = 5,
-  KCHATTYPEC2C = 1,
-  KCHATTYPECIRCLE = 113,
-  KCHATTYPEDATALINE = 8,
-  KCHATTYPEDATALINEMQQ = 134,
-  KCHATTYPEDISC = 3,
-  KCHATTYPEFAV = 41,
-  KCHATTYPEGAMEMESSAGE = 105,
-  KCHATTYPEGAMEMESSAGEFOLDER = 116,
-  KCHATTYPEGROUP = 2,
-  KCHATTYPEGROUPBLESS = 133,
-  KCHATTYPEGROUPGUILD = 9,
-  KCHATTYPEGROUPHELPER = 7,
-  KCHATTYPEGROUPNOTIFY = 6,
-  KCHATTYPEGUILD = 4,
-  KCHATTYPEGUILDMETA = 16,
-  KCHATTYPEMATCHFRIEND = 104,
-  KCHATTYPEMATCHFRIENDFOLDER = 109,
-  KCHATTYPENEARBY = 106,
-  KCHATTYPENEARBYASSISTANT = 107,
-  KCHATTYPENEARBYFOLDER = 110,
-  KCHATTYPENEARBYHELLOFOLDER = 112,
-  KCHATTYPENEARBYINTERACT = 108,
-  KCHATTYPEQQNOTIFY = 132,
-  KCHATTYPERELATEACCOUNT = 131,
-  KCHATTYPESERVICEASSISTANT = 118,
-  KCHATTYPESERVICEASSISTANTSUB = 201,
-  KCHATTYPESQUAREPUBLIC = 115,
-  KCHATTYPESUBSCRIBEFOLDER = 30,
-  KCHATTYPETEMPADDRESSBOOK = 111,
-  KCHATTYPETEMPBUSSINESSCRM = 102,
-  KCHATTYPETEMPC2CFROMGROUP = 100,
-  KCHATTYPETEMPC2CFROMUNKNOWN = 99,
-  KCHATTYPETEMPFRIENDVERIFY = 101,
-  KCHATTYPETEMPNEARBYPRO = 119,
-  KCHATTYPETEMPPUBLICACCOUNT = 103,
-  KCHATTYPETEMPWPA = 117,
-  KCHATTYPEUNKNOWN = 0,
-  KCHATTYPEWEIYUN = 40,
-}
-
 export interface PttElement {
   canConvert2Text: boolean
   duration: number // 秒数
@@ -251,7 +149,7 @@ export interface PttElement {
   fileSize: string // "4261"
   fileSubId: string // "0"
   fileUuid: string // "90j3z7rmRphDPrdVgP9udFBaYar#oK0TWZIV"
-  formatType: string // 1
+  formatType: number // 1
   invalidState: number // 0
   md5HexStr: string // "e4d09c784d5a2abcb2f9980bdc7acfe6"
   playState: number // 0
@@ -262,6 +160,7 @@ export interface PttElement {
   voiceChangeType: number // 0
   voiceType: number // 0
   waveAmplitudes: number[]
+  autoConvertText: number
 }
 
 export interface ArkElement {
@@ -273,6 +172,16 @@ export interface ArkElement {
 export const IMAGE_HTTP_HOST = 'https://gchat.qpic.cn'
 export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn'
 
+export enum PicType {
+  GIF = 2000,
+  JPEG = 1000,
+}
+
+export enum PicSubType {
+  Normal = 0, // 普通图片，大图
+  Face = 1, // 表情包小图
+}
+
 export interface PicElement {
   picSubType: PicSubType
   picType: PicType  // 有这玩意儿吗
@@ -289,22 +198,22 @@ export interface PicElement {
 }
 
 export enum GrayTipElementSubType {
-  REVOKE = 1,
-  PROCLAMATION = 2,
-  EMOJIREPLY = 3,
-  GROUP = 4,
-  BUDDY = 5,
-  FEED = 6,
-  ESSENCE = 7,
-  GROUPNOTIFY = 8,
-  BUDDYNOTIFY = 9,
-  FILE = 10,
-  FEEDCHANNELMSG = 11,
-  XMLMSG = 12,
-  LOCALMSG = 13,
-  BLOCK = 14,
-  AIOOP = 15,
-  WALLET = 16,
+  Revoke = 1,
+  Proclamation = 2,
+  EmojiReply = 3,
+  Group = 4,
+  Buddy = 5,
+  Feed = 6,
+  Essence = 7,
+  GroupNotify = 8,
+  BuddyNotify = 9,
+  File = 10,
+  FeedChannelMsg = 11,
+  XmlMsg = 12,
+  LocalMsg = 13,
+  Block = 14,
+  AioOp = 15,
+  Wallet = 16,
   JSON = 17,
 }
 
@@ -334,7 +243,7 @@ export interface GrayTipElement {
 
 
 export enum FaceIndex {
-  dice = 358,
+  Dice = 358,
   RPS = 359, // 石头剪刀布
 }
 
@@ -408,6 +317,7 @@ export interface InlineKeyboardElementRowButton {
   enter: false
   subscribeDataTemplateIds: []
 }
+
 export interface InlineKeyboardElement {
   rows: [
     {
@@ -424,9 +334,9 @@ export interface TipAioOpGrayTipElement {
 }
 
 export enum TipGroupElementType {
-  memberIncrease = 1,
-  kicked = 3, // 被移出群
-  ban = 8,
+  MemberIncrease = 1,
+  Kicked = 3, // 被移出群
+  Ban = 8,
 }
 
 export interface TipGroupElement {
@@ -468,17 +378,27 @@ export interface TipGroupElement {
   }
 }
 
+export interface StructLongMsgElement {
+  xmlContent: string
+  resId: string
+}
+
 export interface MultiForwardMsgElement {
   xmlContent: string // xml格式的消息内容
   resId: string
   fileName: string
 }
 
+export enum ChatType {
+  C2C = 1,
+  Group = 2,
+  TempC2CFromGroup = 100,
+}
+
 export interface RawMessage {
   msgId: string
   msgType: number
   subMsgType: number
-  msgShortId?: number // 自己维护的消息id
   msgTime: string // 时间戳，秒
   msgSeq: string
   msgRandom: string
@@ -518,12 +438,11 @@ export interface MessageElement {
   fileElement?: FileElement
   liveGiftElement?: unknown
   markdownElement?: MarkdownElement
-  structLongMsgElement?: unknown
+  structLongMsgElement?: StructLongMsgElement
   multiForwardMsgElement?: MultiForwardMsgElement
   giphyElement?: unknown
-  walletElement?: unknown
   inlineKeyboardElement?: InlineKeyboardElement
-  textGiftElement?: unknown //????
+  textGiftElement?: unknown
   calendarElement?: unknown
   yoloGameResultElement?: unknown
   avRecordElement?: unknown
@@ -609,3 +528,34 @@ export interface OnGroupFileInfoUpdateParams {
   nextIndex: number
   reqId: number
 }
+
+export interface QueryMsgsParams {
+  chatInfo: Peer
+  filterMsgType: []
+  filterSendersUid: string[]
+  filterMsgFromTime: string
+  filterMsgToTime: string
+  pageLimit: number
+  isReverseOrder: boolean
+  isIncludeCurrent: boolean
+}
+
+export interface TmpChatInfoApi extends GeneralCallResult {
+  tmpChatInfo?: {
+    chatType: number
+    fromNick: string
+    groupCode: string
+    peerUid: string
+    sessionType: number
+    sig: string
+  }
+}
+
+export interface GetFileListParam {
+  sortType: number
+  fileCount: number
+  startIndex: number
+  sortOrder: number
+  showOnlinedocFolder: number
+  folderId?: string
+}

src/ntqqapi/types/user.ts

@@ -344,3 +344,21 @@ export interface UserDetailInfoByUin {
     vipNameColorId: string
   }
 }
+
+export enum BuddyListReqType {
+  KNOMAL,
+  KLETTER
+}
+
+export enum UserDetailSource {
+  KDB,
+  KSERVER
+}
+
+export enum ProfileBizType {
+  KALL,
+  KBASEEXTEND,
+  KVAS,
+  KQZONE,
+  KOTHER
+}

src/ntqqapi/wrapper.ts

@@ -8,8 +8,7 @@ import {
   NodeIKernelUixConvertService,
   NodeIKernelRichMediaService,
   NodeIKernelTicketService,
-  NodeIKernelTipOffService,
-  NodeIKernelSearchService
+  NodeIKernelTipOffService
 } from './services'
 import { constants } from 'node:os'
 import { Dict } from 'cosmokit'
@@ -26,7 +25,6 @@ export interface NodeIQQNTWrapperSession {
   getRichMediaService(): NodeIKernelRichMediaService
   getTicketService(): NodeIKernelTicketService
   getTipOffService(): NodeIKernelTipOffService
-  getSearchService(): NodeIKernelSearchService
 }
 
 export interface WrapperApi {

src/onebot11/action/file/GetFile.ts

@@ -48,7 +48,7 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
         peerUid: fileCache[0].peerUid,
         guildId: ''
       }
-      if (fileCache[0].elementType === ElementType.PIC) {
+      if (fileCache[0].elementType === ElementType.Pic) {
         const msgList = await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [fileCache[0].msgId])
         if (msgList.msgList.length === 0) {
           throw new Error('msg not found')
@@ -59,7 +59,7 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
           throw new Error('element not found')
         }
         res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement!)
-      } else if (fileCache[0].elementType === ElementType.VIDEO) {
+      } else if (fileCache[0].elementType === ElementType.Video) {
         res.url = await this.ctx.ntFileApi.getVideoUrl(peer, fileCache[0].msgId, fileCache[0].elementId)
       }
       if (enableLocalFile2Url && downloadPath && (res.file === res.url || res.url === undefined)) {

src/onebot11/action/go-cqhttp/DelEssenceMsg.ts

@@ -5,7 +5,7 @@ interface Payload {
   message_id: number | string
 }
 
-export class DelEssenceMsg extends BaseAction<Payload, unknown> {
+export class DeleteEssenceMsg extends BaseAction<Payload, unknown> {
   actionName = ActionName.GoCQHTTP_DelEssenceMsg
   payloadSchema = Schema.object({
     message_id: Schema.union([Number, String]).required()

src/onebot11/action/go-cqhttp/DelGroupFile.ts

@@ -2,9 +2,9 @@ import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: string | number
+  group_id: number | string
   file_id: string
-  busid: number
+  busid: number | string
 }
 
 export class DelGroupFile extends BaseAction<Payload, null> {
@@ -12,11 +12,11 @@ export class DelGroupFile extends BaseAction<Payload, null> {
   payloadSchema = Schema.object({
     group_id: Schema.union([Number, String]).required(),
     file_id: Schema.string().required(),
-    busid: Schema.number().default(102)
+    busid: Schema.union([Number, String]).default(102)
   })
 
   async _handle(payload: Payload) {
-    await this.ctx.ntGroupApi.deleteGroupFile(payload.group_id.toString(), [payload.file_id], [payload.busid])
+    await this.ctx.ntGroupApi.deleteGroupFile(payload.group_id.toString(), [payload.file_id], [+payload.busid])
     return null
   }
 }

src/onebot11/action/go-cqhttp/GetForwardMsg.ts

@@ -16,8 +16,8 @@ interface Response {
 export class GetForwardMsg extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetForwardMsg
   payloadSchema = Schema.object({
-    message_id: String,
-    id: String
+    message_id: Schema.string(),
+    id: Schema.string()
   })
 
   protected async _handle(payload: Payload) {

src/onebot11/action/go-cqhttp/GetGroupEssence.ts

@@ -16,7 +16,7 @@ interface EssenceMsg {
   message_id: number
 }
 
-export class GetGroupEssence extends BaseAction<Payload, EssenceMsg[]> {
+export class GetEssenceMsgList extends BaseAction<Payload, EssenceMsg[]> {
   actionName = ActionName.GoCQHTTP_GetEssenceMsgList
   payloadSchema = Schema.object({
     group_id: Schema.union([Number, String]).required()
@@ -26,7 +26,7 @@ export class GetGroupEssence extends BaseAction<Payload, EssenceMsg[]> {
     const groupCode = payload.group_id.toString()
     const peer = {
       guildId: '',
-      chatType: ChatType.group,
+      chatType: ChatType.Group,
       peerUid: groupCode
     }
     const essence = await this.ctx.ntGroupApi.queryCachedEssenceMsg(groupCode)

src/onebot11/action/go-cqhttp/GetGroupFileUrl.ts

@@ -0,0 +1,64 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { pathToFileURL } from 'node:url'
+import { ChatType } from '@/ntqqapi/types'
+
+export interface Payload {
+  group_id: number | string
+  file_id: string
+  busid?: number
+}
+
+export interface Response {
+  url: string
+}
+
+export class GetGroupFileUrl extends BaseAction<Payload, Response> {
+  actionName = ActionName.GoCQHTTP_GetGroupFileUrl
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    file_id: Schema.string().required()
+  })
+
+  protected async _handle(payload: Payload) {
+    const file = await this.ctx.store.getFileCacheById(payload.file_id)
+    if (file.length > 0) {
+      const { msgId, chatType, peerUid, elementId } = file[0]
+      const path = await this.ctx.ntFileApi.downloadMedia(msgId, chatType, peerUid, elementId)
+      return {
+        url: pathToFileURL(path).href
+      }
+    } else {
+      const groupId = payload.group_id.toString()
+      let modelId: string | undefined
+      let nextIndex: number | undefined
+      while (nextIndex !== 0) {
+        const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
+          sortType: 1,
+          fileCount: 50,
+          startIndex: nextIndex ?? 0,
+          sortOrder: 2,
+          showOnlinedocFolder: 0,
+        })
+        const file = res.item.find(item => item.fileInfo?.fileId === payload.file_id)
+        if (file) {
+          modelId = file.fileInfo?.fileModelId
+          break
+        }
+        nextIndex = res.nextIndex
+      }
+      if (modelId) {
+        const peer = {
+          chatType: ChatType.Group,
+          peerUid: groupId,
+          guildId: ''
+        }
+        const path = await this.ctx.ntFileApi.downloadFileForModelId(peer, modelId)
+        return {
+          url: pathToFileURL(path).href
+        }
+      }
+      throw new Error('file not found')
+    }
+  }
+}

src/onebot11/action/go-cqhttp/GetGroupFilesByFolder.ts

@@ -1,11 +1,11 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot11/types'
+import { OnGroupFileInfoUpdateParams } from '@/ntqqapi/types'
 
 interface Payload {
-  group_id: string | number
+  group_id: number | string
   folder_id: string
-  file_count: string | number
 }
 
 interface Response {
@@ -17,19 +17,27 @@ export class GetGroupFilesByFolder extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupFilesByFolder
   payloadSchema = Schema.object({
     group_id: Schema.union([Number, String]).required(),
-    folder_id: Schema.string().required(),
-    file_count: Schema.union([Number, String]).default(50)
+    folder_id: Schema.string().required()
   })
 
   async _handle(payload: Payload) {
-    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
-      sortType: 1,
-      fileCount: +payload.file_count,
-      startIndex: 0,
-      sortOrder: 2,
-      showOnlinedocFolder: 0,
-      folderId: payload.folder_id
-    })
+    const groupId = payload.group_id.toString()
+    const data: OnGroupFileInfoUpdateParams['item'] = []
+
+    let nextIndex: number | undefined
+    while (nextIndex !== 0) {
+      const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
+        sortType: 1,
+        fileCount: 100,
+        startIndex: nextIndex ?? 0,
+        sortOrder: 2,
+        showOnlinedocFolder: 0,
+        folderId: payload.folder_id
+      })
+      data.push(...res.item)
+      nextIndex = res.nextIndex
+    }
+
     return {
       files: data.filter(item => item.fileInfo)
         .map(item => {

src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -4,7 +4,7 @@ import { ActionName } from '../types'
 import { ChatType } from '@/ntqqapi/types'
 import { OB11Entities } from '../../entities'
 import { RawMessage } from '@/ntqqapi/types'
-import { filterNullable } from '@/common/utils/misc'
+import { filterNullable, parseBool } from '@/common/utils/misc'
 
 interface Payload {
   group_id: number | string
@@ -23,15 +23,14 @@ export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
     group_id: Schema.union([Number, String]).required(),
     message_seq: Schema.union([Number, String]),
     count: Schema.union([Number, String]).default(20),
-    reverseOrder: Schema.boolean().default(false),
+    reverseOrder: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
   })
 
   protected async _handle(payload: Payload): Promise<Response> {
     const { count, reverseOrder } = payload
-    const peer = { chatType: ChatType.group, peerUid: payload.group_id.toString() }
-    let msgList: RawMessage[] | undefined
-    // 包含 message_seq 0
-    if (!payload.message_seq) {
+    const peer = { chatType: ChatType.Group, peerUid: payload.group_id.toString() }
+    let msgList: RawMessage[]
+    if (!payload.message_seq || payload.message_seq === '0') {
       msgList = (await this.ctx.ntMsgApi.getAioFirstViewLatestMsgs(peer, +count)).msgList
     } else {
       const startMsgId = (await this.ctx.store.getMsgInfoByShortId(+payload.message_seq))?.msgId
@@ -40,12 +39,7 @@ export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
     }
     if (!msgList?.length) throw new Error('未找到消息')
     if (reverseOrder) msgList.reverse()
-    await Promise.all(
-      msgList.map(async msg => {
-        msg.msgShortId = this.ctx.store.createMsgShortId({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
-      })
-    )
-    const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Entities.message(this.ctx, msg)))
+    const ob11MsgList = await Promise.all(msgList.map(msg => OB11Entities.message(this.ctx, msg)))
     return { messages: filterNullable(ob11MsgList) }
   }
 }

src/onebot11/action/go-cqhttp/GetGroupRootFiles.ts

@@ -1,10 +1,10 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { OB11GroupFile, OB11GroupFileFolder } from '../../types'
+import { OnGroupFileInfoUpdateParams } from '@/ntqqapi/types'
 
 interface Payload {
-  group_id: string | number
-  file_count: string | number
+  group_id: number | string
 }
 
 interface Response {
@@ -15,18 +15,26 @@ interface Response {
 export class GetGroupRootFiles extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupRootFiles
   payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    file_count: Schema.union([Number, String]).default(50),
+    group_id: Schema.union([Number, String]).required()
   })
 
   async _handle(payload: Payload) {
-    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
-      sortType: 1,
-      fileCount: +payload.file_count,
-      startIndex: 0,
-      sortOrder: 2,
-      showOnlinedocFolder: 0,
-    })
+    const groupId = payload.group_id.toString()
+    const data: OnGroupFileInfoUpdateParams['item'] = []
+
+    let nextIndex: number | undefined
+    while (nextIndex !== 0) {
+      const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
+        sortType: 1,
+        fileCount: 100,
+        startIndex: nextIndex ?? 0,
+        sortOrder: 2,
+        showOnlinedocFolder: 0,
+      })
+      data.push(...res.item)
+      nextIndex = res.nextIndex
+    }
+
     return {
       files: data.filter(item => item.fileInfo)
         .map(item => {

src/onebot11/action/go-cqhttp/SendForwardMsg.ts

@@ -36,8 +36,9 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
       contextMode = CreatePeerMode.Private
     }
     const peer = await createPeer(this.ctx, payload, contextMode)
-    const returnMsg = await this.handleForwardNode(peer, payload.messages)
-    return { message_id: returnMsg.msgShortId! }
+    const msg = await this.handleForwardNode(peer, payload.messages)
+    const msgShortId = this.ctx.store.createMsgShortId({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
+    return { message_id: msgShortId }
   }
 
   private async cloneMsg(msg: RawMessage): Promise<RawMessage | undefined> {
@@ -52,7 +53,7 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
     this.ctx.logger.info('克隆消息', sendElements)
     try {
       const peer = {
-        chatType: ChatType.friend,
+        chatType: ChatType.C2C,
         peerUid: selfInfo.uid
       }
       const nodeMsg = await this.ctx.ntMsgApi.sendMsg(peer, sendElements)
@@ -66,7 +67,7 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
   // 返回一个合并转发的消息id
   private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[]) {
     const selfPeer = {
-      chatType: ChatType.friend,
+      chatType: ChatType.C2C,
       peerUid: selfInfo.uid,
     }
     const nodeMsgIds: { msgId: string, peer: Peer }[] = []
@@ -100,7 +101,7 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
               sendElementsSplit[splitIndex] = []
             }
 
-            if (ele.elementType === ElementType.FILE || ele.elementType === ElementType.VIDEO) {
+            if (ele.elementType === ElementType.File || ele.elementType === ElementType.Video) {
               if (sendElementsSplit[splitIndex].length > 0) {
                 splitIndex++
               }
@@ -157,7 +158,6 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
       throw Error('转发消息失败，节点为空')
     }
     const returnMsg = await this.ctx.ntMsgApi.multiForwardMsg(srcPeer!, destPeer, retMsgIds)
-    returnMsg.msgShortId = this.ctx.store.createMsgShortId(destPeer, returnMsg.msgId)
     return returnMsg
   }
 }

src/onebot11/action/go-cqhttp/SetEssenceMsg.ts

@@ -1,24 +1,22 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
   message_id: number | string
 }
 
-export class SetEssenceMsg extends BaseAction<Payload, unknown> {
+export class SetEssenceMsg extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_SetEssenceMsg
+  payloadSchema = Schema.object({
+    message_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    if (!payload.message_id) {
-      throw Error('message_id不能为空')
-    }
     const msg = await this.ctx.store.getMsgInfoByShortId(+payload.message_id)
     if (!msg) {
       throw new Error('msg not found')
     }
-    return await this.ctx.ntGroupApi.addGroupEssence(
-      msg.peer.peerUid,
-      msg.msgId
-    )
+    await this.ctx.ntGroupApi.addGroupEssence(msg.peer.peerUid, msg.msgId)
+    return null
   }
 }

src/onebot11/action/go-cqhttp/UploadGroupFile.ts

@@ -0,0 +1,35 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { SendElementEntities } from '@/ntqqapi/entities'
+import { uri2local } from '@/common/utils'
+import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
+
+interface Payload {
+  group_id: number | string
+  file: string
+  name: string
+  folder?: string
+  folder_id?: string
+}
+
+export class UploadGroupFile extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_UploadGroupFile
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    file: Schema.string().required(),
+    name: Schema.string(),
+    folder: Schema.string(),
+    folder_id: Schema.string()
+  })
+
+  protected async _handle(payload: Payload): Promise<null> {
+    const { success, errMsg, path, fileName } = await uri2local(payload.file)
+    if (!success) {
+      throw new Error(errMsg)
+    }
+    const file = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder ?? payload.folder_id)
+    const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group)
+    await sendMsg(this.ctx, peer, [file], [])
+    return null
+  }
+}

src/onebot11/action/go-cqhttp/UploadPrivateFile.ts

@@ -1,32 +1,9 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { SendElementEntities } from '@/ntqqapi/entities'
 import { uri2local } from '@/common/utils'
 import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
 
-interface UploadGroupFilePayload {
-  group_id: number | string
-  file: string
-  name: string
-  folder?: string
-  folder_id?: string
-}
-
-export class UploadGroupFile extends BaseAction<UploadGroupFilePayload, null> {
-  actionName = ActionName.GoCQHTTP_UploadGroupFile
-
-  protected async _handle(payload: UploadGroupFilePayload): Promise<null> {
-    const { success, errMsg, path, fileName } = await uri2local(payload.file)
-    if (!success) {
-      throw new Error(errMsg)
-    }
-    const file = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder ?? payload.folder_id)
-    const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group)
-    await sendMsg(this.ctx, peer, [file], [])
-    return null
-  }
-}
-
 interface UploadPrivateFilePayload {
   user_id: number | string
   file: string
@@ -35,6 +12,11 @@ interface UploadPrivateFilePayload {
 
 export class UploadPrivateFile extends BaseAction<UploadPrivateFilePayload, null> {
   actionName = ActionName.GoCQHTTP_UploadPrivateFile
+  payloadSchema = Schema.object({
+    user_id: Schema.union([Number, String]).required(),
+    file: Schema.string().required(),
+    name: Schema.string()
+  })
 
   protected async _handle(payload: UploadPrivateFilePayload): Promise<null> {
     const { success, errMsg, path, fileName } = await uri2local(payload.file)

src/onebot11/action/group/GetGroupHonorInfo.ts

@@ -1,22 +1,19 @@
-import { WebHonorType } from '@/ntqqapi/api'
 import { ActionName } from '../types'
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 
 interface Payload {
-  group_id: number
-  type?: WebHonorType
+  group_id: number | string
+  type: 'talkative' | 'performer' | 'legend' | 'strong_newbie' | 'emotion' | 'all'
 }
 
 export class GetGroupHonorInfo extends BaseAction<Payload, unknown> {
   actionName = ActionName.GetGroupHonorInfo
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    type: Schema.union(['talkative', 'performer', 'legend', 'strong_newbie', 'emotion', 'all']).default('all')
+  })
 
   protected async _handle(payload: Payload) {
-    if (!payload.group_id) {
-      throw '缺少参数group_id'
-    }
-    if (!payload.type) {
-      payload.type = WebHonorType.ALL
-    }
     return await this.ctx.ntWebApi.getGroupHonorInfo(payload.group_id.toString(), payload.type)
   }
 }

src/onebot11/action/group/GetGroupInfo.ts

@@ -1,6 +1,6 @@
 import { OB11Group } from '../../types'
 import { OB11Entities } from '../../entities'
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -9,14 +9,17 @@ interface Payload {
 
 class GetGroupInfo extends BaseAction<Payload, OB11Group> {
   actionName = ActionName.GetGroupInfo
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    const group = (await this.ctx.ntGroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString())
+    const groupCode = payload.group_id.toString()
+    const group = (await this.ctx.ntGroupApi.getGroups()).find(e => e.groupCode === groupCode)
     if (group) {
       return OB11Entities.group(group)
-    } else {
-      throw `群${payload.group_id}不存在`
     }
+    throw new Error(`群${payload.group_id}不存在`)
   }
 }
 

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -1,8 +1,7 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
-import { selfInfo } from '@/common/globalVars'
 import { isNullable } from 'cosmokit'
 
 interface Payload {
@@ -12,35 +11,26 @@ interface Payload {
 
 class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   actionName = ActionName.GetGroupMemberInfo
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), payload.user_id.toString())
+    const groupCode = payload.group_id.toString()
+    const member = await this.ctx.ntGroupApi.getGroupMember(groupCode, payload.user_id.toString())
     if (member) {
       if (isNullable(member.sex)) {
-        //log('获取群成员详细信息')
         const info = await this.ctx.ntUserApi.getUserDetailInfo(member.uid)
-        //log('群成员详细信息结果', info)
         Object.assign(member, info)
       }
-      const ret = OB11Entities.groupMember(payload.group_id.toString(), member)
-      const self = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), selfInfo.uid)
-      if (self?.role === 3 || self?.role === 4) {
-        const webGroupMembers = await this.ctx.ntWebApi.getGroupMembers(payload.group_id.toString())
-        const target = webGroupMembers.find(e => e?.uin && e.uin === ret.user_id)
-        if (target) {
-          ret.join_time = target.join_time
-          ret.last_sent_time = target.last_speak_time
-          ret.qage = target.qage
-          ret.level = target.lv.level.toString()
-        }
-      }
+      const ret = OB11Entities.groupMember(groupCode, member)
       const date = Math.round(Date.now() / 1000)
-      ret.last_sent_time ||= Number(member.lastSpeakTime || date)
-      ret.join_time ||= Number(member.joinTime || date)
+      ret.last_sent_time ??= date
+      ret.join_time ??= date
       return ret
-    } else {
-      throw `群成员${payload.user_id}不存在`
     }
+    throw new Error(`群成员${payload.user_id}不存在`)
   }
 }
 

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,16 +1,18 @@
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { selfInfo } from '@/common/globalVars'
 
 interface Payload {
   group_id: number | string
-  no_cache: boolean | string
+  no_cache?: boolean | string
 }
 
 class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
   actionName = ActionName.GetGroupMemberList
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
     const groupCode = payload.group_id.toString()
@@ -20,43 +22,14 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
       groupMembers = await this.ctx.ntGroupApi.getGroupMembers(groupCode)
     }
     const groupMembersArr = Array.from(groupMembers.values())
-
-    const _groupMembers = groupMembersArr.map(item => {
-      return OB11Entities.groupMember(groupCode, item)
-    })
-
-    const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>()
     const date = Math.round(Date.now() / 1000)
 
-    for (let i = 0, len = _groupMembers.length; i < len; i++) {
-      // 保证基础数据有这个 同时避免群管插件过于依赖这个杀了
-      _groupMembers[i].join_time ||= date
-      _groupMembers[i].last_sent_time ||= date
-      MemberMap.set(_groupMembers[i].user_id, _groupMembers[i])
-    }
-
-    const selfRole = groupMembers.get(selfInfo.uid)?.role
-    const isPrivilege = selfRole === 3 || selfRole === 4
-
-    if (isPrivilege) {
-      const webGroupMembers = await this.ctx.ntWebApi.getGroupMembers(groupCode)
-      for (let i = 0, len = webGroupMembers.length; i < len; i++) {
-        if (!webGroupMembers[i]?.uin) {
-          continue
-        }
-        const MemberData = MemberMap.get(webGroupMembers[i]?.uin)
-        if (MemberData) {
-          if (MemberData.join_time === date) {
-            MemberData.join_time = webGroupMembers[i]?.join_time
-            MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time
-          }
-          MemberData.qage = webGroupMembers[i]?.qage
-          MemberMap.set(webGroupMembers[i]?.uin, MemberData)
-        }
-      }
-    }
-
-    return Array.from(MemberMap.values())
+    return groupMembersArr.map(item => {
+      const member = OB11Entities.groupMember(groupCode, item)
+      member.join_time ??= date
+      member.last_sent_time ??= date
+      return member
+    })
   }
 }
 

src/onebot11/action/group/SetGroupAddRequest.ts

@@ -1,22 +1,26 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { GroupRequestOperateTypes } from '@/ntqqapi/types'
 import { ActionName } from '../types'
+import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
   flag: string
-  approve?: boolean | string
+  approve: boolean
   reason?: string
 }
 
 export default class SetGroupAddRequest extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupAddRequest
+  payloadSchema = Schema.object({
+    flag: Schema.string().required(),
+    approve: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(true),
+    reason: Schema.string()
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const flag = payload.flag.toString()
-    const approve = payload.approve?.toString() !== 'false'
     await this.ctx.ntGroupApi.handleGroupRequest(
-      flag,
-      approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+      payload.flag,
+      payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
       payload.reason
     )
     return null

src/onebot11/action/group/SetGroupAdmin.ts

@@ -1,26 +1,31 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { GroupMemberRole } from '@/ntqqapi/types'
 import { ActionName } from '../types'
+import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  group_id: number
-  user_id: number
+  group_id: number | string
+  user_id: number | string
   enable: boolean
 }
 
 export default class SetGroupAdmin extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupAdmin
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    enable: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(true)
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    const enable = payload.enable.toString() === 'true'
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`
-    }
+    const groupCode = payload.group_id.toString()
+    const uin = payload.user_id.toString()
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
+    if (!uid) throw new Error('无法获取用户信息')
     await this.ctx.ntGroupApi.setMemberRole(
-      payload.group_id.toString(),
-      member.uid,
-      enable ? GroupMemberRole.admin : GroupMemberRole.normal,
+      groupCode,
+      uid,
+      payload.enable ? GroupMemberRole.admin : GroupMemberRole.normal
     )
     return null
   }

src/onebot11/action/group/SetGroupBan.ts

@@ -1,22 +1,27 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
-  user_id: number
+  group_id: number | string
+  user_id: number | string
   duration: number
 }
 
 export default class SetGroupBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupBan
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    duration: Schema.number().default(30 * 60)
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`
-    }
-    await this.ctx.ntGroupApi.banMember(payload.group_id.toString(), [
-      { uid: member.uid, timeStamp: parseInt(payload.duration.toString()) },
+    const groupCode = payload.group_id.toString()
+    const uin = payload.user_id.toString()
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
+    if (!uid) throw new Error('无法获取用户信息')
+    await this.ctx.ntGroupApi.banMember(groupCode, [
+      { uid, timeStamp: payload.duration },
     ])
     return null
   }

src/onebot11/action/group/SetGroupCard.ts

@@ -1,21 +1,26 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
-  user_id: number
+  group_id: number | string
+  user_id: number | string
   card: string
 }
 
 export default class SetGroupCard extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupCard
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    card: Schema.string().default('')
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`
-    }
-    await this.ctx.ntGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || '')
+    const groupCode = payload.group_id.toString()
+    const uin = payload.user_id.toString()
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
+    if (!uid) throw new Error('无法获取用户信息')
+    await this.ctx.ntGroupApi.setMemberCard(groupCode, uid, payload.card)
     return null
   }
 }

src/onebot11/action/group/SetGroupKick.ts

@@ -1,21 +1,27 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
+import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  group_id: number
-  user_id: number
+  group_id: number | string
+  user_id: number | string
   reject_add_request: boolean
 }
 
 export default class SetGroupKick extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupKick
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    reject_add_request: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`
-    }
-    await this.ctx.ntGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request)
+    const groupCode = payload.group_id.toString()
+    const uin = payload.user_id.toString()
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
+    if (!uid) throw new Error('无法获取用户信息')
+    await this.ctx.ntGroupApi.kickMember(groupCode, [uid], payload.reject_add_request)
     return null
   }
 }

src/onebot11/action/group/SetGroupLeave.ts

@@ -1,20 +1,19 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
-  is_dismiss: boolean
+  group_id: number | string
+  is_dismiss?: boolean
 }
 
-export default class SetGroupLeave extends BaseAction<Payload, void> {
+export default class SetGroupLeave extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupLeave
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    try {
-      await this.ctx.ntGroupApi.quitGroup(payload.group_id.toString())
-    } catch (e) {
-      this.ctx.logger.error('退群失败', e)
-      throw e
-    }
+    await this.ctx.ntGroupApi.quitGroup(payload.group_id.toString())
+    return null
   }
 }

src/onebot11/action/group/SetGroupName.ts

@@ -1,13 +1,17 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
   group_name: string
 }
 
 export default class SetGroupName extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupName
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    group_name: Schema.string().required()
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
     await this.ctx.ntGroupApi.setGroupName(payload.group_id.toString(), payload.group_name)

src/onebot11/action/group/SetGroupWholeBan.ts

@@ -1,17 +1,21 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
+import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
   enable: boolean
 }
 
 export default class SetGroupWholeBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupWholeBan
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    enable: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(true)
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const enable = payload.enable.toString() === 'true'
-    await this.ctx.ntGroupApi.banGroup(payload.group_id.toString(), enable)
+    await this.ctx.ntGroupApi.banGroup(payload.group_id.toString(), payload.enable)
     return null
   }
 }

src/onebot11/action/index.ts

@@ -1,7 +1,7 @@
 import type Adapter from '../adapter'
 import GetMsg from './msg/GetMsg'
 import GetLoginInfo from './system/GetLoginInfo'
-import { GetFriendList, GetFriendWithCategory } from './user/GetFriendList'
+import { GetFriendList } from './user/GetFriendList'
 import GetGroupList from './group/GetGroupList'
 import GetGroupInfo from './group/GetGroupInfo'
 import GetGroupMemberList from './group/GetGroupMemberList'
@@ -37,7 +37,6 @@ import GetImage from './file/GetImage'
 import GetRecord from './file/GetRecord'
 import { MarkMsgAsRead } from './go-cqhttp/MarkMsgAsRead'
 import CleanCache from './system/CleanCache'
-import { UploadGroupFile, UploadPrivateFile } from './go-cqhttp/UploadFile'
 import { GetConfigAction, SetConfigAction } from './llonebot/Config'
 import GetGroupAddRequest from './llonebot/GetGroupAddRequest'
 import SetQQAvatar from './llonebot/SetQQAvatar'
@@ -48,11 +47,11 @@ import { GetForwardMsg } from './go-cqhttp/GetForwardMsg'
 import { GetCookies } from './user/GetCookie'
 import { SetMsgEmojiLike } from './msg/SetMsgEmojiLike'
 import { ForwardFriendSingleMsg, ForwardGroupSingleMsg } from './msg/ForwardSingleMsg'
-import { GetGroupEssence } from './group/GetGroupEssence'
+import { GetEssenceMsgList } from './go-cqhttp/GetGroupEssence'
 import { GetGroupHonorInfo } from './group/GetGroupHonorInfo'
 import { HandleQuickOperation } from './go-cqhttp/QuickOperation'
 import { SetEssenceMsg } from './go-cqhttp/SetEssenceMsg'
-import { DelEssenceMsg } from './go-cqhttp/DelEssenceMsg'
+import { DeleteEssenceMsg } from './go-cqhttp/DelEssenceMsg'
 import { GetEvent } from './llonebot/GetEvent'
 import { DelGroupFile } from './go-cqhttp/DelGroupFile'
 import { GetGroupSystemMsg } from './go-cqhttp/GetGroupSystemMsg'
@@ -67,6 +66,10 @@ import { FetchEmojiLike } from './llonebot/FetchEmojiLike'
 import { FetchCustomFace } from './llonebot/FetchCustomFace'
 import { GetFriendMsgHistory } from './llonebot/GetFriendMsgHistory'
 import { GetGroupFilesByFolder } from './go-cqhttp/GetGroupFilesByFolder'
+import { GetFriendWithCategory } from './llonebot/GetFriendWithCategory'
+import { UploadGroupFile } from './go-cqhttp/UploadGroupFile'
+import { UploadPrivateFile } from './go-cqhttp/UploadPrivateFile'
+import { GetGroupFileUrl } from './go-cqhttp/GetGroupFileUrl'
 
 export function initActionMap(adapter: Adapter) {
   const actionHandlers = [
@@ -117,7 +120,7 @@ export function initActionMap(adapter: Adapter) {
     new ForwardFriendSingleMsg(adapter),
     new ForwardGroupSingleMsg(adapter),
     // go-cqhttp
-    new GetGroupEssence(adapter),
+    new GetEssenceMsgList(adapter),
     new GetGroupHonorInfo(adapter),
     new SendForwardMsg(adapter),
     new SendGroupForwardMsg(adapter),
@@ -132,7 +135,7 @@ export function initActionMap(adapter: Adapter) {
     new GetForwardMsg(adapter),
     new HandleQuickOperation(adapter),
     new SetEssenceMsg(adapter),
-    new DelEssenceMsg(adapter),
+    new DeleteEssenceMsg(adapter),
     new DelGroupFile(adapter),
     new GetGroupSystemMsg(adapter),
     new CreateGroupFileFolder(adapter),
@@ -141,6 +144,7 @@ export function initActionMap(adapter: Adapter) {
     new GetGroupRootFiles(adapter),
     new SendGroupNotice(adapter),
     new GetGroupFilesByFolder(adapter),
+    new GetGroupFileUrl(adapter)
   ]
   const actionMap = new Map<string, BaseAction<any, unknown>>()
   for (const action of actionHandlers) {

src/onebot11/action/llonebot/GetFriendMsgHistory.ts

@@ -3,7 +3,7 @@ import { OB11Message } from '@/onebot11/types'
 import { ActionName } from '../types'
 import { ChatType, RawMessage } from '@/ntqqapi/types'
 import { OB11Entities } from '@/onebot11/entities'
-import { filterNullable } from '@/common/utils/misc'
+import { filterNullable, parseBool } from '@/common/utils/misc'
 
 interface Payload {
   user_id: number | string
@@ -24,7 +24,7 @@ export class GetFriendMsgHistory extends BaseAction<Payload, Response> {
     message_seq: Schema.union([Number, String]),
     message_id: Schema.union([Number, String]),
     count: Schema.union([Number, String]).default(20),
-    reverseOrder: Schema.boolean().default(false)
+    reverseOrder: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
   })
 
   async _handle(payload: Payload): Promise<Response> {
@@ -38,14 +38,11 @@ export class GetFriendMsgHistory extends BaseAction<Payload, Response> {
       const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString())
       if (!uid) throw new Error(`记录${payload.user_id}不存在`)
       const isBuddy = await this.ctx.ntFriendApi.isBuddy(uid)
-      const peer = { chatType: isBuddy ? ChatType.friend : ChatType.temp, peerUid: uid }
+      const peer = { chatType: isBuddy ? ChatType.C2C : ChatType.TempC2CFromGroup, peerUid: uid }
       msgList = (await this.ctx.ntMsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList
     }
     if (msgList.length === 0) throw new Error('未找到消息')
     if (payload.reverseOrder) msgList.reverse()
-    msgList.map(msg => {
-      msg.msgShortId = this.ctx.store.createMsgShortId({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
-    })
     const ob11MsgList = await Promise.all(msgList.map(msg => OB11Entities.message(this.ctx, msg)))
     return { messages: filterNullable(ob11MsgList) }
   }

src/onebot11/action/llonebot/GetFriendWithCategory.ts

@@ -0,0 +1,38 @@
+import { BaseAction } from '../BaseAction'
+import { OB11User } from '../../types'
+import { OB11Entities } from '../../entities'
+import { ActionName } from '../types'
+import { getBuildVersion } from '@/common/utils'
+
+interface Category {
+  categoryId: number
+  categorySortId: number
+  categoryName: string
+  categoryMbCount: number
+  onlineCount: number
+  buddyList: OB11User[]
+}
+
+export class GetFriendWithCategory extends BaseAction<void, Category[]> {
+  actionName = ActionName.GetFriendsWithCategory
+
+  protected async _handle() {
+    if (getBuildVersion() < 26702) {
+      throw new Error('this ntqq version not support, must be 26702 or later')
+    }
+    const data = await this.ctx.ntFriendApi.getBuddyV2WithCate(true)
+    return data.buddyCategory.map(item => {
+      return {
+        categoryId: item.categoryId,
+        categorySortId: item.categorySortId,
+        categoryName: item.categroyName,
+        categoryMbCount: item.categroyMbCount,
+        onlineCount: item.onlineCount,
+        buddyList: item.buddyUids.map(uid => {
+          const info = data.userSimpleInfos[uid]
+          return OB11Entities.friendV2(info)
+        })
+      }
+    })
+  }
+}

src/onebot11/action/llonebot/GetGroupAddRequest.ts

@@ -1,5 +1,5 @@
 import { BaseAction } from '../BaseAction'
-import { GroupNotify, GroupNotifyStatus } from '@/ntqqapi/types'
+import { GroupNotifyStatus } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 
 interface OB11GroupRequestNotify {
@@ -13,7 +13,7 @@ export default class GetGroupAddRequest extends BaseAction<null, OB11GroupReques
 
   protected async _handle(): Promise<OB11GroupRequestNotify[]> {
     const data = await this.ctx.ntGroupApi.getGroupIgnoreNotifies()
-    const notifies: GroupNotify[] = data.notifies.filter((notify) => notify.status === GroupNotifyStatus.KUNHANDLE)
+    const notifies = data.notifies.filter(notify => notify.status === GroupNotifyStatus.KUNHANDLE)
     const returnData: OB11GroupRequestNotify[] = []
     for (const notify of notifies) {
       const uin = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)

src/onebot11/action/llonebot/GetProfileLike.ts

@@ -8,10 +8,10 @@ export class GetProfileLike extends BaseAction<void, Dict[]> {
 
   async _handle() {
     const ret = await this.ctx.ntUserApi.getProfileLike(selfInfo.uid)
-    const listdata = ret.info.userLikeInfos[0].favoriteInfo.userInfos
-    for (const item of listdata) {
+    const data = ret.info.userLikeInfos[0].favoriteInfo.userInfos
+    for (const item of data) {
       item.uin = Number(await this.ctx.ntUserApi.getUinByUid(item.uid)) || 0
     }
-    return listdata
+    return data
   }
 }

src/onebot11/action/llonebot/SetQQAvatar.ts

@@ -1,4 +1,4 @@
-import fs from 'node:fs'
+import { unlink } from 'node:fs/promises'
 import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { checkFileReceived, uri2local } from '../../../common/utils/file'
@@ -13,18 +13,17 @@ export default class SetAvatar extends BaseAction<Payload, null> {
   protected async _handle(payload: Payload): Promise<null> {
     const { path, isLocal, errMsg } = await uri2local(payload.file)
     if (errMsg) {
-      throw `头像${payload.file}设置失败,file字段可能格式不正确`
+      throw new Error(errMsg)
     }
     if (path) {
       await checkFileReceived(path, 5000) // 文件不存在QQ会崩溃，需要提前判断
       const ret = await this.ctx.ntUserApi.setQQAvatar(path)
       if (!isLocal) {
-        fs.unlink(path, () => { })
+        unlink(path)
       }
       if (!ret) {
         throw `头像${payload.file}设置失败,api无返回`
       }
-      // log(`头像设置返回：${JSON.stringify(ret)}`)
       if ((ret.result as number) === 1004022) {
         throw `头像${payload.file}设置失败，文件可能不是图片格式`
       } else if (ret.result !== 0) {
@@ -32,7 +31,7 @@ export default class SetAvatar extends BaseAction<Payload, null> {
       }
     } else {
       if (!isLocal) {
-        fs.unlink(path, () => { })
+        unlink(path)
       }
       throw `头像${payload.file}设置失败,无法获取头像,文件可能不存在`
     }

src/onebot11/action/msg/ForwardSingleMsg.ts

@@ -1,7 +1,6 @@
 import { BaseAction } from '../BaseAction'
-import { ChatType } from '@/ntqqapi/types'
 import { ActionName } from '../types'
-import { Peer } from '@/ntqqapi/types'
+import { createPeer } from '@/onebot11/helper/createMessage'
 
 interface Payload {
   message_id: number | string
@@ -10,17 +9,6 @@ interface Payload {
 }
 
 abstract class ForwardSingleMsg extends BaseAction<Payload, null> {
-  protected async getTargetPeer(payload: Payload): Promise<Peer> {
-    if (payload.user_id) {
-      const peerUid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString())
-      if (!peerUid) {
-        throw new Error(`无法找到私聊对象${payload.user_id}`)
-      }
-      return { chatType: ChatType.friend, peerUid }
-    }
-    return { chatType: ChatType.group, peerUid: payload.group_id!.toString() }
-  }
-
   protected async _handle(payload: Payload): Promise<null> {
     if (!payload.message_id) {
       throw Error('message_id不能为空')
@@ -29,7 +17,7 @@ abstract class ForwardSingleMsg extends BaseAction<Payload, null> {
     if (!msg) {
       throw new Error(`无法找到消息${payload.message_id}`)
     }
-    const peer = await this.getTargetPeer(payload)
+    const peer = await createPeer(this.ctx, payload)
     const ret = await this.ctx.ntMsgApi.forwardMsg(msg.peer, peer, [msg.msgId])
     if (ret.result !== 0) {
       throw new Error(`转发消息失败 ${ret.errMsg}`)

src/onebot11/action/msg/SendMsg.ts

@@ -93,7 +93,11 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
     if (!returnMsg) {
       throw new Error('消息发送失败')
     }
-    return { message_id: returnMsg.msgShortId! }
+    const msgShortId = this.ctx.store.createMsgShortId({
+      chatType: returnMsg.chatType,
+      peerUid: returnMsg.peerUid
+    }, returnMsg.msgId)
+    return { message_id: msgShortId }
   }
 
   private getSpecialMsgNum(message: OB11MessageData[], msgType: OB11MessageDataType): number {

src/onebot11/action/types.ts

@@ -81,5 +81,6 @@ export enum ActionName {
   GoCQHTTP_GetGroupAtAllRemain = 'get_group_at_all_remain',
   GoCQHTTP_GetGroupRootFiles = 'get_group_root_files',
   GoCQHTTP_SendGroupNotice = '_send_group_notice',
-  GoCQHTTP_GetGroupFilesByFolder = 'get_group_files_by_folder'
+  GoCQHTTP_GetGroupFilesByFolder = 'get_group_files_by_folder',
+  GoCQHTTP_GetGroupFileUrl = 'get_group_file_url'
 }

src/onebot11/action/user/GetFriendList.ts

@@ -1,35 +1,25 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { OB11User } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
 import { getBuildVersion } from '@/common/utils'
+import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  no_cache: boolean | string
+  no_cache: boolean
 }
 
 export class GetFriendList extends BaseAction<Payload, OB11User[]> {
   actionName = ActionName.GetFriendList
+  payloadSchema = Schema.object({
+    no_cache: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
+  })
 
   protected async _handle(payload: Payload) {
-    const refresh = payload?.no_cache === true || payload?.no_cache === 'true'
+    const refresh = payload.no_cache
     if (getBuildVersion() >= 26702) {
       return OB11Entities.friendsV2(await this.ctx.ntFriendApi.getBuddyV2(refresh))
     }
     return OB11Entities.friends(await this.ctx.ntFriendApi.getFriends())
   }
 }
-
-// extend
-export class GetFriendWithCategory extends BaseAction<void, OB11User[]> {
-  actionName = ActionName.GetFriendsWithCategory
-
-  protected async _handle() {
-    if (getBuildVersion() >= 26702) {
-      //全新逻辑
-      return OB11Entities.friendsV2(await this.ctx.ntFriendApi.getBuddyV2ExWithCate(true))
-    } else {
-      throw new Error('this ntqq version not support, must be 26702 or later')
-    }
-  }
-}

src/onebot11/action/user/SetFriendAddRequest.ts

@@ -1,5 +1,6 @@
 import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
+import { ChatType } from '@/ntqqapi/types'
 
 interface Payload {
   flag: string
@@ -22,6 +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({
+      peerUid: uid,
+      chatType: ChatType.C2C,
+      guildId: ''
+    })
     return null
   }
 }

src/onebot11/adapter.ts

@@ -185,11 +185,6 @@ class OneBot11Adapter extends Service {
       if (parseInt(message.msgTime) < this.startTime / 1000) {
         continue
       }
-      const peer: Peer = {
-        chatType: message.chatType,
-        peerUid: message.peerUid
-      }
-      message.msgShortId = this.ctx.store.createMsgShortId(peer, message.msgId)
       this.addMsgCache(message)
 
       OB11Entities.message(this.ctx, message)

src/onebot11/connect/http.ts

@@ -12,8 +12,6 @@ import { handleQuickOperation, QuickOperationEvent } from '../helper/quickOperat
 import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent'
 import { Dict } from 'cosmokit'
 
-type RegisterHandler = (res: Response, payload: unknown) => Promise<unknown>
-
 class OB11Http {
   private readonly expressAPP: Express
   private server?: http.Server
@@ -25,7 +23,6 @@ class OB11Http {
     this.expressAPP.use(express.urlencoded({ extended: true, limit: '5000mb' }))
     this.expressAPP.use((req, res, next) => {
       // 兼容处理没有带content-type的请求
-      // log("req.headers['content-type']", req.headers['content-type'])
       req.headers['content-type'] = 'application/json'
       const originalJson = express.json({ limit: '5000mb' })
       // 调用原始的express.json()处理器
@@ -37,12 +34,8 @@ class OB11Http {
         next()
       })
     })
-    setTimeout(() => {
-      for (const [actionName, action] of config.actionMap) {
-        this.registerRouter('post', actionName, (res, payload) => action.handle(payload))
-        this.registerRouter('get', actionName, (res, payload) => action.handle(payload))
-      }
-    }, 0)
+    this.expressAPP.use((req, res, next) => this.authorize(req, res, next))
+    this.expressAPP.use((req, res, next) => this.handleRequest(req, res, next))
   }
 
   public start() {
@@ -85,6 +78,8 @@ class OB11Http {
 
   private authorize(req: Request, res: Response, next: () => void) {
     const serverToken = this.config.token
+    if (!serverToken) return next()
+
     let clientToken = ''
     const authHeader = req.get('authorization')
     if (authHeader) {
@@ -99,36 +94,31 @@ class OB11Http {
       this.ctx.logger.info('receive http url token', clientToken)
     }
 
-    if (serverToken && clientToken !== serverToken) {
-      return res.status(403).send(JSON.stringify({ message: 'token verify failed!' }))
+    if (clientToken !== serverToken) {
+      return res.status(403).json({ message: 'token verify failed!' })
     }
     next()
   }
 
-  private registerRouter(method: 'post' | 'get', url: string, handler: RegisterHandler) {
-    if (!url.startsWith('/')) {
-      url = '/' + url
+  private async handleRequest(req: Request, res: Response, next: () => void) {
+    if (req.path === '/') return next()
+    let payload = req.body
+    if (req.method === 'GET') {
+      payload = req.query
+    } else if (req.query) {
+      payload = { ...req.query, ...req.body }
     }
-
-    if (!this.expressAPP[method]) {
-      const err = `LLOneBot server register router failed，${method} not exist`
-      this.ctx.logger.error(err)
-      throw err
-    }
-    this.expressAPP[method](url, this.authorize.bind(this), async (req: Request, res: Response) => {
-      let payload = req.body
-      if (method == 'get') {
-        payload = req.query
-      } else if (req.query) {
-        payload = { ...req.query, ...req.body }
-      }
-      this.ctx.logger.info('收到 HTTP 请求', url, payload)
+    this.ctx.logger.info('收到 HTTP 请求', req.url, payload)
+    const action = this.config.actionMap.get(req.path.replaceAll('/', ''))
+    if (action) {
       try {
-        res.send(await handler(res, payload))
+        res.json(await action.handle(payload))
       } catch (e) {
-        res.send(OB11Response.error((e as Error).stack!.toString(), 200))
+        res.json(OB11Response.error((e as Error).stack!.toString(), 200))
       }
-    })
+    } else {
+      res.status(404).json(OB11Response.error('API 不存在', 404))
+    }
   }
 }
 

src/onebot11/entities.ts

@@ -20,8 +20,7 @@ import {
   Sex,
   TipGroupElementType,
   User,
-  FriendV2,
-  ChatType2
+  FriendV2
 } from '../ntqqapi/types'
 import { EventType } from './event/OB11BaseEvent'
 import { encodeCQCode } from './cqcode'
@@ -54,14 +53,15 @@ export namespace OB11Entities {
       messagePostFormat,
     } = ctx.config as OneBot11Adapter.Config
     const selfUin = selfInfo.uin
+    const msgShortId = ctx.store.createMsgShortId({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
     const resMsg: OB11Message = {
       self_id: parseInt(selfUin),
       user_id: parseInt(msg.senderUin),
       time: parseInt(msg.msgTime) || Date.now(),
-      message_id: msg.msgShortId!,
-      real_id: msg.msgShortId!,
-      message_seq: msg.msgShortId!,
-      message_type: msg.chatType === ChatType.group ? 'group' : 'private',
+      message_id: msgShortId,
+      real_id: msgShortId,
+      message_seq: msgShortId,
+      message_type: msg.chatType === ChatType.Group ? 'group' : 'private',
       sender: {
         user_id: parseInt(msg.senderUin),
         nickname: msg.sendNickName,
@@ -77,7 +77,7 @@ export namespace OB11Entities {
     if (debug) {
       resMsg.raw = msg
     }
-    if (msg.chatType === ChatType.group) {
+    if (msg.chatType === ChatType.Group) {
       resMsg.sub_type = 'normal'
       resMsg.group_id = parseInt(msg.peerUin)
       const member = await ctx.ntGroupApi.getGroupMember(msg.peerUin, msg.senderUin)
@@ -87,15 +87,15 @@ export namespace OB11Entities {
         resMsg.sender.title = member.memberSpecialTitle ?? ''
       }
     }
-    else if (msg.chatType === ChatType.friend) {
+    else if (msg.chatType === ChatType.C2C) {
       resMsg.sub_type = 'friend'
       resMsg.sender.nickname = (await ctx.ntUserApi.getUserDetailInfo(msg.senderUid)).nick
     }
-    else if (msg.chatType as unknown as ChatType2 === ChatType2.KCHATTYPETEMPC2CFROMGROUP) {
+    else if (msg.chatType === ChatType.TempC2CFromGroup) {
       resMsg.sub_type = 'group'
       resMsg.temp_source = 0 //群聊
       resMsg.sender.nickname = (await ctx.ntUserApi.getUserDetailInfo(msg.senderUid)).nick
-      const ret = await ctx.ntMsgApi.getTempChatInfo(ChatType2.KCHATTYPETEMPC2CFROMGROUP, msg.senderUid)
+      const ret = await ctx.ntMsgApi.getTempChatInfo(ChatType.TempC2CFromGroup, msg.senderUid)
       if (ret?.result === 0) {
         resMsg.sender.group_id = Number(ret.tmpChatInfo?.groupCode)
       } else {
@@ -105,37 +105,31 @@ export namespace OB11Entities {
 
     for (const element of msg.elements) {
       let messageSegment: OB11MessageData | undefined
-      if (element.textElement && element.textElement?.atType !== AtType.notAt) {
+      if (element.textElement && element.textElement?.atType !== AtType.Unknown) {
         let qq: string
         let name: string | undefined
-        if (element.textElement.atType == AtType.atAll) {
+        if (element.textElement.atType === AtType.All) {
           qq = 'all'
-        }
-        else {
-          const { atNtUid, content } = element.textElement
-          let atQQ = element.textElement.atUid
-          if (!atQQ || atQQ === '0') {
-            const atMember = await ctx.ntGroupApi.getGroupMember(msg.peerUin, atNtUid)
-            if (atMember) {
-              atQQ = atMember.uin
-            }
-          }
-          if (atQQ) {
-            qq = atQQ
-            name = content.replace('@', '')
+        } else {
+          const { atNtUid, atUid, content } = element.textElement
+          if (atUid && atUid !== '0') {
+            qq = atUid
+          } else {
+            qq = await ctx.ntUserApi.getUinByUid(atNtUid)
           }
+          name = content.replace('@', '')
         }
         messageSegment = {
           type: OB11MessageDataType.at,
           data: {
-            qq: qq!,
+            qq,
             name
           }
         }
       }
       else if (element.textElement) {
         const text = element.textElement.content
-        if (!text.trim()) {
+        if (!text) {
           continue
         }
         messageSegment = {
@@ -297,28 +291,31 @@ export namespace OB11Entities {
       }
       else if (element.faceElement) {
         const { faceElement } = element
-        const faceId = faceElement.faceIndex
-        if (faceId === FaceIndex.dice) {
+        const { faceIndex, pokeType } = faceElement
+        if (faceIndex === FaceIndex.Dice) {
           messageSegment = {
             type: OB11MessageDataType.dice,
             data: {
               result: faceElement.resultId!
             }
           }
-        }
-        else if (faceId === FaceIndex.RPS) {
+        } else if (faceIndex === FaceIndex.RPS) {
           messageSegment = {
             type: OB11MessageDataType.RPS,
             data: {
               result: faceElement.resultId!
             }
           }
-        }
-        else {
+          /*} else if (faceIndex === 1 && pokeType === 1) {
+            messageSegment = {
+              type: OB11MessageDataType.shake,
+              data: {}
+            }*/
+        } else {
           messageSegment = {
             type: OB11MessageDataType.face,
             data: {
-              id: faceId.toString()
+              id: faceIndex.toString()
             }
           }
         }
@@ -362,20 +359,20 @@ export namespace OB11Entities {
       }
       if (messageSegment) {
         const cqCode = encodeCQCode(messageSegment)
-        if (messagePostFormat === 'string') {
-          (resMsg.message as string) += cqCode
-        } else {
+        if (messagePostFormat === 'array') {
           (resMsg.message as OB11MessageData[]).push(messageSegment)
         }
         resMsg.raw_message += cqCode
       }
     }
-    resMsg.raw_message = resMsg.raw_message.trim()
+    if (messagePostFormat === 'string') {
+      resMsg.message = resMsg.raw_message
+    }
     return resMsg
   }
 
   export async function privateEvent(ctx: Context, msg: RawMessage): Promise<OB11BaseNoticeEvent | void> {
-    if (msg.chatType !== ChatType.friend) {
+    if (msg.chatType !== ChatType.C2C) {
       return
     }
     for (const element of msg.elements) {
@@ -395,6 +392,7 @@ export namespace OB11Entities {
           }
         }
         if (grayTipElement.xmlElement?.templId === '10229' || grayTipElement.jsonGrayTipElement?.busiId === '19324') {
+          ctx.logger.info('收到好友添加消息', msg.peerUid)
           const uin = +msg.peerUin || +(await ctx.ntUserApi.getUinByUid(msg.peerUid))
           return new OB11FriendAddNoticeEvent(uin)
         }
@@ -403,7 +401,7 @@ export namespace OB11Entities {
   }
 
   export async function groupEvent(ctx: Context, msg: RawMessage): Promise<OB11GroupNoticeEvent | void> {
-    if (msg.chatType !== ChatType.group) {
+    if (msg.chatType !== ChatType.Group) {
       return
     }
     if (msg.senderUin) {
@@ -423,7 +421,7 @@ export namespace OB11Entities {
       const grayTipElement = element.grayTipElement
       const groupElement = grayTipElement?.groupElement
       if (groupElement) {
-        if (groupElement.type === TipGroupElementType.memberIncrease) {
+        if (groupElement.type === TipGroupElementType.MemberIncrease) {
           ctx.logger.info('收到群成员增加消息', groupElement)
           await ctx.sleep(1000)
           const member = await ctx.ntGroupApi.getGroupMember(msg.peerUid, groupElement.memberUid)
@@ -437,8 +435,8 @@ export namespace OB11Entities {
             return new OB11GroupIncreaseEvent(parseInt(msg.peerUid), parseInt(memberUin), parseInt(operatorUin))
           }
         }
-        else if (groupElement.type === TipGroupElementType.ban) {
-          ctx.logger.info('收到群群员禁言提示', groupElement)
+        else if (groupElement.type === TipGroupElementType.Ban) {
+          ctx.logger.info('收到群成员禁言提示', groupElement)
           const memberUid = groupElement.shutUp?.member.uid
           const adminUid = groupElement.shutUp?.admin.uid
           let memberUin: string = ''
@@ -467,7 +465,7 @@ export namespace OB11Entities {
             )
           }
         }
-        else if (groupElement.type === TipGroupElementType.kicked) {
+        else if (groupElement.type === TipGroupElementType.Kicked) {
           ctx.logger.info(`收到我被踢出或退群提示, 群${msg.peerUid}`, groupElement)
           ctx.ntGroupApi.quitGroup(msg.peerUid)
           try {
@@ -503,14 +501,6 @@ export namespace OB11Entities {
         const xmlElement = grayTipElement.xmlElement
 
         if (xmlElement?.templId === '10382') {
-          // 表情回应消息
-          // "content":
-          //  "<gtip align=\"center\">
-          //    <qq uin=\"u_snYxnEfja-Po_\" col=\"3\" jp=\"3794\"/>
-          //    <nor txt=\"回应了你的\"/>
-          //    <url jp= \"\" msgseq=\"74711\" col=\"3\" txt=\"消息:\"/>
-          //    <face type=\"1\" id=\"76\">  </face>
-          //  </gtip>",
           const emojiLikeData = new XMLParser({
             ignoreAttributes: false,
             attributeNamePrefix: '',
@@ -521,7 +511,7 @@ export namespace OB11Entities {
             const msgSeq: string = emojiLikeData.gtip.url.msgseq
             const emojiId: string = emojiLikeData.gtip.face.id
             const peer = {
-              chatType: ChatType.group,
+              chatType: ChatType.Group,
               guildId: '',
               peerUid: msg.peerUid,
             }
@@ -545,7 +535,7 @@ export namespace OB11Entities {
         }
 
         if (
-          grayTipElement.subElementType == GrayTipElementSubType.XMLMSG &&
+          grayTipElement.subElementType == GrayTipElementSubType.XmlMsg &&
           xmlElement?.templId == '10179'
         ) {
           ctx.logger.info('收到新人被邀请进群消息', grayTipElement)
@@ -589,7 +579,7 @@ export namespace OB11Entities {
             if (!groupCode || !msgSeq || !msgRandom) return
             const peer = {
               guildId: '',
-              chatType: ChatType.group,
+              chatType: ChatType.Group,
               peerUid: groupCode
             }
             const essence = await ctx.ntGroupApi.queryCachedEssenceMsg(groupCode, msgSeq, msgRandom)
@@ -625,13 +615,13 @@ export namespace OB11Entities {
     shortId: number
   ): Promise<OB11FriendRecallNoticeEvent | OB11GroupRecallNoticeEvent | undefined> {
     const msgElement = msg.elements.find(
-      (element) => element.grayTipElement?.subElementType === GrayTipElementSubType.REVOKE,
+      (element) => element.grayTipElement?.subElementType === GrayTipElementSubType.Revoke,
     )
     if (!msgElement) {
       return
     }
     const revokeElement = msgElement.grayTipElement!.revokeElement
-    if (msg.chatType === ChatType.group) {
+    if (msg.chatType === ChatType.Group) {
       const operator = await ctx.ntGroupApi.getGroupMember(msg.peerUid, revokeElement!.operatorUid)
       return new OB11GroupRecallNoticeEvent(
         parseInt(msg.peerUid),
@@ -659,23 +649,20 @@ export namespace OB11Entities {
     return friends.map(friend)
   }
 
-  export function friendsV2(friends: FriendV2[]): OB11User[] {
-    const data: OB11User[] = []
-    for (const friend of friends) {
-      const sexValue = sex(friend.baseInfo.sex!)
-      data.push({
-        ...omit(friend.baseInfo, ['richBuffer']),
-        ...friend.coreInfo,
-        user_id: parseInt(friend.coreInfo.uin),
-        nickname: friend.coreInfo.nick,
-        remark: friend.coreInfo.nick,
-        sex: sexValue,
-        level: 0,
-        categroyName: friend.categroyName,
-        categoryId: friend.categoryId
-      })
+  export function friendV2(raw: FriendV2): OB11User {
+    return {
+      ...omit(raw.baseInfo, ['richBuffer', 'phoneNum']),
+      ...omit(raw.coreInfo, ['nick']),
+      user_id: parseInt(raw.coreInfo.uin),
+      nickname: raw.coreInfo.nick,
+      remark: raw.coreInfo.remark || raw.coreInfo.nick,
+      sex: sex(raw.baseInfo.sex),
+      level: 0
     }
-    return data
+  }
+
+  export function friendsV2(raw: FriendV2[]): OB11User[] {
+    return raw.map(friendV2)
   }
 
   export function groupMemberRole(role: number): OB11GroupMemberRole | undefined {

src/onebot11/helper/createMessage.ts

@@ -62,22 +62,22 @@ export async function createSendElements(
               }
             }
             if (isAdmin && remainAtAllCount > 0) {
-              sendElements.push(SendElementEntities.at(atQQ, atQQ, AtType.atAll, '@全体成员'))
+              sendElements.push(SendElementEntities.at(atQQ, atQQ, AtType.All, '@全体成员'))
             }
           }
-          else if (peer.chatType === ChatType.group) {
+          else if (peer.chatType === ChatType.Group) {
             const atMember = await ctx.ntGroupApi.getGroupMember(peer.peerUid, atQQ)
             if (atMember) {
               const display = `@${atMember.cardName || atMember.nick}`
               sendElements.push(
-                SendElementEntities.at(atQQ, atMember.uid, AtType.atUser, display),
+                SendElementEntities.at(atQQ, atMember.uid, AtType.One, display),
               )
             } else {
               const atNmae = sendMsg.data?.name
               const uid = await ctx.ntUserApi.getUidByUin(atQQ) || ''
               const display = atNmae ? `@${atNmae}` : ''
               sendElements.push(
-                SendElementEntities.at(atQQ, uid, AtType.atUser, display),
+                SendElementEntities.at(atQQ, uid, AtType.One, display),
               )
             }
           }
@@ -134,7 +134,7 @@ export async function createSendElements(
           sendMsg.data.subType || 0,
           sendMsg.data.type === 'flash'
         )
-        deleteAfterSentFiles.push(res.picElement.sourcePath)
+        deleteAfterSentFiles.push(res.picElement.sourcePath!)
         sendElements.push(res)
       }
         break
@@ -248,24 +248,32 @@ export async function sendMsg(
   sendElements: SendMessageElement[],
   deleteAfterSentFiles: string[]
 ) {
+  if (peer.chatType === ChatType.Group) {
+    const info = await ctx.ntGroupApi.getGroupAllInfo(peer.peerUid)
+      .catch(() => undefined)
+    const shutUpMeTimestamp = info?.groupAll.shutUpMeTimestamp
+    if (shutUpMeTimestamp && shutUpMeTimestamp * 1000 > Date.now()) {
+      throw new Error('当前处于被禁言状态')
+    }
+  }
   if (!sendElements.length) {
-    throw '消息体无法解析，请检查是否发送了不支持的消息类型'
+    throw new Error('消息体无法解析，请检查是否发送了不支持的消息类型')
   }
   // 计算发送的文件大小
   let totalSize = 0
   for (const fileElement of sendElements) {
     try {
-      if (fileElement.elementType === ElementType.PTT) {
-        totalSize += fs.statSync(fileElement.pttElement.filePath).size
+      if (fileElement.elementType === ElementType.Ptt) {
+        totalSize += fs.statSync(fileElement.pttElement.filePath!).size
       }
-      if (fileElement.elementType === ElementType.FILE) {
+      if (fileElement.elementType === ElementType.File) {
         totalSize += fs.statSync(fileElement.fileElement.filePath).size
       }
-      if (fileElement.elementType === ElementType.VIDEO) {
+      if (fileElement.elementType === ElementType.Video) {
         totalSize += fs.statSync(fileElement.videoElement.filePath).size
       }
-      if (fileElement.elementType === ElementType.PIC) {
-        totalSize += fs.statSync(fileElement.picElement.sourcePath).size
+      if (fileElement.elementType === ElementType.Pic) {
+        totalSize += fs.statSync(fileElement.picElement.sourcePath!).size
       }
     } catch (e) {
       ctx.logger.warn('文件大小计算失败', e, fileElement)
@@ -276,8 +284,7 @@ export async function sendMsg(
   //log('设置消息超时时间', timeout)
   const returnMsg = await ctx.ntMsgApi.sendMsg(peer, sendElements, timeout)
   if (returnMsg) {
-    returnMsg.msgShortId = ctx.store.createMsgShortId(peer, returnMsg.msgId)
-    ctx.logger.info('消息发送', returnMsg.msgShortId)
+    ctx.logger.info('消息发送', peer)
     deleteAfterSentFiles.map(path => fsPromise.unlink(path))
     return returnMsg
   }
@@ -294,10 +301,10 @@ export enum CreatePeerMode {
   Group = 2
 }
 
-export async function createPeer(ctx: Context, payload: CreatePeerPayload, mode: CreatePeerMode): Promise<Peer> {
+export async function createPeer(ctx: Context, payload: CreatePeerPayload, mode = CreatePeerMode.Normal): Promise<Peer> {
   if ((mode === CreatePeerMode.Group || mode === CreatePeerMode.Normal) && payload.group_id) {
     return {
-      chatType: ChatType.group,
+      chatType: ChatType.Group,
       peerUid: payload.group_id.toString(),
     }
   }
@@ -306,7 +313,7 @@ export async function createPeer(ctx: Context, payload: CreatePeerPayload, mode:
     if (!uid) throw new Error('无法获取用户信息')
     const isBuddy = await ctx.ntFriendApi.isBuddy(uid)
     return {
-      chatType: isBuddy ? ChatType.friend : ChatType.temp,
+      chatType: isBuddy ? ChatType.C2C : ChatType.TempC2CFromGroup,
       peerUid: uid,
     }
   }

src/onebot11/types.ts

@@ -289,7 +289,7 @@ export interface OB11MessageContact {
 
 export interface OB11MessageShake {
   type: OB11MessageDataType.shake
-  data: {}
+  data: Record<string, never>
 }
 
 export type OB11MessageData =

src/version.ts

@@ -1 +1 @@
-export const version = '3.33.2'
+export const version = '3.33.8'