fix: #785

feat: 32721
fix: #841
2025-07-19 12:03:37 +00:00 · 2025-03-02 14:55:47 +08:00 · 2025-03-02 14:36:11 +08:00 · 2025-03-02 14:32:21 +08:00 · 2025-03-02 14:27:09 +08:00 · 2025-03-02 14:26:28 +08:00
10 changed files with 165 additions and 10 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,115 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:shell",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:shell"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:shell",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:shell"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:universal",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:universal"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:framework",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:framework"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:webui",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:webui"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:universal",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:universal"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:framework",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:framework"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:webui",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:webui"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "lint",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "lint"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "depend",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "depend"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:depend",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:depend"
+            ]
+        }
+    ]
+}
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
  "name": "NapCatQQ",
  "slug": "NapCat.Framework",
  "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.5.23",
+  "version": "4.6.1",
  "icon": "./logo.png",
  "authors": [
    {
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "napcat",
  "private": true,
  "type": "module",
-  "version": "4.5.23",
+  "version": "4.6.1",
  "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",
@@ -50,7 +50,7 @@
    "express-rate-limit": "^7.5.0",
    "fast-xml-parser": "^4.3.6",
    "file-type": "^20.0.0",
-    "globals": "^15.12.0",
+    "globals": "^16.0.0",
    "image-size": "^1.1.1",
    "json5": "^2.2.3",
    "multer": "^1.4.5-lts.1",
--- a/src/common/store.ts
+++ b/src/common/store.ts
@@ -163,7 +163,7 @@ class Store {
        const current = this.get<StoreValueType>(key);

        if (current === null) {
-            this.set(key, 1);
+            this.set(key, 1, 60);
            return 1;
        }

@@ -180,7 +180,7 @@ class Store {
        }

        const newValue = numericValue + 1;
-        this.set(key, newValue);
+        this.set(key, newValue, 60);
        return newValue;
    }
 }
--- a/src/common/version.ts
+++ b/src/common/version.ts
@@ -1 +1 @@
-export const napCatVersion = '4.5.23';
+export const napCatVersion = '4.6.1';
--- a/src/core/external/appid.json
+++ b/src/core/external/appid.json
@@ -186,5 +186,21 @@
    "9.9.17-31363": {
        "appid": 537266500,
        "qua": "V1_WIN_NQ_9.9.17_31363_GW_B"
+    },
+    "3.2.16-32690": {
+        "appid": 537271229,
+        "qua": "V1_LNX_NQ_3.2.16_32690_GW_B"
+    },
+    "9.9.18-32690": {
+        "appid": 537271194,
+        "qua": "V1_WIN_NQ_9.9.18_32690_GW_B"
+    },
+    "6.9.66-32690": {
+        "appid": 537271218,
+        "qua": "V1_MAC_NQ_6.9.66_32690_GW_B"
+    },
+    "3.2.16-32721": {
+        "appid": 537271229,
+        "qua": "V1_LNX_NQ_3.2.16_32721_GW_B"
    }
-}
+}
--- a/src/core/external/offset.json
+++ b/src/core/external/offset.json
@@ -246,5 +246,25 @@
    "6.9.65-31363-arm64": {
        "send": "422CEF8",
        "recv": "422F710"
+    },
+    "9.9.18-32690-x64": {
+        "send": "39F9630",
+        "recv": "39FDE30"
+    },
+    "3.2.16-32690-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32690-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "3.2.16-32721-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32721-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
    }
-}
+}
--- a/src/onebot/action/extends/SetSpecialTittle.ts
+++ b/src/onebot/action/extends/SetSpecialTittle.ts
@@ -5,7 +5,7 @@ import { Static, Type } from '@sinclair/typebox';
 const SchemaData = Type.Object({
    group_id: Type.Union([Type.Number(), Type.String()]),
    user_id: Type.Union([Type.Number(), Type.String()]),
-    special_title: Type.String(),
+    special_title: Type.String({ default: '' }),
 });

 type Payload = Static<typeof SchemaData>;
@@ -16,7 +16,7 @@ export class SetSpecialTittle extends GetPacketStatusDepends<Payload, void> {

    async _handle(payload: Payload) {
        const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
-        if(!uid) throw new Error('User not found');
+        if (!uid) throw new Error('User not found');
        await this.core.apis.PacketApi.pkt.operation.SetGroupSpecialTitle(+payload.group_id, uid, payload.special_title);
    }
 }
--- a/src/onebot/action/group/SetGroupBan.ts
+++ b/src/onebot/action/group/SetGroupBan.ts
@@ -16,6 +16,9 @@ export default class SetGroupBan extends OneBotAction<Payload, null> {
    async _handle(payload: Payload): Promise<null> {
        const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
        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 }]);
--- a/src/onebot/api/msg.ts
+++ b/src/onebot/api/msg.ts
@@ -355,6 +355,7 @@ export class OneBotMsgApi {
                data: {
                    file: fileCode,
                    file_size: element.fileSize,
+                    path: element.filePath,
                },
            };
        },
Author	SHA1	Message	Date
手瓜一十雪	038d0c5412	fix: #785	2025-03-02 14:55:47 +08:00
手瓜一十雪	6bb4362ed4	feat: 32721	2025-03-02 14:36:11 +08:00
手瓜一十雪	e617f9452d	fix: #841	2025-03-02 14:32:21 +08:00
手瓜一十雪	6d8bb49a37	fix: #837	2025-03-02 14:27:09 +08:00
手瓜一十雪	4f6073ee86	fix: 837	2025-03-02 14:26:28 +08:00
手瓜一十雪	2e7176304b	fix: #843	2025-03-02 14:24:51 +08:00
Mlikiowa	e36cf11004	release: v4.6.1	2025-02-27 08:35:02 +00:00
手瓜一十雪	0e49e17f68	feat: 32690	2025-02-27 16:34:09 +08:00
手瓜一十雪	524de45f6b	Merge pull request #827 from NapNeko/dependabot/npm_and_yarn/globals-16.0.0 chore(deps-dev): bump globals from 15.15.0 to 16.0.0	2025-02-27 16:18:17 +08:00
手瓜一十雪	85741a4b60	feat: 32690	2025-02-27 16:14:39 +08:00
dependabot[bot]	f9ccb8c978	chore(deps-dev): bump globals from 15.15.0 to 16.0.0 Bumps [globals](https://github.com/sindresorhus/globals) from 15.15.0 to 16.0.0. - [Release notes](https://github.com/sindresorhus/globals/releases) - [Commits](https://github.com/sindresorhus/globals/compare/v15.15.0...v16.0.0) --- updated-dependencies: - dependency-name: globals dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-24 09:06:38 +00:00
手瓜一十雪	ea3d069e49	feat: vsc build dev体验增强	2025-02-23 17:54:19 +08:00
Mlikiowa	3e6024f183	release: v4.6.0	2025-02-23 09:31:55 +00:00
Mlikiowa	337871693a	release: v4.5.24	2025-02-23 09:31:19 +00:00