chore: version 4.3.1

# Conflicts:
#	manifest.json
#	src/version.ts

electron.vite.config.ts

@@ -39,6 +39,7 @@ const config: ElectronViteConfig = {
           ...external.map(genCpModule),
           { src: './manifest.json', dest: 'dist' },
           { src: './icon.webp', dest: 'dist' },
+          { src: './src/ntqqapi/native/napcat-protocol-packet/Moehoo/*', dest: 'dist/main/Moehoo' },
         ],
       }),
     ],

manifest.json

@@ -4,12 +4,16 @@
   "name": "LLOneBot",
   "slug": "LLOneBot",
   "description": "实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发",
-  "version": "4.1.0",
+  "version": "4.3.1",
   "icon": "./icon.webp",
   "authors": [
     {
       "name": "linyuchen",
       "link": "https://github.com/linyuchen"
+    },
+    {
+      "name": "idranme",
+      "link": "https://github.com/idranme"
     }
   ],
   "repository": {

package.json

@@ -12,7 +12,7 @@
     "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %LITELOADERQQNT_PROFILE%\\plugins\\LLOneBot\\\"",
     "format": "prettier -cw .",
     "check": "tsc",
-    "compile:proto": "pbjs --no-create --no-convert --no-verify -t static-module -w es6 -p src/ntqqapi/proto -o src/ntqqapi/proto/compiled.js profileLikeTip.proto groupNotify.proto message.proto richMedia.proto && pbts -o src/ntqqapi/proto/compiled.d.ts src/ntqqapi/proto/compiled.js"
+    "compile:proto": "pbjs --no-create --no-convert --no-delimited --no-verify -t static-module -w es6 -p src/ntqqapi/proto -o src/ntqqapi/proto/compiled.js profileLikeTip.proto groupNotify.proto message.proto richMedia.proto && pbts -o src/ntqqapi/proto/compiled.d.ts src/ntqqapi/proto/compiled.js"
   },
   "author": "",
   "license": "MIT",
@@ -26,23 +26,23 @@
     "cosmokit": "^1.6.3",
     "express": "^5.0.1",
     "fluent-ffmpeg": "^2.1.3",
-    "minato": "^3.6.0",
+    "minato": "^3.6.1",
     "protobufjs": "^7.4.0",
-    "silk-wasm": "^3.6.1",
+    "silk-wasm": "^3.6.3",
     "ts-case-convert": "^2.1.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
-    "@types/fluent-ffmpeg": "^2.1.26",
+    "@types/fluent-ffmpeg": "^2.1.27",
     "@types/node": "^20.14.15",
-    "@types/ws": "^8.5.12",
+    "@types/ws": "^8.5.13",
     "electron": "^31.4.0",
     "electron-vite": "^2.3.0",
     "protobufjs-cli": "^1.1.3",
     "typescript": "^5.6.3",
-    "vite": "^5.4.9",
+    "vite": "^5.4.10",
     "vite-plugin-cp": "^4.0.8"
   },
   "packageManager": "yarn@4.5.1"

scripts/gen-manifest.ts

