fix: download file add referer

3.32.1

manifest.json

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

package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "build": "electron-vite build",
     "build-mac": "npm run build && npm run deploy-mac",
-    "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/LiteLoaderQQNT/plugins/LLOneBot/",
+    "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/Documents/LiteLoaderQQNT/plugins/LLOneBot/",
     "build-win": "npm run build && npm run deploy-win",
     "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOneBot\\\"",
     "format": "prettier -cw .",
@@ -23,7 +23,7 @@
     "cosmokit": "^1.6.2",
     "express": "^4.19.2",
     "fast-xml-parser": "^4.5.0",
-    "file-type": "^19.4.1",
+    "file-type": "^19.5.0",
     "fluent-ffmpeg": "^2.1.3",
     "minato": "^3.5.1",
     "silk-wasm": "^3.6.1",

src/common/utils/file.ts

@@ -4,6 +4,7 @@ import path from 'node:path'
 import { TEMP_DIR } from '../globalVars'
 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)
@@ -116,7 +117,7 @@ type Uri2LocalRes = {
   isLocal: boolean
 }
 
-export async function uri2local(uri: string, filename?: string): Promise<Uri2LocalRes> {
+export async function uri2local(uri: string, filename?: string, needExt?: boolean): Promise<Uri2LocalRes> {
   const { type } = checkUriType(uri)
 
   if (type === FileUriType.FileURL) {
@@ -132,15 +133,21 @@ export async function uri2local(uri: string, filename?: string): Promise<Uri2Loc
 
   if (type === FileUriType.RemoteURL) {
     try {
-      const res = await fetchFile(uri)
+      const res = await fetchFile(uri, {'Referer': uri})
       const match = res.url.match(/.+\/([^/?]*)(?=\?)?/)
       if (match?.[1]) {
         filename ??= match[1].replace(/[/\\:*?"<>|]/g, '_')
       } else {
         filename ??= randomUUID()
       }
-      const filePath = path.join(TEMP_DIR, filename)
+      let filePath = path.join(TEMP_DIR, filename)
       await fsPromise.writeFile(filePath, res.data)
+      if (needExt && !path.extname(filePath)) {
+        const ext = (await fileTypeFromFile(filePath))?.ext
+        filename += `.${ext}`
+        await fsPromise.rename(filePath, `${filePath}.${ext}`)
+        filePath = `${filePath}.${ext}`
+      }
       return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
     } catch (e) {
       const errMsg = `${uri} 下载失败, ${(e as Error).message}`
@@ -150,9 +157,15 @@ export async function uri2local(uri: string, filename?: string): Promise<Uri2Loc
 
   if (type === FileUriType.OneBotBase64) {
     filename ??= randomUUID()
-    const filePath = path.join(TEMP_DIR, filename)
+    let filePath = path.join(TEMP_DIR, filename)
     const base64 = uri.replace(/^base64:\/\//, '')
     await fsPromise.writeFile(filePath, base64, 'base64')
+    if (needExt) {
+      const ext = (await fileTypeFromFile(filePath))?.ext
+      filename += `.${ext}`
+      await fsPromise.rename(filePath, `${filePath}.${ext}`)
+      filePath = `${filePath}.${ext}`
+    }
     return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
   }
 
@@ -162,8 +175,14 @@ export async function uri2local(uri: string, filename?: string): Promise<Uri2Loc
     if (capture) {
       filename ??= randomUUID()
       const [, _type, base64] = capture
-      const filePath = path.join(TEMP_DIR, filename)
+      let filePath = path.join(TEMP_DIR, filename)
       await fsPromise.writeFile(filePath, base64, 'base64')
+      if (needExt) {
+        const ext = (await fileTypeFromFile(filePath))?.ext
+        filename += `.${ext}`
+        await fsPromise.rename(filePath, `${filePath}.${ext}`)
+        filePath = `${filePath}.${ext}`
+      }
       return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
     }
   }

src/main/log.ts

@@ -14,19 +14,14 @@ export default class Log {
 
   constructor(ctx: Context, cfg: Config) {
     Logger.targets.splice(0, Logger.targets.length)
-    if (!cfg.enable) {
-      return
-    }
+    let enable = cfg.enable
     const file = path.join(LOG_DIR, cfg.filename)
-    /*const refreshNick = ctx.debounce(() => {
-      const ntUserApi = ctx.get('ntUserApi')
-      if (ntUserApi && !selfInfo.nick) {
-        ntUserApi.getSelfNick(true)
-      }
-    }, 1000)*/
     const target: Logger.Target = {
       colors: 0,
       record: (record: Logger.Record) => {
+        if (!enable) {
+          return
+        }
         const dateTime = new Date(record.timestamp).toLocaleString()
         const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ''
         const content = `${dateTime} [${record.type}] ${userInfo} | ${record.name} ${record.content}\n\n`
@@ -34,5 +29,8 @@ export default class Log {
       },
     }
     Logger.targets.push(target)
+    ctx.on('llonebot/config-updated', input => {
+      enable = input.log!
+    })
   }
 }

src/main/main.ts

@@ -202,7 +202,7 @@ function onLoad() {
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
-  if (![2, 4].includes(window.id)) {
+  if (![2, 4, 6].includes(window.id)) {
     return
   }
   if (window.id === 2) {

src/ntqqapi/api/group.ts

@@ -1,5 +1,5 @@
 import { ReceiveCmdS } from '../hook'
-import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GetFileListParam } from '../types'
+import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GetFileListParam, PublishGroupBulletinReq } from '../types'
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
 import { NTQQWindows } from './window'
@@ -288,4 +288,16 @@ export class NTQQGroupApi extends Service {
     )
     return data.fileInfo.item
   }
+
+  async publishGroupBulletin(groupCode: string, req: PublishGroupBulletinReq) {
+    const ntUserApi = this.ctx.get('ntUserApi')!
+    const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
+    return await invoke('nodeIKernelGroupService/publishGroupBulletin', [{ groupCode, psKey, req }, null])
+  }
+
+  async uploadGroupBulletinPic(groupCode: string, path: string) {
+    const ntUserApi = this.ctx.get('ntUserApi')!
+    const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
+    return await invoke('nodeIKernelGroupService/uploadGroupBulletinPic', [{ groupCode, psKey, path }, null])
+  }
 }

src/ntqqapi/api/msg.ts

@@ -252,4 +252,8 @@ export class NTQQMsgApi extends Service {
       }
     }, null])
   }
+
+  async setMsgRead(peer: Peer) {
+    return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }, null])
+  }
 }

