feat: 33139

This reverts commit 2759a34d96.

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+nanaeonn@outlook.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

README.md

@@ -1,67 +1,62 @@
 <div align="center">
 
+# NapCat
+
 ![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
 
+_Modern protocol-side framework implemented based on NTQQ._
+
+> 云起兮风生，心向远方兮路未曾至.
+
 </div>
 
 ---
-## 欢迎回家
-NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 特性介绍
-- [x] **安装简单**：就算是笨蛋也能使用
-- [x] **性能友好**：就算是低内存也能使用
-- [x] **接口丰富**：就算是没有也能使用
-- [x] **稳定好用**：就算是被捉也能使用
+## Welcome
++ NapCatQQ is a modern implementation of the Bot protocol based on NTQQ.
+  - NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 使用框架
+## Feature
+
++ **Easy to Use**
+  - 作为初学者能够轻松使用.
++ **Quick and Efficient**
+  - 在低内存操作系统长时运行.
++ **Rich API Interface**
+  - 完整实现了大部分标准接口.
++ **Stable and Reliable**
+  - 持续稳定的开发与维护.
+## Quick Start
 
 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
 **首次使用**请务必查看如下文档看使用教程
 
-### 文档地址
+## Link
 
-[Cloudflare.Worker](https://doc.napneko.icu/)
+| Docs | [![Github.IO](https://img.shields.io/badge/docs%20on-Github.IO-orange)](https://napneko.github.io/) | [![Cloudflare.Worker](https://img.shields.io/badge/docs%20on-Cloudflare.Worker-black)](https://doc.napneko.icu/) | [![Cloudflare.HKServer](https://img.shields.io/badge/docs%20on-Cloudflare.HKServer-informational)](https://napcat.napneko.icu/) |
+|:-:|:-:|:-:|:-:|
 
-[Cloudflare.HKServer](https://napcat.napneko.icu/)
+| Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://docs.napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
+|:-:|:-:|:-:|:-:|
 
-[Github.IO](https://napneko.github.io/)
+| Contact | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
+|:-:|:-:|:-:|:-:|
 
-[Cloudflare.Pages](https://napneko.pages.dev/)
+## Thanks
 
-[Server.Other](https://docs.napcat.cyou/)
++ [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
-[NapCat.Wiki](https://www.napcat.wiki)
++ [LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目部分开发
 
-## 回家旅途
-[QQ Group#1](https://qm.qq.com/q/I6LU87a0Yq)
-
-[QQ Group#2](https://qm.qq.com/q/HaRcfrHpUk)
-
-[Telegram](https://t.me/MelodicMoonlight)
-
-> QQ Group#2 准许Bot / Telegram与QQ Group#2 为新建Group
-
-## 性能设计/协议标准
-NapCat 已实现90％+的 OneBot / GoCQ 标准接口，并提供兼容性保留接口，其设计理念遵守 无数据库/异步优先/后台刷新 的性能思想。
-
-由此设计带来一系列好处，在开发中，获取群员列表通常小于50Ms，单条文本消息发送在320Ms以内，在1k+的群聊流畅运行，同时带来一些副作用，消息Id无法持久，无法上报撤回消息原始内容。
-
-NapCat 在设计理念下遵守 OneBot 规范大多数要求并且积极改进，任何合理的标准化 Issue 与 Pr 将被接收。
-
-## 感谢他们
-感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
-
-感谢 React 强力驱动 NapCat.WebUi
-
-不过最最重要的 还是需要感谢屏幕前的你哦~
++ 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
 
-## 特殊感谢
-[LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目
+## License
+本项目采用 混合协议 开源，因此使用本项目时，你需要注意以下几点：
+1. 第三方库代码或修改部分遵循其原始开源许可.
+2. 本项目获取部分项目授权而不受部分约束
+2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).
 
-## 开源附加
-
-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**
+**本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| > 4.0   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+you should open an issue

launcher/launcher-user.bat

@@ -19,7 +19,7 @@ for %%a in ("%RetString%") do (
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
 if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/launcher-win10-user.bat

@@ -19,7 +19,7 @@ for %%a in ("%RetString%") do (
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
 if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/launcher-win10.bat

@@ -27,8 +27,8 @@ for %%a in ("%RetString%") do (
 
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+if not exist "%QQPath%" (
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/launcher.bat

@@ -27,8 +27,8 @@ for %%a in ("%RetString%") do (
 
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+if not exist "%QQPath%" (
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/qqnt.json

@@ -1,10 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.17-30899",
-  "verHash": "ececf273",
-  "linuxVersion": "3.2.15-30899",
-  "linuxVerHash": "63c751e8",
-  "type": "module",
+  "version": "9.9.18-32793",
+  "verHash": "d43f097e",
+  "linuxVersion": "3.2.16-32793",
+  "linuxVerHash": "ee4bd910",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -17,8 +16,25 @@
   "bin": {
     "qd": "externals/devtools/cli/index.js"
   },
+  "appid": {
+    "win32": "537258389",
+    "darwin": "537258412",
+    "linux": "537258424"
+  },
   "main": "./loadNapCat.js",
-  "buildVersion": "30899",
+  "peerDependenciesMeta": {
+    "*": {
+      "optional": true
+    }
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "@vue/runtime-dom@3.5.12": "patches/@vue__runtime-dom@3.5.12.patch",
+      "@swc/helpers@0.5.3": "patches/@swc__helpers@0.5.3.patch",
+      "vuex@4.1.0": "patches/vuex@4.1.0.patch"
+    }
+  },
+  "buildVersion": "32793",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.6.1",
+  "version": "4.7.5",
   "icon": "./logo.png",
   "authors": [
     {

napcat.webui/src/components/onebot/api/debug.tsx

@@ -136,7 +136,7 @@ const OneBotApiDebug: React.FC<OneBotApiDebugProps> = (props) => {
       </div>
       <Card
         shadow="sm"
-        className="my-4 bg-opacity-50 backdrop-blur-md overflow-visible z-20"
+        className="my-4 bg-opacity-50 backdrop-blur-md overflow-visible"
       >
         <CardHeader className="font-bold text-lg gap-1 pb-0">
           <span className="mr-2">请求体</span>

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.6.1",
+  "version": "4.7.5",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -45,7 +45,7 @@
     "cors": "^2.8.5",
     "esbuild": "0.25.0",
     "eslint": "^9.14.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-import-resolver-typescript": "^4.0.0",
     "eslint-plugin-import": "^2.29.1",
     "express-rate-limit": "^7.5.0",
     "fast-xml-parser": "^4.3.6",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.6.1';
+export const napCatVersion = '4.7.5';

src/core/apis/file.ts

@@ -42,7 +42,7 @@ export class NTQQFileApi {
         this.core = core;
         this.rkeyManager = new RkeyManager([
             'https://ss.xingzhige.com/music_card/rkey', // 国内
-            'https://rkey.napneko.icu/rkeys' // Cloudflare
+            'https://secret-service.bietiaop.com/rkeys',//国内
         ],
         this.context.logger
         );

src/core/apis/group.ts

@@ -27,6 +27,9 @@ export class NTQQGroupApi {
         this.core = core;
     }
 
+    async setGroupRemark(groupCode: string, remark: string) {
+        return this.context.session.getGroupService().modifyGroupRemark(groupCode, remark);
+    }
     async fetchGroupDetail(groupCode: string) {
         const [, detailInfo] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelGroupService/getGroupDetailInfo',
@@ -345,9 +348,9 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().uploadGroupBulletinPic(groupCode, _Pskey, imageurl);
     }
 
-    async handleGroupRequest(notify: GroupNotify, operateType: NTGroupRequestOperateTypes, reason?: string) {
+    async handleGroupRequest(doubt: boolean, notify: GroupNotify, operateType: NTGroupRequestOperateTypes, reason?: string) {
         return this.context.session.getGroupService().operateSysNotify(
-            false,
+            doubt,
             {
                 operateType: operateType,
                 targetMsg: {

src/core/apis/msg.ts

@@ -136,6 +136,20 @@ export class NTQQMsgApi {
         });
     }
 
+    async queryFirstMsgBySender(peer: Peer, SendersUid: string[]) {
+        console.log(peer, SendersUid);
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            filterMsgToTime: '0',
+            filterMsgFromTime: '0',
+            isReverseOrder: true,
+            isIncludeCurrent: true,
+            pageLimit: 20000,
+        });
+    }
+
     async setMsgRead(peer: Peer) {
         return this.context.session.getMsgService().setMsgRead(peer);
     }

src/core/external/appid.json

@@ -202,5 +202,29 @@
     "3.2.16-32721": {
         "appid": 537271229,
         "qua": "V1_LNX_NQ_3.2.16_32721_GW_B"
+    },
+    "9.9.18-32793": {
+        "appid": 537271244,
+        "qua": "V1_WIN_NQ_9.9.18_32793_GW_B"
+    },
+    "3.2.16-32793": {
+        "appid": 537271279,
+        "qua": "V1_LNX_NQ_3.2.16_32793_GW_B"
+    },
+    "3.2.16-32869": {
+        "appid": 537271329,
+        "qua": "V1_LNX_NQ_3.2.16_32869_GW_B"
+    },
+    "9.9.18-32869": {
+        "appid": 537271294,
+        "qua": "V1_WIN_NQ_9.9.18_32869_GW_B"
+    },
+    "3.2.16-33139": {
+        "appid": 537273909,
+        "qua": "V1_LNX_NQ_3.2.16_33139_GW_B"
+    },
+    "9.9.18-33139": {
+        "appid": 537273874,
+        "qua": "V1_WIN_NQ_9.9.18_33139_GW_B"
     }
 }

src/core/external/napcat.json

@@ -4,5 +4,6 @@
     "fileLogLevel": "debug",
     "consoleLogLevel": "info",
     "packetBackend": "auto",
-    "packetServer": ""
+    "packetServer": "",
+    "o3HookMode": 1
   }

src/core/external/offset.json

@@ -266,5 +266,41 @@
     "3.2.16-32721-arm64": {
         "send": "7226630",
         "recv": "7229F60"
+    },
+    "9.9.18-32793-x64": {
+        "send": "39F9A30",
+        "recv": "39FE230"
+    },
+    "3.2.16-32793-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32793-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "9.9.18-32869-x64": {
+        "send": "39F9A30",
+        "recv": "39FE230"
+    },
+    "3.2.16-32869-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32869-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "9.9.18-33139-x64": {
+        "send": "39F5870",
+        "recv": "39FA070"
+    },
+    "3.2.16-33139-x64": {
+        "send": "A634F60",
+        "recv": "A638980"
+    },
+    "3.2.16-33139-arm64": {
+        "send": "7262BB0",
+        "recv": "72664E0"
     }
 }

src/core/helper/config.ts

@@ -10,6 +10,7 @@ export const NapcatConfigSchema = Type.Object({
     consoleLogLevel: Type.String({ default: 'info' }),
     packetBackend: Type.String({ default: 'auto' }),
     packetServer: Type.String({ default: '' }),
+    o3HookMode: Type.Number({ default: 0 }),
 });
 
 export type NapcatConfig = Static<typeof NapcatConfigSchema>;

src/core/listeners/NodeIKernelLoginListener.ts

@@ -1,5 +1,5 @@
 export class NodeIKernelLoginListener {
-    onLoginConnected(...args: any[]): any {
+    onLoginConnected(): Promise<void> | void {
     }
 
     onLoginDisConnected(...args: any[]): any {

src/core/listeners/NodeIKernelSearchListener.ts

@@ -1,4 +1,4 @@
-import { ChatType } from '@/core';
+import { ChatType, RawMessage } from '@/core';
 export interface SearchGroupInfo {
     groupCode: string;
     ownerUid: string;
@@ -94,4 +94,27 @@ export interface NodeIKernelSearchListener {
             }[]
         }[]
     }): any;
+
+    onSearchMsgKeywordsResult(params: {
+        searchId: string,
+        hasMore: boolean,
+        resultItems: Array<{
+            msgId: string,
+            msgSeq: string,
+            msgTime: string,
+            senderUid: string,
+            senderUin: string,
+            senderNick: string,
+            senderNickHits: unknown[],
+            senderRemark: string,
+            senderRemarkHits: unknown[],
+            senderCard: string,
+            senderCardHits: unknown[],
+            fieldType: number,
+            fieldText: string,
+            msgRecord: RawMessage;
+            hitsInfo: Array<unknown>,
+            msgAbstract: unknown,
+        }>
+    }): void | Promise<void>;
 }

src/core/packet/client/nativeClient.ts

@@ -11,7 +11,7 @@ import { PacketLogger } from '@/core/packet/context/loggerContext';
 
 // 0 send 1 recv
 export interface NativePacketExportType {
-    InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void) => boolean;
+    InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void, o3_hook: boolean) => boolean;
     SendPacket?: (cmd: string, data: string, trace_id: string) => void;
 }
 
@@ -42,6 +42,7 @@ export class NativePacketClient extends IPacketClient {
         const platform = process.platform + '.' + process.arch;
         const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
         process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY);
+        
         this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, uin: string, cmd: string, seq: number, hex_data: string) => {
             const trace_id = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
             if (type === 0 && this.cb.get(trace_id + 'recv')) {
@@ -55,7 +56,7 @@ export class NativePacketClient extends IPacketClient {
                 // console.log('callback:', callback, trace_id);
                 callback?.({ seq, cmd, hex_data });
             }
-        });
+        }, this.napcore.config.o3HookMode == 1);
         this.available = true;
     }
 

src/core/packet/transformer/action/SetSpecialTitle.ts

@@ -9,15 +9,14 @@ class SetSpecialTitle extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase>
     }
 
     build(groupCode: number, uid: string, tittle: string): OidbPacket {
-        const oidb_0x8FC_2_body = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2_Body).encode({
+        const oidb_0x8FC_2 = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2).encode({
+            groupUin: +groupCode,
+            body: {
                 targetUid: uid,
                 specialTitle: tittle,
                 expiredTime: -1,
                 uinName: tittle
-        });
-        const oidb_0x8FC_2 = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2).encode({
-            groupUin: +groupCode,
-            body: oidb_0x8FC_2_body
+            }
         });
         return OidbBase.build(0x8FC, 2, oidb_0x8FC_2, false, false);
     }

src/core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts

@@ -4,12 +4,12 @@ import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
 //设置群头衔 OidbSvcTrpcTcp.0x8fc_2
 export const OidbSvcTrpcTcp0X8FC_2_Body = {
     targetUid: ProtoField(1, ScalarType.STRING),
-    specialTitle: ProtoField(5, ScalarType.STRING),
-    expiredTime: ProtoField(6, ScalarType.SINT32),
-    uinName: ProtoField(7, ScalarType.STRING),
+    specialTitle: ProtoField(5, ScalarType.STRING, true),
+    expiredTime: ProtoField(6, ScalarType.INT32),
+    uinName: ProtoField(7, ScalarType.STRING, true),
     targetName: ProtoField(8, ScalarType.STRING),
 };
 export const OidbSvcTrpcTcp0X8FC_2 = {
     groupUin: ProtoField(1, ScalarType.UINT32),
-    body: ProtoField(3, ScalarType.BYTES),
+    body: ProtoField(3, () => OidbSvcTrpcTcp0X8FC_2_Body),
 };

src/core/services/NodeIKernelGroupService.ts

@@ -165,7 +165,7 @@ export interface NodeIKernelGroupService {
 
     modifyGroupName(groupCode: string, groupName: string, isNormalMember: boolean): Promise<GeneralCallResult>;
 
-    modifyGroupRemark(groupCode: string, remark: string): void;
+    modifyGroupRemark(groupCode: string, remark: string): Promise<GeneralCallResult>;
 
     modifyGroupDetailInfo(groupCode: string, arg: unknown): void;
 

src/core/services/NodeIKernelLoginService.ts

@@ -60,7 +60,10 @@ export interface QuickLoginResult {
 }
 
 export interface NodeIKernelLoginService {
+    getMsfStatus: () => number;
+
     setLoginMiscData(arg0: string, value: string): unknown;
+    
     getMachineGuid(): string;
 
     get(): NodeIKernelLoginService;

src/core/services/NodeIKernelSearchService.ts

@@ -1,4 +1,4 @@
-import { ChatType } from '@/core/types';
+import { ChatType, Peer } from '@/core/types';
 import { GeneralCallResult } from './common';
 
 export interface NodeIKernelSearchService {
@@ -54,7 +54,7 @@ export interface NodeIKernelSearchService {
 
     cancelSearchChatMsgs(...args: unknown[]): unknown;// needs 3 arguments
 
-    searchMsgWithKeywords(...args: unknown[]): unknown;// needs 2 arguments
+    searchMsgWithKeywords(keyWords: string[], param: Peer & { searchFields: number, pageLimit: number }): Promise<GeneralCallResult>;
 
     searchMoreMsgWithKeywords(...args: unknown[]): unknown;// needs 1 arguments
 

src/framework/napcat.ts

@@ -7,13 +7,13 @@ import { SelfInfo } from '@/core/types';
 import { NodeIKernelLoginListener } from '@/core/listeners';
 import { NodeIKernelLoginService } from '@/core/services';
 import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
-import { InitWebUi, WebUiConfig } from '@/webui';
+import { InitWebUi, WebUiConfig, webUiRuntimePort } from '@/webui';
 import { NapCatOneBot11Adapter } from '@/onebot';
 
 //Framework ES入口文件
 export async function getWebUiUrl() {
     const WebUiConfigData = (await WebUiConfig.GetWebUIConfig());
-    return 'http://127.0.0.1:' + WebUiConfigData.port + '/webui/?token=' + WebUiConfigData.token;
+    return 'http://127.0.0.1:' + webUiRuntimePort + '/webui/?token=' + WebUiConfigData.token;
 }
 
 export async function NCoreInitFramework(

src/onebot/action/extends/SetGroupRemark.ts

@@ -0,0 +1,22 @@
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.String(),
+    remark: Type.String(),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export default class SetGroupRemark extends OneBotAction<Payload, null> {
+    override actionName = ActionName.SetGroupRemark;
+    override payloadSchema = SchemaData;
+    async _handle(payload: Payload): Promise<null> {
+        let ret = await this.core.apis.GroupApi.setGroupRemark(payload.group_id, payload.remark);
+        if (ret.result != 0) {
+            throw new Error(`设置群备注失败, ${ret.result}:${ret.errMsg}`);
+        }
+        return null;
+    }
+}

src/onebot/action/group/GetGroupInfo.ts

@@ -20,6 +20,7 @@ class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
             const data = await this.core.apis.GroupApi.fetchGroupDetail(payload.group_id.toString());
             return {
                 ...data,
+                group_remark: '',
                 group_id: +payload.group_id,
                 group_name: data.groupName,
                 member_count: data.memberNum,

src/onebot/action/group/SetGroupAddRequest.ts

@@ -20,11 +20,12 @@ export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
         const approve = payload.approve?.toString() !== 'false';
         const reason = payload.reason ?? ' ';
         const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(flag);
-        const notify = invite_notify ?? await this.findNotify(flag);
+        const { doubt, notify } = invite_notify ? { doubt: false, notify: invite_notify } : await this.findNotify(flag);
         if (!notify) {
             throw new Error('No such request');
         }
         await this.core.apis.GroupApi.handleGroupRequest(
+            doubt,
             notify,
             approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
             reason,
@@ -36,7 +37,8 @@ export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
         let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
         if (!notify) {
             notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
+            return { doubt: true, notify };
         }
-        return notify;
+        return { doubt: false, notify };
     }
 }

src/onebot/action/group/SetGroupBan.ts

@@ -18,7 +18,6 @@ export default class SetGroupBan extends OneBotAction<Payload, null> {
         if (!uid) throw new Error('uid error');
         let member_role = (await this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, true))?.role;
         if (member_role === 4) throw new Error('cannot ban owner');
-        if (member_role === 3) throw new Error('cannot ban admin');
         // 例如无管理员权限时 result为 120101005 errMsg为 'ERR_NOT_GROUP_ADMIN'
         let ret = await this.core.apis.GroupApi.banMember(payload.group_id.toString(),
             [{ uid: uid, timeStamp: +payload.duration }]);

src/onebot/action/index.ts

@@ -108,10 +108,12 @@ import { BotExit } from './extends/BotExit';
 import { ClickInlineKeyboardButton } from './extends/ClickInlineKeyboardButton';
 import { GetPrivateFileUrl } from './file/GetPrivateFileUrl';
 import { GetUnidirectionalFriendList } from './extends/GetUnidirectionalFriendList';
+import SetGroupRemark from './extends/SetGroupRemark';
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
     const actionHandlers = [
+        new SetGroupRemark(obContext, core),
         new GetGroupInfoEx(obContext, core),
         new FetchEmojiLike(obContext, core),
         new GetFile(obContext, core),

src/onebot/action/router.ts

@@ -10,6 +10,7 @@ export interface InvalidCheckResult {
 }
 
 export const ActionName = {
+    SetGroupRemark: 'set_group_remark',
     NapCat_GetPrivateFileUrl: 'get_private_file_url',
     ClickInlineKeyboardButton: 'click_inline_keyboard_button',
     GetUnidirectionalFriendList: 'get_unidirectional_friend_list',

src/onebot/api/msg.ts

@@ -809,6 +809,7 @@ export class OneBotMsgApi {
             message_id: msg.id!,
             message_seq: msg.id!,
             real_id: msg.id!,
+            real_seq: msg.msgSeq,
             message_type: msg.chatType == ChatType.KCHATTYPEGROUP ? 'group' : 'private',
             sender: {
                 user_id: +(msg.senderUin ?? 0),

src/onebot/api/quick-action.ts

@@ -84,17 +84,19 @@ export class OneBotQuickActionApi {
         let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
         if (!notify) {
             notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
+            return { doubt: true, notify };
         }
-        return notify;
+        return { doubt: false, notify };
     }
 
     async handleGroupRequest(request: OB11GroupRequestEvent, quickAction: QuickActionGroupRequest) {
 
         const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(request.flag);
-        const notify = invite_notify ?? await this.findNotify(request.flag);
+        const { doubt, notify } = invite_notify ? { doubt: false, notify: invite_notify } : await this.findNotify(request.flag);
 
         if (!isNull(quickAction.approve) && notify) {
             this.core.apis.GroupApi.handleGroupRequest(
+                doubt,
                 notify,
                 quickAction.approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
                 quickAction.reason,

src/onebot/helper/data.ts

@@ -73,6 +73,7 @@ export class OB11Construct {
 
     static group(group: Group): OB11Group {
         return {
+            group_remark: group.remarkName,
             group_id: +group.groupCode,
             group_name: group.groupName,
             member_count: group.memberCount,

src/onebot/types/data.ts

@@ -57,6 +57,7 @@ export interface OB11GroupMember {
 }
 
 export interface OB11Group {
+    group_remark: string; // 群备注
     group_id: number; // 群ID
     group_name: string; // 群名称
     member_count?: number; // 成员数量

src/onebot/types/message.ts

@@ -10,6 +10,7 @@ export enum OB11MessageType {
 
 // 消息接口定义
 export interface OB11Message {
+    real_seq?: string;// 自行扩展
     temp_source?: number;
     message_sent_type?: string;
     target_id?: number;  // 自己发送消息/私聊消息

src/shell/base.ts

@@ -30,6 +30,8 @@ import { InitWebUi } from '@/webui';
 import { WebUiDataRuntime } from '@/webui/src/helper/Data';
 import { napCatVersion } from '@/common/version';
 import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener';
+import { sleep } from '@/common/helper';
+
 // NapCat Shell App ES 入口文件
 async function handleUncaughtExceptions(logger: LogWrapper) {
     process.on('uncaughtException', (err) => {
@@ -113,24 +115,32 @@ async function handleLogin(
     quickLoginUin: string | undefined,
     historyLoginList: LoginListItem[]
 ): Promise<SelfInfo> {
-    return new Promise<SelfInfo>((resolve) => {
-        const loginListener = new NodeIKernelLoginListener();
-        let isLogined = false;
+    let context = { isLogined: false };
+    let inner_resolve: (value: SelfInfo) => void;
+    let selfInfo: Promise<SelfInfo> = new Promise((resolve) => {
+        inner_resolve = resolve;
+    });
+    // 连接服务
 
+    const loginListener = new NodeIKernelLoginListener();
     loginListener.onUserLoggedIn = (userid: string) => {
         logger.logError(`当前账号(${userid})已登录,无法重复登录`);
     };
-
     loginListener.onQRCodeLoginSucceed = async (loginResult) => {
-            isLogined = true;
-            resolve({
+        context.isLogined = true;
+        inner_resolve({
             uid: loginResult.uid,
             uin: loginResult.uin,
             nick: '',
             online: true,
         });
-        };
 
+    };
+    loginListener.onLoginConnected = () => {
+        waitForNetworkConnection(loginService, logger).then(() => {
+            handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e));
+        });
+    }
     loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
         WebUiDataRuntime.setQQLoginQrcodeURL(qrcodeUrl);
 
@@ -152,7 +162,7 @@ async function handleLogin(
     };
 
     loginListener.onQRCodeSessionFailed = (errType: number, errCode: number) => {
-            if (!isLogined) {
+        if (!context.isLogined) {
             logger.logError('[Core] [Login] Login Error,ErrType: ', errType, ' ErrCode:', errCode);
             if (errType == 1 && errCode == 3) {
                 // 二维码过期刷新
@@ -166,21 +176,10 @@ async function handleLogin(
     };
 
     loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
-        const isConnect = loginService.connect();
-        if (!isConnect) {
-            logger.logError('核心登录服务连接失败!');
-            return;
+    loginService.connect();
+    return await selfInfo;
 }
-
-        logger.log('核心登录服务连接成功!');
-
-        loginService.getLoginList().then((res) => {
-            // 遍历 res.LocalLoginInfoList[x].isQuickLogin是否可以 res.LocalLoginInfoList[x].uin 转为string 加入string[] 最后遍历完成调用WebUiDataRuntime.setQQQuickLoginList
-            const list = res.LocalLoginInfoList.filter((item) => item.isQuickLogin);
-            WebUiDataRuntime.setQQQuickLoginList(list.map((item) => item.uin.toString()));
-            WebUiDataRuntime.setQQNewLoginList(list);
-        });
-
+async function handleLoginInner(context: { isLogined: boolean }, logger: LogWrapper, loginService: NodeIKernelLoginService, quickLoginUin: string | undefined, historyLoginList: LoginListItem[]) {
     WebUiDataRuntime.setQuickLoginCall(async (uin: string) => {
         return await new Promise((resolve) => {
             if (uin) {
@@ -199,23 +198,20 @@ async function handleLogin(
             }
         });
     });
-
     if (quickLoginUin) {
         if (historyLoginList.some(u => u.uin === quickLoginUin)) {
             logger.log('正在快速登录 ', quickLoginUin);
-                setTimeout(() => {
             loginService.quickLoginWithUin(quickLoginUin)
                 .then(result => {
                     if (result.loginErrorInfo.errMsg) {
                         logger.logError('快速登录错误：', result.loginErrorInfo.errMsg);
-                                if (!isLogined) loginService.getQRCodePicture();
+                        if (!context.isLogined) loginService.getQRCodePicture();
                     }
                 })
                 .catch();
-                }, 1000);
         } else {
             logger.logError('快速登录失败，未找到该 QQ 历史登录记录，将使用二维码登录方式');
-                if (!isLogined) loginService.getQRCodePicture();
+            if (!context.isLogined) loginService.getQRCodePicture();
         }
     } else {
         logger.log('没有 -q 指令指定快速登录，将使用二维码登录方式');
@@ -227,6 +223,12 @@ async function handleLogin(
         }
         loginService.getQRCodePicture();
     }
+
+    loginService.getLoginList().then((res) => {
+        // 遍历 res.LocalLoginInfoList[x].isQuickLogin是否可以 res.LocalLoginInfoList[x].uin 转为string 加入string[] 最后遍历完成调用WebUiDataRuntime.setQQQuickLoginList
+        const list = res.LocalLoginInfoList.filter((item) => item.isQuickLogin);
+        WebUiDataRuntime.setQQQuickLoginList(list.map((item) => item.uin.toString()));
+        WebUiDataRuntime.setQQNewLoginList(list);
     });
 }
 
@@ -284,6 +286,20 @@ async function handleProxy(session: NodeIQQNTWrapperSession, logger: LogWrapper)
         });
     }
 }
+
+async function waitForNetworkConnection(loginService: NodeIKernelLoginService, logger: LogWrapper) {
+    let network_ok = false;
+    let tryCount = 0;
+    while (!network_ok) {
+        network_ok = loginService.getMsfStatus() !== 3;// win 11 0连接 1未连接
+        logger.log('等待网络连接...');
+        await sleep(500);
+        tryCount++;
+    }
+    logger.log('网络已连接');
+    return network_ok;
+}
+
 export async function NCoreInitShell() {
     console.log('NapCat Shell App Loading...');
     const pathWrapper = new NapCatPathWrapper();

src/webui/index.ts

@@ -29,7 +29,7 @@ export let webUiPathWrapper: NapCatPathWrapper;
 const MAX_PORT_TRY = 100;
 import * as net from 'node:net';
 import { WebUiDataRuntime } from './src/helper/Data';
-
+export let webUiRuntimePort = 6099;
 export async function InitPort(parsedConfig: WebUiConfigType): Promise<[string, number, string]> {
     try {
         await tryUseHost(parsedConfig.host);
@@ -45,6 +45,7 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
     webUiPathWrapper = pathWrapper;
     WebUiConfig = new WebUiConfigWrapper();
     const [host, port, token] = await InitPort(await WebUiConfig.GetWebUIConfig());
+    webUiRuntimePort = port;
     if (port == 0) {
         logger.log('[NapCat] [WebUi] Current WebUi is not run.');
         return;