@@ -13,6 +13,10 @@ const manifest = {
     {
       name: 'linyuchen',
       link: 'https://github.com/linyuchen'
+    },
+    {
+      "name": "idranme",
+      "link": "https://github.com/idranme"
     }
   ],
   repository: {

src/common/utils/file.ts

@@ -27,9 +27,10 @@ export function checkFileReceived(path: string, timeout: number = 3000): Promise
 
 export function calculateFileMD5(filePath: string): Promise<string> {
   return new Promise((resolve, reject) => {
+    const hash = createHash('md5')
+
     // 创建一个流式读取器
     const stream = fs.createReadStream(filePath)
-    const hash = createHash('md5')
 
     stream.on('data', (data: Buffer) => {
       // 当读取到数据时，更新哈希对象的状态
@@ -122,8 +123,11 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
   const { type } = checkUriType(uri)
 
   if (type === FileUriType.FileURL) {
-    const filePath = fileURLToPath(uri)
+    const fileUri = uri.replace('%', '%25').replace('#', '%23')
+    const filePath = fileURLToPath(fileUri)
     const fileName = path.basename(filePath)
+    // console.log('fileURLToPath', filePath)
+    // console.log('fileName', fileName)
     return { success: true, errMsg: '', fileName, path: filePath, isLocal: true }
   }
 

src/common/utils/window.ts

@@ -0,0 +1,9 @@
+import { BrowserWindow } from 'electron'
+import { log } from '@/common/utils'
+
+export function getAllWindowIds(): number[] {
+  const allWindows = BrowserWindow.getAllWindows();
+  const ids = allWindows.map(window => window.id);
+  log('getAllWindowIds', ids);
+  return ids;
+}

src/main/main.ts

@@ -35,6 +35,7 @@ import {
   NTQQWindowApi
 } from '../ntqqapi/api'
 import { existsSync, mkdirSync } from 'node:fs'
+import { NTQQSystemApi } from '@/ntqqapi/api/system'
 
 declare module 'cordis' {
   interface Events {
@@ -74,6 +75,7 @@ function onLoad() {
   ctx.plugin(NTQQWebApi)
   ctx.plugin(NTQQWindowApi)
   ctx.plugin(Database)
+  ctx.plugin(NTQQSystemApi)
 
   let started = false
 
@@ -180,18 +182,16 @@ function onLoad() {
     if (self.uin) {
       clearInterval(intervalId)
       log('process pid', process.pid)
-
       const config = getConfigUtil().getConfig()
 
       if (config.enableLLOB && (config.satori.enable || config.ob11.enable)) {
         startHook()
-        await ctx.sleep(350)
+        await ctx.sleep(600)
       } else {
         llonebotError.otherError = 'LLOneBot 未启动'
         log('LLOneBot 开关设置为关闭，不启动 LLOneBot')
         return
       }
-
       ctx.plugin(Log, {
         enable: config.log!,
         filename: logFileName
@@ -225,11 +225,14 @@ function onLoad() {
       started = true
       llonebotError.otherError = ''
     }
-  }, 600)
+  }, 500)
 }
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
+  if (window.id === 2) {
+    mainWindow = window
+  }
 }
 
 try {

src/ntqqapi/api/file.ts

@@ -43,7 +43,7 @@ export class NTQQFileApi extends Service {
       msgId,
       elemId: elementId,
       videoCodecFormat: 0,
-      params: {
+      exParams: {
         downSourceType: 1,
         triggerType: 1
       }

src/ntqqapi/api/friend.ts

@@ -107,7 +107,7 @@ export class NTQQFriendApi extends Service {
     return ret.arkMsg
   }
 
-  async setBuddyRemark(uid: string, remark: string) {
+  async setBuddyRemark(uid: string, remark = '') {
     return await invoke('nodeIKernelBuddyService/setBuddyRemark', [{
       remarkParams: { uid, remark }
     }])
@@ -122,4 +122,8 @@ export class NTQQFriendApi extends Service {
       }
     }])
   }
+
+  async setBuddyCategory(uid: string, categoryId: number) {
+    return await invoke('nodeIKernelBuddyService/setBuddyCategory', [{ uid, categoryId }])
+  }
 }

src/ntqqapi/api/group.ts

@@ -9,7 +9,8 @@ import {
   PublishGroupBulletinReq,
   GroupAllInfo,
   GroupFileInfo,
-  GroupBulletinListResult
+  GroupBulletinListResult,
+  GroupMsgMask
 } from '../types'
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
@@ -110,8 +111,9 @@ export class NTQQGroupApi extends Service {
     const groupCode = flagitem[0]
     const seq = flagitem[1]
     const type = parseInt(flagitem[2])
+    const doubt = flagitem[3] === '1'
     return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
-      doubt: false,
+      doubt,
       operateMsg: {
         operateType,
         targetMsg: {
@@ -340,4 +342,12 @@ export class NTQQGroupApi extends Service {
       [{ groupId }]
     )
   }
+
+  async setGroupMsgMask(groupCode: string, msgMask: GroupMsgMask) {
+    return await invoke('nodeIKernelGroupService/setGroupMsgMask', [{ groupCode, msgMask }])
+  }
+
+  async setGroupRemark(groupCode: string, groupRemark = '') {
+    return await invoke('nodeIKernelGroupService/modifyGroupRemark', [{ groupCode, groupRemark }])
+  }
 }

src/ntqqapi/api/msg.ts

@@ -153,7 +153,17 @@ export class NTQQMsgApi extends Service {
         afterFirstCmd: false,
         cmdCB: payload => {
           for (const msgRecord of payload.msgList) {
-            if (msgRecord.peerUid === destPeer.peerUid && msgRecord.senderUid === selfUid) {
+            if (
+              msgRecord.msgType === 11 &&
+              msgRecord.subMsgType === 7 &&
+              msgRecord.peerUid === destPeer.peerUid &&
+              msgRecord.senderUid === selfUid
+            ) {
+              const element = msgRecord.elements[0]
+              const data = JSON.parse(element.arkElement!.bytesData)
+              if (data.app !== 'com.tencent.multimsg' || !data.meta.detail.resid) {
+                continue
+              }
               return true
             }
           }
@@ -161,20 +171,12 @@ export class NTQQMsgApi extends Service {
         }
       }
     )
-    for (const msg of data.msgList) {
-      const arkElement = msg.elements.find(ele => ele.arkElement)
-      if (!arkElement) {
-        continue
+    return data.msgList.find(msgRecord => {
+      const { arkElement } = msgRecord.elements[0]
+      if (arkElement?.bytesData.includes('com.tencent.multimsg')) {
+        return true
       }
-      const forwardData = JSON.parse(arkElement.arkElement!.bytesData)
-      if (forwardData.app !== 'com.tencent.multimsg') {
-        continue
-      }
-      if (msg.peerUid === destPeer.peerUid && msg.senderUid === selfUid) {
-        return msg
-      }
-    }
-    throw new Error('转发消息超时')
+    })!
   }
 
   async getSingleMsg(peer: Peer, msgSeq: string) {

src/ntqqapi/api/system.ts

@@ -0,0 +1,38 @@
+import { Context, Service } from 'cordis'
+import { invoke, NTClass } from '@/ntqqapi/ntcall'
+
+declare module 'cordis' {
+  interface Context {
+    ntSystemApi: NTQQSystemApi
+  }
+}
+
+export class NTQQSystemApi extends Service {
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntSystemApi', true)
+  }
+
+  async restart() {
+    // todo: 调用此接口后会将 NTQQ 设置里面的自动登录和无需手机确认打开，重启后将状态恢复到之前的状态
+
+    // 设置自动登录
+    await this.setSettingAutoLogin(true)
+    // 退出账号
+    invoke('quitAccount', [], {
+      className: NTClass.BUSINESS_API
+    }).then()
+    invoke('notifyQQClose', [{ type: 1 }], { className: NTClass.QQ_EX_API }).then()
+    // 等待登录界面，模拟点击登录按钮？还是直接调用登录方法？
+  }
+
+  async getSettingAutoLogin() {
+    // 查询是否自动登录
+    return invoke('nodeIKernelNodeMiscService/queryAutoRun', [])
+  }
+
+  async setSettingAutoLogin(state: boolean) {
+    await invoke('nodeIKernelSettingService/setNeedConfirmSwitch', [{ state: 1 }]) // 1：不需要手机确认，2：需要手机确认
+
+    await invoke('nodeIKernelSettingService/setAutoLoginSwitch', [{ state }])
+  }
+}

src/ntqqapi/core.ts

@@ -16,10 +16,11 @@ import {
   BuddyReqType,
   GrayTipElementSubType
 } from './types'
-import { selfInfo, llonebotError } from '../common/globalVars'
+import { selfInfo } from '../common/globalVars'
 import { version } from '../version'
 import { invoke } from './ntcall'
-import { Native } from './native/index'
+import { Native } from './native/crychic'
+import { initWrapperSession, NTQQPacketApi } from './native/napcat-protocol-packet'
 
 declare module 'cordis' {
   interface Context {
@@ -29,7 +30,7 @@ declare module 'cordis' {
     'nt/message-created': (input: RawMessage) => void
     'nt/message-deleted': (input: RawMessage) => void
     'nt/message-sent': (input: RawMessage) => void
-    'nt/group-notify': (input: GroupNotify) => void
+    'nt/group-notify': (input: { notify: GroupNotify, doubt: boolean }) => void
     'nt/friend-request': (input: FriendRequest) => void
     'nt/group-member-info-updated': (input: { groupCode: string, members: GroupMember[] }) => void
     'nt/system-message-created': (input: Uint8Array) => void
@@ -40,10 +41,14 @@ class Core extends Service {
   static inject = ['ntMsgApi', 'ntFriendApi', 'ntGroupApi', 'store']
   public startTime = 0
   public native
+  public packet!: NTQQPacketApi
 
   constructor(protected ctx: Context, public config: Core.Config) {
     super(ctx, 'app', true)
     this.native = new Native(ctx)
+    initWrapperSession().then(session => {
+      this.packet = new NTQQPacketApi(session)
+    })
   }
 
   public start() {
@@ -228,7 +233,7 @@ class Core extends Service {
             continue
           }
           groupNotifyIgnore.push(notify.seq)
-          this.ctx.parallel('nt/group-notify', notify)
+          this.ctx.parallel('nt/group-notify', { notify, doubt: payload.doubt })
         }
       }
     })

src/ntqqapi/hook.ts

@@ -2,6 +2,7 @@ import { NTMethod } from './ntcall'
 import { log } from '@/common/utils'
 import { randomUUID } from 'node:crypto'
 import { ipcMain } from 'electron'
+import { Dict } from 'cosmokit'
 
 export const hookApiCallbacks: Record<string, (res: any) => void> = {}
 
@@ -40,36 +41,38 @@ const callHooks: Array<{
 }> = []
 
 export function startHook() {
+  log('start hook')
+
   const senderExclude = Symbol()
 
   ipcMain.emit = new Proxy(ipcMain.emit, {
-    apply(target, thisArg, args: [eventName: string, ...args: any]) {
-      if (args[2]?.eventName.startsWith('ns-LoggerApi')) {
+    apply(target, thisArg, args: [channel: string, ...args: any]) {
+      if (args[2]?.eventName?.startsWith('ns-LoggerApi')) {
         return target.apply(thisArg, args)
       }
       if (logHook) {
         log('request', args)
       }
-
       const event = args[1]
       if (event.sender && !event.sender[senderExclude]) {
         event.sender[senderExclude] = true
         event.sender.send = new Proxy(event.sender.send, {
-          apply(target, thisArg, args: any[]) {
-            if (args[1].eventName?.startsWith('ns-LoggerApi')) {
+          apply(target, thisArg, args: [channel: string, meta: Dict, data: Dict[]]) {
+            if (args[1]?.eventName?.startsWith('ns-LoggerApi')) {
               return target.apply(thisArg, args)
             }
             if (logHook) {
               log('received', args)
             }
 
-            const callbackId = args[1].callbackId
+            const callbackId = args[1]?.callbackId
             if (callbackId) {
               if (hookApiCallbacks[callbackId]) {
                 Promise.resolve(hookApiCallbacks[callbackId](args[2]))
                 delete hookApiCallbacks[callbackId]
               }
             } else if (args[2]) {
+              if (['IPC_DOWN_2', 'IPC_DOWN_3'].includes(args[0])) {
                 for (const receiveData of args[2]) {
                   for (const hook of receiveHooks.values()) {
                     if (hook.method.includes(receiveData.cmdName)) {
@@ -78,6 +81,7 @@ export function startHook() {
                   }
                 }
               }
+            }
             return target.apply(thisArg, args)
           }
         })
@@ -93,7 +97,7 @@ export function startHook() {
         }
       }
       return target.apply(thisArg, args)
-    }
+    },
   })
 }
 

src/ntqqapi/native/crychic/index.ts

@@ -1,9 +1,9 @@
 import { Context } from 'cordis'
 import { Dict } from 'cosmokit'
-import { getBuildVersion } from '@/common/utils/misc'
-import { TEMP_DIR } from '@/common/globalVars'
+import { getBuildVersion } from '../../../common/utils/misc'
+import { TEMP_DIR } from '../../../common/globalVars'
 import { copyFile } from 'fs/promises'
-import { ChatType, Peer } from '../types'
+import { ChatType, Peer } from '../../types'
 import path from 'node:path'
 import addon from './external/crychic-win32-x64.node?asset'
 
@@ -11,7 +11,7 @@ export class Native {
   public activated = false
   private crychic?: Dict
   private seq = 0
-  private cb: Map<number, Function> = new Map()
+  private cb: Map<number, (res: any) => void> = new Map()
 
   constructor(private ctx: Context) {
     ctx.on('ready', () => {

src/ntqqapi/native/napcat-protocol-packet/index.d.ts

@@ -0,0 +1,17 @@
+import { WrapperSession } from './wrapper-session/types';
+export { initWrapperSession } from './wrapper-session';
+export declare function checkSupportVersion(): void;
+export declare class NTQQPacketApi {
+    private qqVersion;
+    private readonly packetClient;
+    private readonly packer;
+    private logger;
+    private readonly wrapperSession;
+    constructor(wrapperSession: WrapperSession);
+    private InitSendPacket;
+    private sendPacket;
+    private sendOidbPacket;
+    sendPokePacket(peer: number, group?: number): Promise<void>;
+    sendGroupSignPacket(selfUin: string, groupCode: string): Promise<void>;
+    sendSetSpecialTittlePacket(groupCode: string, uid: string, tittle: string): Promise<void>;
+}

src/ntqqapi/native/napcat-protocol-packet/wrapper-session/index.d.ts

@@ -0,0 +1 @@
+export declare function initWrapperSession(): Promise<any>;

src/ntqqapi/native/napcat-protocol-packet/wrapper-session/types.d.ts

@@ -0,0 +1,6 @@
+export interface MsgService {
+    sendSsoCmdReqByContend: (cmd: string, trace_id: string) => Promise<unknown>;
+}
+export type WrapperSession = {
+    getMsgService(): MsgService;
+};

src/ntqqapi/ntcall.ts

@@ -1,6 +1,6 @@
 import { ipcMain } from 'electron'
 import { hookApiCallbacks, registerReceiveHook, removeReceiveHook } from './hook'
-import { getBuildVersion, log } from '../common/utils'
+import { log } from '../common/utils'
 import { randomUUID } from 'node:crypto'
 import {
   GeneralCallResult,
@@ -29,7 +29,8 @@ export enum NTClass {
   SKEY_API = 'ns-SkeyApi',
   GROUP_HOME_WORK = 'ns-GroupHomeWork',
   GROUP_ESSENCE = 'ns-GroupEssence',
-  NODE_STORE_API = 'ns-NodeStoreApi'
+  NODE_STORE_API = 'ns-NodeStoreApi',
+  QQ_EX_API = 'ns-QQEXApi',
 }
 
 export enum NTMethod {
@@ -108,13 +109,26 @@ interface InvokeOptions<ReturnType> {
   timeout?: number
 }
 
+let channel: NTChannel
+
+function getChannel() {
+  if (channel) {
+    return channel
+  }
+  if (ipcMain.eventNames().includes(NTChannel.IPC_UP_2)) {
+    return channel = NTChannel.IPC_UP_2
+  } else {
+    return channel = NTChannel.IPC_UP_3
+  }
+}
+
 export function invoke<
   R extends Awaited<ReturnType<Extract<NTService[S][M], (...args: any) => unknown>>>,
   S extends keyof NTService = any,
   M extends keyof NTService[S] & string = any
 >(method: Extract<unknown, `${S}/${M}`> | string, args: unknown[], options: InvokeOptions<R> = {}) {
   const className = options.className ?? NTClass.NT_API
-  const channel = options.channel ?? getBuildVersion() >= 28788 ? NTChannel.IPC_UP_3 : NTChannel.IPC_UP_2
+  const channel = options.channel ?? getChannel()
   const timeout = options.timeout ?? 5000
   const afterFirstCmd = options.afterFirstCmd ?? true
   let eventName = className + '-' + channel[channel.length - 1]

src/ntqqapi/services/NodeIKernelBuddyService.ts

@@ -13,7 +13,7 @@ export interface NodeIKernelBuddyService {
     }[]
   }>
 
-  setBuddyRemark(arg: unknown): void
+  setBuddyRemark(arg: unknown): Promise<GeneralCallResult>
 
   isBuddy(uid: string): boolean
 

src/ntqqapi/services/NodeIKernelNodeMiscService.ts

@@ -12,4 +12,6 @@ export interface NodeIKernelNodeMiscService {
       score: ''
     }[]
   }>
+
+  queryAutoRun(): Promise<boolean>
 }

src/ntqqapi/types/group.ts

@@ -1,10 +1,3 @@
-export enum GroupListUpdateType {
-  REFRESHALL,
-  GETALL,
-  MODIFIED,
-  REMOVE
-}
-
 export interface Group {
   groupCode: string
   maxMember: number
@@ -188,3 +181,10 @@ export interface GroupBulletinListResult {
   nextIndex: number
   jointime: string
 }
+
+export enum GroupMsgMask {
+  AllowNotify = 1,  // 允许提醒
+  AllowNotNotify = 4,  // 接受消息不提醒
+  BoxNotNotify = 2,  // 收进群助手不提醒
+  NotAllow = 3,  // 屏蔽
+}

src/ntqqapi/types/msg.ts

@@ -442,6 +442,7 @@ export interface RawMessage {
     attrType: number
     attrId: string
   }>
+  isOnlineMsg: boolean
 }
 
 export interface Peer {

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

@@ -23,8 +23,8 @@ interface FileResponse {
 export class DownloadFile extends BaseAction<Payload, FileResponse> {
   actionName = ActionName.GoCQHTTP_DownloadFile
   payloadSchema = Schema.object({
-    url: String,
-    base64: String,
+    url: Schema.string(),
+    base64: Schema.string(),
     headers: Schema.union([String, Schema.array(String)])
   })
 

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

@@ -12,6 +12,7 @@ interface Payload {
 interface Response extends OB11User {
   reg_time: number
   long_nick: string
+  city: string
 }
 
 export class GetStrangerInfo extends BaseAction<Payload, Response> {
@@ -33,7 +34,8 @@ export class GetStrangerInfo extends BaseAction<Payload, Response> {
         level: data.detail.commonExt.qqLevel && calcQQLevel(data.detail.commonExt.qqLevel) || 0,
         login_days: 0,
         reg_time: data.detail.commonExt.regTime,
-        long_nick: data.detail.simpleInfo.baseInfo.longNick
+        long_nick: data.detail.simpleInfo.baseInfo.longNick,
+        city: data.detail.commonExt.city
       }
     } else {
       const data = await this.ctx.ntUserApi.getUserDetailInfoByUin(uin)
@@ -46,7 +48,8 @@ export class GetStrangerInfo extends BaseAction<Payload, Response> {
         level: data.info.qqLevel && calcQQLevel(data.info.qqLevel) || 0,
         login_days: 0,
         reg_time: data.info.regTime,
-        long_nick: data.info.longNick
+        long_nick: data.info.longNick,
+        city: data.info.city
       }
     }
   }

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

@@ -19,7 +19,7 @@ interface Payload {
 
 interface Response {
   message_id: number
-  forward_id?: string
+  forward_id: string
 }
 
 export class SendForwardMsg extends BaseAction<Payload, Response> {
@@ -60,14 +60,11 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
       }
     }
 
-    let msg: RawMessage
     if (fake && this.ctx.app.native.activated) {
-      msg = await this.handleFakeForwardNode(peer, nodes)
+      return await this.handleFakeForwardNode(peer, nodes)
     } else {
-      msg = await this.handleForwardNode(peer, nodes)
+      return await this.handleForwardNode(peer, nodes)
     }
-    const msgShortId = this.ctx.store.createMsgShortId({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
-    return { message_id: msgShortId }
   }
 
   private parseNodeContent(nodes: OB11MessageNode[]) {
@@ -82,7 +79,7 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
     })
   }
 
-  private async handleFakeForwardNode(peer: Peer, nodes: OB11MessageNode[]) {
+  private async handleFakeForwardNode(peer: Peer, nodes: OB11MessageNode[]): Promise<Response> {
     const encoder = new MessageEncoder(this.ctx, peer)
     const raw = await encoder.generate(nodes)
     const transmit = Msg.PbMultiMsgTransmit.encode({ pbItemList: raw.multiMsgItems }).finish()
@@ -122,7 +119,11 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
           })
         }
       }], 1800)
-      return msg!
+      const msgShortId = this.ctx.store.createMsgShortId({
+        chatType: msg!.chatType,
+        peerUid: msg!.peerUid
+      }, msg!.msgId)
+      return { message_id: msgShortId, forward_id: resid }
     } catch (e) {
       this.ctx.logger.error('合并转发失败', e)
       throw new Error(`发送伪造合并转发消息失败 (res_id: ${resid} `)
@@ -153,7 +154,7 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
   }
 
   // 返回一个合并转发的消息id
-  private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[]) {
+  private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[]): Promise<Response> {
     const selfPeer = {
       chatType: ChatType.C2C,
       peerUid: selfInfo.uid,
@@ -245,8 +246,13 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
     if (retMsgIds.length === 0) {
       throw Error('转发消息失败，节点为空')
     }
-    const returnMsg = await this.ctx.ntMsgApi.multiForwardMsg(srcPeer!, destPeer, retMsgIds)
-    return returnMsg
+    const msg = await this.ctx.ntMsgApi.multiForwardMsg(srcPeer!, destPeer, retMsgIds)
+    const resid = JSON.parse(msg.elements[0].arkElement!.bytesData).meta.detail.resid
+    const msgShortId = this.ctx.store.createMsgShortId({
+      chatType: msg.chatType,
+      peerUid: msg.peerUid
+    }, msg.msgId)
+    return { message_id: msgShortId, forward_id: resid }
   }
 }
 

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

@@ -0,0 +1,19 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { selfInfo } from '@/common/globalVars'
+
+interface Payload {
+  group_id: number | string
+}
+
+export class SendGroupSign extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_SendGroupSign
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+  })
+
+  async _handle(payload: Payload) {
+    await this.ctx.app.packet.sendGroupSignPacket(selfInfo.uin, payload.group_id.toString())
+    return null
+  }
+}

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

@@ -0,0 +1,30 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { selfInfo } from '@/common/globalVars'
+import { GroupMemberRole } from '@/ntqqapi/types'
+
+interface Payload {
+  group_id: number | string
+  user_id: number | string
+  special_title?: string
+}
+
+export class SetGroupSpecialTitle extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_SetGroupSpecialTitle
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    special_title: Schema.string()
+  })
+
+  async _handle(payload: Payload) {
+    const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString(), payload.group_id.toString())
+    if (!uid) throw new Error(`用户${payload.user_id}的uid获取失败`)
+    const self = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), selfInfo.uid, false)
+    if (self.role !== GroupMemberRole.Owner){
+      throw new Error(`不是群${payload.group_id}的群主，无法设置群头衔`)
+    }
+    await this.ctx.app.packet.sendSetSpecialTittlePacket(payload.group_id.toString(), uid, payload.special_title || "")
+    return null
+  }
+}

src/onebot11/action/index.ts

@@ -78,6 +78,13 @@ import { GroupPoke } from './llonebot/GroupPoke'
 import { FriendPoke } from './llonebot/FriendPoke'
 import { GetGroupFileSystemInfo } from './go-cqhttp/GetGroupFileSystemInfo'
 import { GetCredentials } from './system/GetCredentials'
+import { SetGroupSpecialTitle } from '@/onebot11/action/go-cqhttp/SetGroupSpecialTitle'
+import { SendGroupSign } from '@/onebot11/action/go-cqhttp/SendGroupSign'
+import { SetRestart } from '@/onebot11/action/system/SetRestart'
+import { SetFriendCategory } from '@/onebot11/action/llonebot/SetFriendCategory'
+import { SetFriendRemark } from '@/onebot11/action/llonebot/SetFriendRemark'
+import { SetGroupMsgMask } from '@/onebot11/action/llonebot/SetGroupMsgMask'
+import { SetGroupRemark } from '@/onebot11/action/llonebot/SetGroupRemark'
 
 export function initActionMap(adapter: Adapter) {
   const actionHandlers = [
@@ -98,6 +105,10 @@ export function initActionMap(adapter: Adapter) {
     new GetRobotUinRange(adapter),
     new GroupPoke(adapter),
     new FriendPoke(adapter),
+    new SetFriendCategory(adapter),
+    new SetFriendRemark(adapter),
+    new SetGroupMsgMask(adapter),
+    new SetGroupRemark(adapter),
     // onebot11
     new SendLike(adapter),
     new GetMsg(adapter),
@@ -131,6 +142,7 @@ export function initActionMap(adapter: Adapter) {
     new ForwardFriendSingleMsg(adapter),
     new ForwardGroupSingleMsg(adapter),
     new GetCredentials(adapter),
+    new SetRestart(adapter),
     // go-cqhttp
     new GetEssenceMsgList(adapter),
     new GetGroupHonorInfo(adapter),
@@ -161,6 +173,8 @@ export function initActionMap(adapter: Adapter) {
     new DeleteFriend(adapter),
     new OCRImage(adapter),
     new GetGroupFileSystemInfo(adapter),
+    new SetGroupSpecialTitle(adapter),
+    new SendGroupSign(adapter),
   ]
   const actionMap = new Map()
   for (const action of actionHandlers) {

src/onebot11/action/llonebot/FriendPoke.ts

@@ -1,6 +1,6 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { getBuildVersion } from '@/common/utils/misc'
+import { getBuildVersion } from '@/common/utils'
 
 interface Payload {
   user_id: number | string
@@ -13,13 +13,12 @@ export class FriendPoke extends BaseAction<Payload, null> {
   })
 
   async _handle(payload: Payload) {
-    if (!this.ctx.app.native.checkPlatform()) {
-      throw new Error('当前系统平台或架构不支持')
-    }
-    if (!this.ctx.app.native.checkVersion()) {
-      throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27333—27597`)
+    if (!this.ctx.app.native.checkPlatform() || !this.ctx.app.native.checkVersion()) {
+      await this.ctx.app.packet.sendPokePacket(+payload.user_id)
     }
+    else{
       await this.ctx.app.native.sendFriendPoke(+payload.user_id)
+    }
     return null
   }
 }

src/onebot11/action/llonebot/GroupPoke.ts

@@ -1,6 +1,6 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { getBuildVersion } from '@/common/utils/misc'
+import { getBuildVersion } from '@/common/utils'
 
 interface Payload {
   group_id: number | string
@@ -15,13 +15,12 @@ export class GroupPoke extends BaseAction<Payload, null> {
   })
 
   async _handle(payload: Payload) {
-    if (!this.ctx.app.native.checkPlatform()) {
-      throw new Error('当前系统平台或架构不支持')
-    }
-    if (!this.ctx.app.native.checkVersion()) {
-      throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27333—27597`)
+    if (!this.ctx.app.native.checkPlatform() || !this.ctx.app.native.checkVersion()) {
+      await this.ctx.app.packet.sendPokePacket(+payload.user_id, +payload.group_id)
     }
+    else{
       await this.ctx.app.native.sendGroupPoke(+payload.group_id, +payload.user_id)
+    }
     return null
   }
 }

src/onebot11/action/llonebot/SetFriendCategory.ts

@@ -0,0 +1,21 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  user_id: number | string
+  category_id: number | string
+}
+
+export class SetFriendCategory extends BaseAction<Payload, unknown> {
+  actionName = ActionName.SetFriendCategory
+  payloadSchema = Schema.object({
+    user_id: Schema.union([Number, String]).required(),
+    category_id: Schema.union([Number, String]).required()
+  })
+
+  protected async _handle(payload: Payload) {
+    const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString())
+    if (!uid) throw new Error('无法获取好友信息')
+    return this.ctx.ntFriendApi.setBuddyCategory(uid, +payload.category_id)
+  }
+}

src/onebot11/action/llonebot/SetFriendRemark.ts

@@ -0,0 +1,21 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  user_id: number | string
+  remark?: string
+}
+
+export class SetFriendRemark extends BaseAction<Payload, unknown> {
+  actionName = ActionName.SetFriendRemark
+  payloadSchema = Schema.object({
+    user_id: Schema.union([Number, String]).required(),
+    remark: Schema.string()
+  })
+
+  protected async _handle(payload: Payload) {
+    const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString())
+    if (!uid) throw new Error('无法获取好友信息')
+    return this.ctx.ntFriendApi.setBuddyRemark(uid, payload.remark || '')
+  }
+}

src/onebot11/action/llonebot/SetGroupMsgMask.ts

@@ -0,0 +1,19 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  group_id: number | string
+  mask: number | string  // 1, 2, 3, 4
+}
+
+export class SetGroupMsgMask extends BaseAction<Payload, unknown> {
+  actionName = ActionName.SetGroupMsgMask
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    mask: Schema.union([Number, String]).required()
+  })
+
+  protected async _handle(payload: Payload) {
+    return this.ctx.ntGroupApi.setGroupMsgMask(payload.group_id.toString(), +payload.mask)
+  }
+}

src/onebot11/action/llonebot/SetGroupRemark.ts

@@ -0,0 +1,15 @@
+import { BaseAction } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  group_id: string,
+  remark?: string
+}
+
+export class SetGroupRemark extends BaseAction<Payload, unknown> {
+  actionName = ActionName.SetGroupRemark
+
+  protected async _handle(payload: Payload): Promise<unknown>{
+    return this.ctx.ntGroupApi.setGroupRemark(payload.group_id.toString(), payload.remark)
+  }
+}

src/onebot11/action/system/CleanCache.ts

@@ -7,10 +7,7 @@ import { ChatCacheListItemBasic, CacheFileType } from '@/ntqqapi/types'
 export default class CleanCache extends BaseAction<void, void> {
   actionName = ActionName.CleanCache
 
-  protected _handle(): Promise<void> {
-    return new Promise<void>(async (res, rej) => {
-      try {
-        // dbUtil.clearCache()
+  protected async _handle(): Promise<void> {
     const cacheFilePaths: string[] = []
 
     await this.ctx.ntFileCacheApi.setCacheSilentScan(false)
@@ -49,20 +46,13 @@ export default class CleanCache extends BaseAction<void, void> {
     for (const name in CacheFileType) {
       if (!isNaN(parseInt(name))) continue
 
-          const fileTypeAny: any = CacheFileType[name]
-          const fileType: CacheFileType = fileTypeAny
+      const fileType = CacheFileType[name] as unknown as CacheFileType
 
       cacheFileList.push(...(await this.ctx.ntFileCacheApi.getFileCacheInfo(fileType)).infos.map((file) => file.fileKey))
     }
 
     // 一并清除
     await this.ctx.ntFileCacheApi.clearChatCache(chatCacheList, cacheFileList)
-        res()
-      } catch (e) {
-        console.error('清理缓存时发生了错误')
-        rej(e)
-      }
-    })
   }
 }
 

src/onebot11/action/system/SetRestart.ts

@@ -0,0 +1,10 @@
+import { BaseAction } from '@/onebot11/action/BaseAction'
+import { ActionName } from '@/onebot11/action/types'
+
+export class SetRestart extends BaseAction<null, void> {
+  actionName = ActionName.SetRestart
+
+  protected async _handle() {
+    await this.ctx.ntSystemApi.restart()
+  }
+}

src/onebot11/action/types.ts

@@ -29,6 +29,10 @@ export enum ActionName {
   GetRobotUinRange = 'get_robot_uin_range',
   GroupPoke = 'group_poke',
   FriendPoke = 'friend_poke',
+  SetFriendRemark = 'set_friend_remark',
+  SetFriendCategory = 'set_friend_category',
+  SetGroupMsgMask = 'set_group_msg_mask',
+  SetGroupRemark = 'set_group_remark',
   // onebot 11
   SendLike = 'send_like',
   GetLoginInfo = 'get_login_info',
@@ -47,6 +51,7 @@ export enum ActionName {
   SetGroupLeave = 'set_group_leave',
   GetVersionInfo = 'get_version_info',
   GetStatus = 'get_status',
+  SetRestart = 'set_restart',
   CanSendRecord = 'can_send_record',
   CanSendImage = 'can_send_image',
   SetGroupKick = 'set_group_kick',
@@ -91,4 +96,6 @@ export enum ActionName {
   GoCQHTTP_DeleteFriend = 'delete_friend',
   GoCQHTTP_OCRImage = 'ocr_image',
   GoCQHTTP_GetGroupFileSystemInfo = 'get_group_file_system_info',
+  GoCQHTTP_SetGroupSpecialTitle = 'set_group_special_title',
+  GoCQHTTP_SendGroupSign = 'send_group_sign',
 }

src/onebot11/adapter.ts

@@ -15,7 +15,6 @@ import { OB11Config, Config as LLOBConfig } from '../common/types'
 import { OB11WebSocket, OB11WebSocketReverseManager } from './connect/ws'
 import { OB11Http, OB11HttpPost } from './connect/http'
 import { OB11BaseEvent } from './event/OB11BaseEvent'
-import { OB11Message } from './types'
 import { OB11BaseMetaEvent } from './event/meta/OB11BaseMetaEvent'
 import { postHttpEvent } from './helper/eventForHttp'
 import { initActionMap } from './action'
@@ -88,9 +87,9 @@ class OneBot11Adapter extends Service {
     }
   }
 
-  private async handleGroupNotify(notify: GroupNotify) {
+  private async handleGroupNotify(notify: GroupNotify, doubt: boolean) {
     try {
-      const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type
+      const flag = `${notify.group.groupCode}|${notify.seq}|${notify.type}|${doubt === true ? '1' : '0'}`
       if ([GroupNotifyType.MemberLeaveNotifyAdmin, GroupNotifyType.KickMemberNotifyAdmin].includes(notify.type)) {
         if (notify.user2.uid) {
           this.ctx.logger.info('有群成员被踢', notify.group.groupCode, notify.user1.uid, notify.user2.uid)
@@ -338,7 +337,8 @@ class OneBot11Adapter extends Service {
       this.handleMsg(input)
     })
     this.ctx.on('nt/group-notify', input => {
-      this.handleGroupNotify(input)
+      const { doubt, notify } = input
+      this.handleGroupNotify(notify, doubt)
     })
     this.ctx.on('nt/friend-request', input => {
       this.handleFriendRequest(input)
@@ -370,12 +370,6 @@ class OneBot11Adapter extends Service {
         const userId = Number(memberUin)
         const event = new OB11GroupDecreaseEvent(tip.groupCode, userId, userId)
         this.dispatch(event)
-      } else if (msgType === 87) {
-        const tip = SysMsg.GroupInvite.decode(sysMsg.body!.msgContent!)
-        this.ctx.logger.info('群成员增加', tip)
-        const operatorUin = await this.ctx.ntUserApi.getUinByUid(tip.operatorUid)
-        const event = new OB11GroupIncreaseEvent(tip.groupCode, +selfInfo.uin, +operatorUin, 'invite')
-        this.dispatch(event)
       }
     })
   }

src/onebot11/entities.ts

@@ -478,6 +478,13 @@ export namespace OB11Entities {
             )
           }
         }
+        else if (groupElement.type === TipGroupElementType.MemberIncrease) {
+          const { memberUid, adminUid } = groupElement
+          if (memberUid !== selfInfo.uid) return
+          ctx.logger.info('收到群成员增加消息', groupElement)
+          const adminUin = adminUid ? await ctx.ntUserApi.getUinByUid(adminUid) : selfInfo.uin
+          return new OB11GroupIncreaseEvent(+msg.peerUid, +selfInfo.uin, +adminUin)
+        }
       }
       else if (element.fileElement) {
         return new OB11GroupUploadNoticeEvent(+msg.peerUid, +msg.senderUin!, {
@@ -520,7 +527,6 @@ export namespace OB11Entities {
           ctx.logger.info('收到新人被邀请进群消息', xmlElement)
           const invitor = xmlElement.templParam.get('invitor')
           const invitee = xmlElement.templParam.get('invitee')
-          if (invitee === selfInfo.uin) return
           if (invitor && invitee) {
             return new OB11GroupIncreaseEvent(+msg.peerUid, +invitee, +invitor, 'invite')
           }

src/onebot11/helper/createMultiMessage.ts

@@ -174,7 +174,7 @@ export class MessageEncoder {
     const { type, data } = segment
     if (type === OB11MessageDataType.Node) {
       await this.render(data.content as OB11MessageData[])
-      const id = data.id ?? data.user_id
+      const id = data.uin ?? data.user_id
       this.uin = id ? +id : undefined
       this.name = data.name ?? data.nickname
       await this.flush()
@@ -221,7 +221,7 @@ export class MessageEncoder {
     }
   }
 
-  async generate(content: any[]) {
+  async generate(content: OB11MessageData[]) {
     await this.render(content)
     return {
       multiMsgItems: [{

src/renderer/index.ts

@@ -11,6 +11,10 @@ function isEmpty(value: unknown) {
 }
 
 async function onSettingWindowCreated(view: Element) {
+  console.log(view)
+  if (!view){
+    return
+  }
   const config = await window.llonebot.getConfig()
   const ob11Config = { ...config.ob11 }
 
@@ -247,7 +251,9 @@ async function onSettingWindowCreated(view: Element) {
     } else {
       errDom?.classList.add('show')
     }
-    errCodeDom!.innerHTML = errMsg
+    if (errCodeDom) {
+      errCodeDom.innerHTML = errMsg
+    }
   }
   showError().then()
 

src/satori/adapter.ts

@@ -91,7 +91,7 @@ class SatoriAdapter extends Service {
       input.subMsgType === 12 &&
       input.elements[0]?.grayTipElement?.xmlElement?.templId === '10382'
     ) {
-
+      // 机器人被表情回应
     }
     else {
       // 普通的消息
@@ -99,7 +99,7 @@ class SatoriAdapter extends Service {
     }
   }
 
-  async handleGroupNotify(input: NT.GroupNotify) {
+  async handleGroupNotify(input: NT.GroupNotify, doubt: boolean) {
     if (
       input.type === NT.GroupNotifyType.InvitedByMember &&
       input.status === NT.GroupNotifyStatus.Unhandle
@@ -119,14 +119,14 @@ class SatoriAdapter extends Service {
       input.status === NT.GroupNotifyStatus.Unhandle
     ) {
       // 他人主动申请，需管理员同意
-      return await parseGuildMemberRequest(this, input)
+      return await parseGuildMemberRequest(this, input, doubt)
     }
     else if (
       input.type === NT.GroupNotifyType.InvitedNeedAdminiStratorPass &&
       input.status === NT.GroupNotifyStatus.Unhandle
     ) {
       // 他人被邀请，需管理员同意
-      return await parseGuildMemberRequest(this, input)
+      return await parseGuildMemberRequest(this, input, doubt)
     }
   }
 
@@ -140,7 +140,8 @@ class SatoriAdapter extends Service {
     })
 
     this.ctx.on('nt/group-notify', async input => {
-      const event = await this.handleGroupNotify(input)
+      const { doubt, notify } = input
+      const event = await this.handleGroupNotify(notify, doubt)
         .catch(e => this.ctx.logger.error(e))
       event && this.server.dispatch(event)
     })

src/satori/event/member.ts

@@ -46,9 +46,9 @@ export async function parseGuildMemberRemoved(bot: SatoriAdapter, input: GroupNo
   })
 }
 
-export async function parseGuildMemberRequest(bot: SatoriAdapter, input: GroupNotify) {
+export async function parseGuildMemberRequest(bot: SatoriAdapter, input: GroupNotify, doubt: boolean) {
   const groupCode = input.group.groupCode
-  const flag = groupCode + '|' + input.seq + '|' + input.type
+  const flag = `${groupCode}|${input.seq}|${input.type}|${doubt === true ? '1' : '0'}`
 
   return bot.event('guild-member-request', {
     guild: decodeGuild(input.group),

src/version.ts

@@ -1 +1 @@
-export const version = '4.1.0'
+export const version = '4.3.1'