src/ntqqapi/api/user.ts

@@ -109,6 +109,10 @@ export class NTQQUserApi extends Service {
     return cookies
   }
 
+  async getPSkey(domains: string[]) {
+    return await invoke('nodeIKernelTipOffService/getPskey', [{ domains, isForNewPCQQ: true }, null])
+  }
+
   genBkn(sKey: string) {
     sKey = sKey || ''
     let hash = 5381
@@ -292,4 +296,19 @@ export class NTQQUserApi extends Service {
       }
     }, null])
   }
+
+  async getProfileLike(uid: string) {
+    return await invoke('nodeIKernelProfileLikeService/getBuddyProfileLike', [{
+      req: {
+        friendUids: [uid],
+        basic: 1,
+        vote: 1,
+        favorite: 0,
+        userProfile: 1,
+        type: 2,
+        start: 0,
+        limit: 20,
+      }
+    }, null])
+  }
 }

src/ntqqapi/api/window.ts

@@ -1,6 +1,6 @@
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
-import { ReceiveCmd } from '../hook'
+import { ReceiveCmdS } from '../hook'
 import { BrowserWindow } from 'electron'
 import { Service, Context } from 'cordis'
 
@@ -39,7 +39,7 @@ export class NTQQWindowApi extends Service {
   async openWindow<R = GeneralCallResult>(
     ntQQWindow: NTQQWindow,
     args: unknown[],
-    cbCmd: ReceiveCmd | undefined,
+    cbCmd: ReceiveCmdS | undefined,
     autoCloseSeconds: number = 2,
   ) {
     const result = await invoke<R>(

src/ntqqapi/core.ts

@@ -30,7 +30,7 @@ declare module 'cordis' {
     'nt/message-sent': (input: RawMessage[]) => void
     'nt/group-notify': (input: GroupNotify[]) => void
     'nt/friend-request': (input: FriendRequest[]) => void
-    'nt/group-member-info-updated': (input: { groupCode: string; members: GroupMember[] }) => void
+    'nt/group-member-info-updated': (input: { groupCode: string, members: GroupMember[] }) => void
   }
 }
 
@@ -185,12 +185,6 @@ class Core extends Service {
     })
 
     registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, payload => {
-      const { msgId, chatType, peerUid } = payload.msgRecord
-      const peer = {
-        chatType,
-        peerUid
-      }
-      MessageUnique.createMsg(peer, msgId)
       if (!this.config.reportSelfMessage) {
         return
       }

src/ntqqapi/entities.ts

@@ -99,19 +99,20 @@ export namespace SendElementEntities {
     }
   }
 
-  export async function file(ctx: Context, filePath: string, fileName = '', folderId = ''): Promise<SendFileElement> {
-    const { fileName: _fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(filePath, ElementType.FILE)
-    if (fileSize === 0) {
-      throw '文件异常，大小为 0'
+  export async function file(ctx: Context, filePath: string, fileName: string, folderId = ''): Promise<SendFileElement> {
+    const fileSize = (await stat(filePath)).size.toString()
+    if (fileSize === '0') {
+      ctx.logger.warn(`文件${fileName}异常，大小为 0`)
+      throw new Error('文件异常，大小为 0')
     }
     const element: SendFileElement = {
       elementType: ElementType.FILE,
       elementId: '',
       fileElement: {
-        fileName: fileName || _fileName,
-        folderId: folderId,
-        filePath: path!,
-        fileSize: fileSize.toString(),
+        fileName,
+        folderId,
+        filePath,
+        fileSize,
       },
     }
     return element

src/ntqqapi/hook.ts

@@ -6,48 +6,46 @@ import { Dict } from 'cosmokit'
 
 export const hookApiCallbacks: Record<string, (res: any) => void> = {}
 
-export const ReceiveCmdS = {
-  RECENT_CONTACT: 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
-  UPDATE_MSG: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
-  UPDATE_ACTIVE_MSG: 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
-  NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
-  NEW_ACTIVE_MSG: `nodeIKernelMsgListener/onRecvActiveMsg`,
-  SELF_SEND_MSG: 'nodeIKernelMsgListener/onAddSendMsg',
-  USER_INFO: 'nodeIKernelProfileListener/onProfileSimpleChanged',
-  USER_DETAIL_INFO: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
-  GROUPS: 'nodeIKernelGroupListener/onGroupListUpdate',
-  GROUPS_STORE: 'onGroupListUpdate',
-  GROUP_MEMBER_INFO_UPDATE: 'nodeIKernelGroupListener/onMemberInfoChange',
-  FRIENDS: 'onBuddyListChange',
-  MEDIA_DOWNLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
-  UNREAD_GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
-  GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
-  FRIEND_REQUEST: 'nodeIKernelBuddyListener/onBuddyReqChange',
-  SELF_STATUS: 'nodeIKernelProfileListener/onSelfStatusChanged',
-  CACHE_SCAN_FINISH: 'nodeIKernelStorageCleanListener/onFinishScan',
-  MEDIA_UPLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaUploadComplete',
-  SKEY_UPDATE: 'onSkeyUpdate',
-} as const
+export enum ReceiveCmdS {
+  RECENT_CONTACT = 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
+  UPDATE_MSG = 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+  UPDATE_ACTIVE_MSG = 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
+  NEW_MSG = 'nodeIKernelMsgListener/onRecvMsg',
+  NEW_ACTIVE_MSG = 'nodeIKernelMsgListener/onRecvActiveMsg',
+  SELF_SEND_MSG = 'nodeIKernelMsgListener/onAddSendMsg',
+  USER_INFO = 'nodeIKernelProfileListener/onProfileSimpleChanged',
+  USER_DETAIL_INFO = 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+  GROUPS = 'nodeIKernelGroupListener/onGroupListUpdate',
+  GROUPS_STORE = 'onGroupListUpdate',
+  GROUP_MEMBER_INFO_UPDATE = 'nodeIKernelGroupListener/onMemberInfoChange',
+  FRIENDS = 'onBuddyListChange',
+  MEDIA_DOWNLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
+  UNREAD_GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
+  GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
+  FRIEND_REQUEST = 'nodeIKernelBuddyListener/onBuddyReqChange',
+  SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
+  CACHE_SCAN_FINISH = 'nodeIKernelStorageCleanListener/onFinishScan',
+  MEDIA_UPLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaUploadComplete',
+  SKEY_UPDATE = 'onSkeyUpdate',
+}
 
-export type ReceiveCmd = string
-
-interface NTQQApiReturnData extends Array<unknown> {
-  0: {
+type NTReturnData = [
+  {
     type: 'request'
     eventName: NTClass
     callbackId?: string
-  }
-  1: {
-    cmdName: ReceiveCmd
+  },
+  {
+    cmdName: ReceiveCmdS
     cmdType: 'event'
     payload: unknown
   }[]
-}
+]
 
 const logHook = false
 
 const receiveHooks: Array<{
-  method: ReceiveCmd[]
+  method: ReceiveCmdS[]
   hookFunc: (payload: any) => void | Promise<void>
   id: string
 }> = []
@@ -58,62 +56,44 @@ const callHooks: Array<{
 }> = []
 
 export function hookNTQQApiReceive(window: BrowserWindow, onlyLog: boolean) {
-  const originalSend = window.webContents.send
-  const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
-    try {
-      const isLogger = args[0]?.eventName?.startsWith('ns-LoggerApi')
-      if (logHook && !isLogger) {
-        log(`received ntqq api message: ${channel}`, args)
-      }
-    } catch { }
-    if (!onlyLog) {
-      if (args?.[1] instanceof Array) {
-        for (const receiveData of args[1]) {
-          const ntQQApiMethodName = receiveData.cmdName
-          // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
-          for (const hook of receiveHooks) {
-            if (hook.method.includes(ntQQApiMethodName)) {
-              new Promise(resolve => {
-                try {
-                  hook.hookFunc(receiveData.payload)
-                } catch (e) {
-                  log('hook error', ntQQApiMethodName, (e as Error).stack?.toString())
-                }
-                resolve(undefined)
-              }).then()
+  window.webContents.send = new Proxy(window.webContents.send, {
+    apply(target, thisArg, args: [channel: string, ...args: NTReturnData]) {
+      try {
+        if (logHook && !args[1]?.eventName?.startsWith('ns-LoggerApi')) {
+          log('received ntqq api message', args)
+        }
+      } catch { }
+      if (!onlyLog) {
+        if (args[2] instanceof Array) {
+          for (const receiveData of args[2]) {
+            const ntMethodName = receiveData.cmdName
+            for (const hook of receiveHooks) {
+              if (hook.method.includes(ntMethodName)) {
+                Promise.resolve(hook.hookFunc(receiveData.payload))
+              }
             }
           }
         }
-      }
-      if (args[0]?.callbackId) {
-        // log("hookApiCallback", hookApiCallbacks, args)
-        const callbackId = args[0].callbackId
-        if (hookApiCallbacks[callbackId]) {
-          new Promise(resolve => {
-            hookApiCallbacks[callbackId](args[1])
-            resolve(undefined)
-          }).then()
-          delete hookApiCallbacks[callbackId]
+        if (args[1]?.callbackId) {
+          const callbackId = args[1].callbackId
+          if (hookApiCallbacks[callbackId]) {
+            Promise.resolve(hookApiCallbacks[callbackId](args[2]))
+            delete hookApiCallbacks[callbackId]
+          }
         }
       }
-    }
-    originalSend.call(window.webContents, channel, ...args)
-  }
-  window.webContents.send = patchSend
+      return target.apply(thisArg, args)
+    },
+  })
 }
 
 export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
-  // 监听调用NTQQApi
   const webContents = window.webContents as Dict
   const ipc_message_proxy = webContents._events['-ipc-message']?.[0] || webContents._events['-ipc-message']
 
   const proxyIpcMsg = new Proxy(ipc_message_proxy, {
     apply(target, thisArg, args) {
-      // console.log(thisArg, args);
-      let isLogger = false
-      try {
-        isLogger = args[3][0].eventName.startsWith('ns-LoggerApi')
-      } catch (e) { }
+      const isLogger = args[3]?.[0]?.eventName?.startsWith('ns-LoggerApi')
       if (!isLogger) {
         try {
           logHook && log('call NTQQ api', thisArg, args)
@@ -121,21 +101,14 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
         if (!onlyLog) {
           try {
             const _args: unknown[] = args[3][1]
-            const cmdName: NTMethod = _args[0] as NTMethod
+            const cmdName = _args[0] as NTMethod
             const callParams = _args.slice(1)
             callHooks.forEach((hook) => {
               if (hook.method.includes(cmdName)) {
-                new Promise(resolve => {
-                  try {
-                    hook.hookFunc(callParams)
-                  } catch (e) {
-                    log('hook call error', e, _args)
-                  }
-                  resolve(undefined)
-                }).then()
+                Promise.resolve(hook.hookFunc(callParams))
               }
             })
-          } catch (e) { }
+          } catch { }
         }
       }
       return target.apply(thisArg, args)
@@ -147,7 +120,7 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
     webContents._events['-ipc-message'] = proxyIpcMsg
   }
 
-  const ipc_invoke_proxy = webContents._events['-ipc-invoke']?.[0] || webContents._events['-ipc-invoke']
+  /*const ipc_invoke_proxy = webContents._events['-ipc-invoke']?.[0] || webContents._events['-ipc-invoke']
   const proxyIpcInvoke = new Proxy(ipc_invoke_proxy, {
     apply(target, thisArg, args) {
       //HOOK_LOG && log('call NTQQ invoke api', thisArg, args)
@@ -157,9 +130,7 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
         },
       })
       const ret = target.apply(thisArg, args)
-      /*try {
-        HOOK_LOG && log('call NTQQ invoke api return', ret)
-      } catch (e) { }*/
+      //HOOK_LOG && log('call NTQQ invoke api return', ret)
       return ret
     },
   })
@@ -167,11 +138,11 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
     webContents._events['-ipc-invoke'][0] = proxyIpcInvoke
   } else {
     webContents._events['-ipc-invoke'] = proxyIpcInvoke
-  }
+  }*/
 }
 
 export function registerReceiveHook<PayloadType>(
-  method: ReceiveCmd | ReceiveCmd[],
+  method: string | string[],
   hookFunc: (payload: PayloadType) => void,
 ): string {
   const id = randomUUID()
@@ -179,7 +150,7 @@ export function registerReceiveHook<PayloadType>(
     method = [method]
   }
   receiveHooks.push({
-    method,
+    method: method as ReceiveCmdS[],
     hookFunc,
     id,
   })

src/ntqqapi/ntcall.ts

@@ -136,7 +136,6 @@ export function invoke<
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
         const hookId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
-          // log(methodName, "second callback", cbCmd, payload, cmdCB);
           if (options.cmdCB) {
             if (options.cmdCB(payload, result)) {
               removeReceiveHook(hookId)

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -45,7 +45,7 @@ export interface NodeIKernelGroupService {
     errMsg: string,
     uids: Map<string, string>
   }>
-  
+
   //26702(其实更早 但是我不知道)
   checkGroupMemberCache(arrayList: Array<string>): Promise<unknown>
 
@@ -202,11 +202,12 @@ export interface NodeIKernelGroupService {
 
   publishInstructionForNewcomers(groupCode: string, arg: unknown): void
 
-  uploadGroupBulletinPic(groupCode: string, pskey: string, imagePath: string): Promise<GeneralCallResult & {
+  uploadGroupBulletinPic(groupCode: string, pskey: string, imagePath: string): Promise<{
     errCode: number
+    errMsg: string
     picInfo?: {
-      id: string,
-      width: number,
+      id: string
+      width: number
       height: number
     }
   }>

src/ntqqapi/services/NodeIKernelProfileLikeService.ts

@@ -1,5 +1,6 @@
 import { BuddyProfileLikeReq } from '../types'
 import { GeneralCallResult } from './common'
+import { Dict } from 'cosmokit'
 
 export interface NodeIKernelProfileLikeService {
   addKernelProfileLikeListener(listener: NodeIKernelProfileLikeService): void
@@ -10,8 +11,18 @@ export interface NodeIKernelProfileLikeService {
 
   getBuddyProfileLike(req: BuddyProfileLikeReq): Promise<GeneralCallResult & {
     info: {
-      userLikeInfos: Array<unknown>,
-      friendMaxVotes: number,
+      userLikeInfos: {
+        uid: string
+        time: string
+        favoriteInfo: {
+          total_count: number
+          last_time: number
+          today_count: number
+          userInfos: Dict[]
+        }
+        voteInfo: Dict
+      }[]
+      friendMaxVotes: number
       start: number
     }
   }>

src/ntqqapi/types/group.ts

@@ -65,3 +65,15 @@ export interface GroupMember {
   joinTime: string
   lastSpeakTime: string
 }
+
+export interface PublishGroupBulletinReq {
+  text: string
+  picInfo?: {
+    id: string
+    width: number
+    height: number
+  }
+  oldFeedsId: ''
+  pinned: number
+  confirmRequired: number
+}

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

@@ -1,14 +1,23 @@
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
+import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
-  message_id: number
+  message_id: number | string
 }
 
 export class MarkMsgAsRead extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_MarkMsgAsRead
 
-  protected async _handle() {
+  protected async _handle(payload: Payload) {
+    if (!payload.message_id) {
+      throw new Error('参数 message_id 不能为空')
+    }
+    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
+    if (!msg) {
+      throw new Error('msg not found')
+    }
+    await this.ctx.ntMsgApi.setMsgRead(msg.Peer)
     return null
   }
 }

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

@@ -1,5 +1,7 @@
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
+import { unlink } from 'fs/promises'
+import { checkFileReceived, uri2local } from '@/common/utils/file'
 
 interface Payload {
   group_id: number | string
@@ -13,24 +15,39 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_SendGroupNotice
 
   async _handle(payload: Payload) {
-    const type = 1
-    const isShowEditCard = 0
-    const tipWindowType = 0
+    if(!payload.content){
+      throw new Error('参数 content 不能为空')
+    }
+    const groupCode = payload.group_id.toString()
     const pinned = Number(payload.pinned ?? 0)
     const confirmRequired = Number(payload.confirm_required ?? 1)
 
-    const result = await this.ctx.ntWebApi.setGroupNotice({
-      groupCode: payload.group_id.toString(),
-      content: payload.content,
+    let picInfo: { id: string, width: number, height: number } | undefined
+    if (payload.image) {
+      const { path, isLocal, success, errMsg } = await uri2local(payload.image, undefined, true)
+      if (!success) {
+        throw new Error(`设置群公告失败, 错误信息: uri2local: ${errMsg}`)
+      }
+      await checkFileReceived(path, 5000) // 文件不存在QQ会崩溃，需要提前判断
+      const result = await this.ctx.ntGroupApi.uploadGroupBulletinPic(groupCode, path)
+      if (result.errCode !== 0) {
+        throw new Error(`设置群公告失败, 错误信息: uploadGroupBulletinPic: ${result.errMsg}`)
+      }
+      if (!isLocal) {
+        unlink(path)
+      }
+      picInfo = result.picInfo
+    }
+
+    const res = await this.ctx.ntGroupApi.publishGroupBulletin(groupCode, {
+      text: encodeURIComponent(payload.content),
+      oldFeedsId: '',
       pinned,
-      type,
-      isShowEditCard,
-      tipWindowType,
       confirmRequired,
-      picId: ''
+      picInfo
     })
-    if (result.ec !== 0) {
-      throw new Error(`设置群公告失败, 错误信息: ${result.em}`)
+    if (res.result !== 0) {
+      throw new Error(`设置群公告失败, 错误信息: ${res.errMsg}`)
     }
     return null
   }

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

@@ -1,8 +1,6 @@
-import fs from 'node:fs'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
 import { SendElementEntities } from '@/ntqqapi/entities'
-import { SendFileElement } from '@/ntqqapi/types'
 import { uri2local } from '@/common/utils'
 import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
 
@@ -18,15 +16,11 @@ export class UploadGroupFile extends BaseAction<UploadGroupFilePayload, null> {
   actionName = ActionName.GoCQHTTP_UploadGroupFile
 
   protected async _handle(payload: UploadGroupFilePayload): Promise<null> {
-    let file = payload.file
-    if (fs.existsSync(file)) {
-      file = `file://${file}`
+    const { success, errMsg, path, fileName } = await uri2local(payload.file)
+    if (!success) {
+      throw new Error(errMsg)
     }
-    const downloadResult = await uri2local(file)
-    if (!downloadResult.success) {
-      throw new Error(downloadResult.errMsg)
-    }
-    const sendFileEle = await SendElementEntities.file(this.ctx, downloadResult.path, payload.name, payload.folder_id)
+    const sendFileEle = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder_id)
     const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group)
     await sendMsg(this.ctx, peer, [sendFileEle], [])
     return null
@@ -43,16 +37,12 @@ export class UploadPrivateFile extends BaseAction<UploadPrivateFilePayload, null
   actionName = ActionName.GoCQHTTP_UploadPrivateFile
 
   protected async _handle(payload: UploadPrivateFilePayload): Promise<null> {
+    const { success, errMsg, path, fileName } = await uri2local(payload.file)
+    if (!success) {
+      throw new Error(errMsg)
+    }
+    const sendFileEle = await SendElementEntities.file(this.ctx, path, payload.name || fileName)
     const peer = await createPeer(this.ctx, payload, CreatePeerMode.Private)
-    let file = payload.file
-    if (fs.existsSync(file)) {
-      file = `file://${file}`
-    }
-    const downloadResult = await uri2local(file)
-    if (!downloadResult.success) {
-      throw new Error(downloadResult.errMsg)
-    }
-    const sendFileEle: SendFileElement = await SendElementEntities.file(this.ctx, downloadResult.path, payload.name)
     await sendMsg(this.ctx, peer, [sendFileEle], [])
     return null
   }

src/onebot11/action/index.ts

@@ -62,6 +62,7 @@ import { GetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain'
 import { GetGroupRootFiles } from './go-cqhttp/GetGroupRootFiles'
 import { SetOnlineStatus } from './llonebot/SetOnlineStatus'
 import { SendGroupNotice } from './go-cqhttp/SendGroupNotice'
+import { GetProfileLike } from './llonebot/GetProfileLike'
 
 export function initActionMap(adapter: Adapter) {
   const actionHandlers = [
@@ -74,6 +75,7 @@ export function initActionMap(adapter: Adapter) {
     new GetFriendWithCategory(adapter),
     new GetEvent(adapter),
     new SetOnlineStatus(adapter),
+    new GetProfileLike(adapter),
     // onebot11
     new SendLike(adapter),
     new GetMsg(adapter),

src/onebot11/action/llonebot/GetProfileLike.ts

@@ -0,0 +1,17 @@
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { selfInfo } from '@/common/globalVars'
+import { Dict } from 'cosmokit'
+
+export class GetProfileLike extends BaseAction<void, Dict[]> {
+  actionName = ActionName.GetProfileLike
+
+  async _handle() {
+    const ret = await this.ctx.ntUserApi.getProfileLike(selfInfo.uid)
+    const listdata = ret.info.userLikeInfos[0].favoriteInfo.userInfos
+    for (const item of listdata) {
+      item.uin = Number(await this.ctx.ntUserApi.getUinByUid(item.uid)) || 0
+    }
+    return listdata
+  }
+}

src/onebot11/action/types.ts

@@ -20,6 +20,7 @@ export enum ActionName {
   GetFriendsWithCategory = 'get_friends_with_category',
   GetEvent = 'get_event',
   SetOnlineStatus = 'set_online_status',
+  GetProfileLike = 'get_profile_like',
   // onebot 11
   SendLike = 'send_like',
   GetLoginInfo = 'get_login_info',

src/onebot11/event/notice/OB11GroupDecreaseEvent.ts

@@ -4,7 +4,7 @@ export type GroupDecreaseSubType = 'leave' | 'kick' | 'kick_me'
 
 export class OB11GroupDecreaseEvent extends OB11GroupNoticeEvent {
   notice_type = 'group_decrease'
-  sub_type: GroupDecreaseSubType = 'leave' // TODO: 实现其他几种子类型的识别 ("leave" | "kick" | "kick_me")
+  sub_type: GroupDecreaseSubType = 'leave'
   operator_id: number
   group_id: number
   user_id: number

src/version.ts

@@ -1 +1 @@
-export const version = '3.31.10'
+export const version = '3.32.2'