mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2025-07-19 12:03:37 +00:00
Compare commits
91 Commits
v4.7.28
...
protobuf-d
Author | SHA1 | Date | |
---|---|---|---|
![]() |
c50359c504 | ||
![]() |
364500e16e | ||
![]() |
22144010ec | ||
![]() |
6421bb4f5c | ||
![]() |
3919743885 | ||
![]() |
a5a57b9e20 | ||
![]() |
e31d2810ad | ||
![]() |
140e62fdcd | ||
![]() |
014b4deb87 | ||
![]() |
956b6cd172 | ||
![]() |
bbaca3f044 | ||
![]() |
bb8a44b918 | ||
![]() |
b5574d5999 | ||
![]() |
06dde072da | ||
![]() |
8e92a81bb9 | ||
![]() |
2c7345ae88 | ||
![]() |
33d4696155 | ||
![]() |
7d2dcc10e5 | ||
![]() |
e82687454c | ||
![]() |
84382caebc | ||
![]() |
662530e507 | ||
![]() |
edf81d0a2e | ||
![]() |
7cbae86941 | ||
![]() |
8ff7420a5e | ||
![]() |
7ae59b1419 | ||
![]() |
41036f8ee8 | ||
![]() |
380777ca04 | ||
![]() |
c658cd1096 | ||
![]() |
c7b9946d2f | ||
![]() |
0caca473d6 | ||
![]() |
3e5d35957d | ||
![]() |
6b8b14aba2 | ||
![]() |
5db7a90a24 | ||
![]() |
88b86611a3 | ||
![]() |
886fe2052e | ||
![]() |
e4dd194d4a | ||
![]() |
a47af60f58 | ||
![]() |
35f24eb806 | ||
![]() |
36e3119d34 | ||
![]() |
8ff3ad824e | ||
![]() |
556000c002 | ||
![]() |
fda050d3fe | ||
![]() |
b1047309c9 | ||
![]() |
d766c4945e | ||
![]() |
43c98c45b9 | ||
![]() |
f7556b5af3 | ||
![]() |
cd781c4cf6 | ||
![]() |
cd8698b157 | ||
![]() |
d921dcddf1 | ||
![]() |
9f318ddaef | ||
![]() |
5c35ea11c3 | ||
![]() |
3b16effff0 | ||
![]() |
d3a27ad701 | ||
![]() |
2a4589e268 | ||
![]() |
80a34c82b9 | ||
![]() |
fca7a65ee0 | ||
![]() |
30a75bc581 | ||
![]() |
7b365367f7 | ||
![]() |
3ed5f543e2 | ||
![]() |
ceea50b116 | ||
![]() |
a5455e27d1 | ||
![]() |
6f83d01321 | ||
![]() |
c453b82e9f | ||
![]() |
b7da316447 | ||
![]() |
fb20b2e16c | ||
![]() |
9df7c341a9 | ||
![]() |
7c113d6e04 | ||
![]() |
a6f22167ff | ||
![]() |
d49e69735a | ||
![]() |
eca73eae18 | ||
![]() |
8403b1c9c1 | ||
![]() |
26593d593c | ||
![]() |
4d26ec737b | ||
![]() |
31fdffde36 | ||
![]() |
bccf5894cd | ||
![]() |
2754165ae5 | ||
![]() |
b9a9438bf0 | ||
![]() |
d8b2ebc01e | ||
![]() |
a979a07d3d | ||
![]() |
d4d94e43d8 | ||
![]() |
3deb7788ae | ||
![]() |
a790303ebe | ||
![]() |
99bfe69752 | ||
![]() |
1c8cf9538d | ||
![]() |
faf390bb18 | ||
![]() |
be2e2e86f0 | ||
![]() |
941b30847b | ||
![]() |
4c5a26698e | ||
![]() |
d14a1dd948 | ||
![]() |
1c0b434f47 | ||
![]() |
573451bade |
@@ -40,8 +40,11 @@ _Modern protocol-side framework implemented based on NTQQ._
|
|||||||
| Docs | [](https://napneko.pages.dev/) | [](https://napcat.cyou/) | [](https://www.napcat.wiki) |
|
| Docs | [](https://napneko.pages.dev/) | [](https://napcat.cyou/) | [](https://www.napcat.wiki) |
|
||||||
|:-:|:-:|:-:|:-:|
|
|:-:|:-:|:-:|:-:|
|
||||||
|
|
||||||
| Contact | [](https://qm.qq.com/q/I6LU87a0Yq) | [](https://qm.qq.com/q/HaRcfrHpUk) | [](https://t.me/MelodicMoonlight) |
|
| QQ Group | [](https://qm.qq.com/q/CMmPbGw0jA) | [](https://qm.qq.com/q/8zJMLjqy2Y) | [](https://qm.qq.com/q/HaRcfrHpUk) | [](https://qm.qq.com/q/I6LU87a0Yq) |
|
||||||
|:-:|:-:|:-:|:-:|
|
|:-:|:-:|:-:|:-:|:-:|
|
||||||
|
|
||||||
|
| Telegram | [](https://t.me/MelodicMoonlight) |
|
||||||
|
|:-:|:-:|
|
||||||
|
|
||||||
## Thanks
|
## Thanks
|
||||||
|
|
||||||
|
BIN
external/fonts/AaCute.ttf
vendored
Normal file
BIN
external/fonts/AaCute.ttf
vendored
Normal file
Binary file not shown.
BIN
external/fonts/JetBrainsMono.ttf
vendored
Normal file
BIN
external/fonts/JetBrainsMono.ttf
vendored
Normal file
Binary file not shown.
BIN
external/fonts/post.jpg
vendored
Normal file
BIN
external/fonts/post.jpg
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 695 KiB |
@@ -4,7 +4,7 @@
|
|||||||
"name": "NapCatQQ",
|
"name": "NapCatQQ",
|
||||||
"slug": "NapCat.Framework",
|
"slug": "NapCat.Framework",
|
||||||
"description": "高性能的 OneBot 11 协议实现",
|
"description": "高性能的 OneBot 11 协议实现",
|
||||||
"version": "4.7.27",
|
"version": "4.7.45",
|
||||||
"icon": "./logo.png",
|
"icon": "./logo.png",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
|
@@ -55,6 +55,7 @@
|
|||||||
"ahooks": "^3.8.4",
|
"ahooks": "^3.8.4",
|
||||||
"axios": "^1.7.9",
|
"axios": "^1.7.9",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
|
"crypto-js": "^4.2.0",
|
||||||
"echarts": "^5.5.1",
|
"echarts": "^5.5.1",
|
||||||
"event-source-polyfill": "^1.0.31",
|
"event-source-polyfill": "^1.0.31",
|
||||||
"framer-motion": "^12.0.6",
|
"framer-motion": "^12.0.6",
|
||||||
@@ -88,6 +89,7 @@
|
|||||||
"@eslint/js": "^9.19.0",
|
"@eslint/js": "^9.19.0",
|
||||||
"@react-types/shared": "^3.26.0",
|
"@react-types/shared": "^3.26.0",
|
||||||
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
|
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
|
||||||
|
"@types/crypto-js": "^4.2.2",
|
||||||
"@types/event-source-polyfill": "^1.0.5",
|
"@types/event-source-polyfill": "^1.0.5",
|
||||||
"@types/fabric": "^5.3.9",
|
"@types/fabric": "^5.3.9",
|
||||||
"@types/node": "^22.12.0",
|
"@types/node": "^22.12.0",
|
||||||
|
@@ -3,7 +3,7 @@ import { EventSourcePolyfill } from 'event-source-polyfill'
|
|||||||
import { LogLevel } from '@/const/enum'
|
import { LogLevel } from '@/const/enum'
|
||||||
|
|
||||||
import { serverRequest } from '@/utils/request'
|
import { serverRequest } from '@/utils/request'
|
||||||
|
import CryptoJS from "crypto-js";
|
||||||
export interface Log {
|
export interface Log {
|
||||||
level: LogLevel
|
level: LogLevel
|
||||||
message: string
|
message: string
|
||||||
@@ -17,9 +17,10 @@ export default class WebUIManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static async loginWithToken(token: string) {
|
public static async loginWithToken(token: string) {
|
||||||
|
const sha256 = CryptoJS.SHA256(token + '.napcat').toString();
|
||||||
const { data } = await serverRequest.post<ServerResponse<AuthResponse>>(
|
const { data } = await serverRequest.post<ServerResponse<AuthResponse>>(
|
||||||
'/auth/login',
|
'/auth/login',
|
||||||
{ token }
|
{ hash: sha256 }
|
||||||
)
|
)
|
||||||
return data.data.Credential
|
return data.data.Credential
|
||||||
}
|
}
|
||||||
|
@@ -47,6 +47,22 @@ export default function WebLoginPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 处理全局键盘事件
|
||||||
|
const handleKeyDown = (e: KeyboardEvent) => {
|
||||||
|
if (e.key === 'Enter' && !isLoading) {
|
||||||
|
onSubmit()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
document.addEventListener('keydown', handleKeyDown)
|
||||||
|
|
||||||
|
// 清理函数
|
||||||
|
return () => {
|
||||||
|
document.removeEventListener('keydown', handleKeyDown)
|
||||||
|
}
|
||||||
|
}, [tokenValue, isLoading]) // 依赖项包含用于登录的状态
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (token) {
|
if (token) {
|
||||||
onSubmit()
|
onSubmit()
|
||||||
|
16
package.json
16
package.json
@@ -2,7 +2,7 @@
|
|||||||
"name": "napcat",
|
"name": "napcat",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "4.7.27",
|
"version": "4.7.45",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
|
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
|
||||||
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
|
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
|
||||||
@@ -26,6 +26,7 @@
|
|||||||
"@napneko/nap-proto-core": "^0.0.4",
|
"@napneko/nap-proto-core": "^0.0.4",
|
||||||
"@rollup/plugin-node-resolve": "^16.0.0",
|
"@rollup/plugin-node-resolve": "^16.0.0",
|
||||||
"@rollup/plugin-typescript": "^12.1.2",
|
"@rollup/plugin-typescript": "^12.1.2",
|
||||||
|
"@sinclair/typebox": "^0.34.9",
|
||||||
"@types/cors": "^2.8.17",
|
"@types/cors": "^2.8.17",
|
||||||
"@types/express": "^5.0.0",
|
"@types/express": "^5.0.0",
|
||||||
"@types/multer": "^1.4.12",
|
"@types/multer": "^1.4.12",
|
||||||
@@ -34,12 +35,13 @@
|
|||||||
"@types/qrcode-terminal": "^0.12.2",
|
"@types/qrcode-terminal": "^0.12.2",
|
||||||
"@types/react-color": "^3.0.13",
|
"@types/react-color": "^3.0.13",
|
||||||
"@types/type-is": "^1.6.7",
|
"@types/type-is": "^1.6.7",
|
||||||
|
"@types/wordcloud": "^1.2.2",
|
||||||
"@types/ws": "^8.5.12",
|
"@types/ws": "^8.5.12",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.3.0",
|
"@typescript-eslint/eslint-plugin": "^8.3.0",
|
||||||
"@typescript-eslint/parser": "^8.3.0",
|
"@typescript-eslint/parser": "^8.3.0",
|
||||||
|
"ajv": "^8.13.0",
|
||||||
"async-mutex": "^0.5.0",
|
"async-mutex": "^0.5.0",
|
||||||
"commander": "^13.0.0",
|
"commander": "^13.0.0",
|
||||||
"compressing": "^1.10.1",
|
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"esbuild": "0.25.0",
|
"esbuild": "0.25.0",
|
||||||
"eslint": "^9.14.0",
|
"eslint": "^9.14.0",
|
||||||
@@ -52,18 +54,22 @@
|
|||||||
"image-size": "^1.1.1",
|
"image-size": "^1.1.1",
|
||||||
"json5": "^2.2.3",
|
"json5": "^2.2.3",
|
||||||
"multer": "^1.4.5-lts.1",
|
"multer": "^1.4.5-lts.1",
|
||||||
"napcat.protobuf": "^1.1.4",
|
|
||||||
"typescript": "^5.3.3",
|
"typescript": "^5.3.3",
|
||||||
"typescript-eslint": "^8.13.0",
|
"typescript-eslint": "^8.13.0",
|
||||||
"vite": "^6.0.1",
|
"vite": "^6.0.1",
|
||||||
"vite-plugin-cp": "^6.0.0",
|
"vite-plugin-cp": "^6.0.0",
|
||||||
"vite-tsconfig-paths": "^5.1.0",
|
"vite-tsconfig-paths": "^5.1.0",
|
||||||
|
"napcat.protobuf": "^1.1.4",
|
||||||
"winston": "^3.17.0",
|
"winston": "^3.17.0",
|
||||||
"zod": "^3.24.2"
|
"compressing": "^1.10.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@napi-rs/canvas": "^0.1.67",
|
||||||
|
"@node-rs/jieba": "^2.0.1",
|
||||||
"express": "^5.0.0",
|
"express": "^5.0.0",
|
||||||
|
"napcat.protobuf": "^1.1.2",
|
||||||
"silk-wasm": "^3.6.1",
|
"silk-wasm": "^3.6.1",
|
||||||
|
"wordcloud": "^1.2.3",
|
||||||
"ws": "^8.18.0"
|
"ws": "^8.18.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,14 +0,0 @@
|
|||||||
import { z } from 'zod';
|
|
||||||
const boolean = () => z.preprocess(
|
|
||||||
val => typeof val === 'string' && (val.toLowerCase() === 'false' || val === '0') ? false : Boolean(val),
|
|
||||||
z.boolean()
|
|
||||||
);
|
|
||||||
const number = () => z.preprocess(
|
|
||||||
val => typeof val !== 'number' ? Number(val) : val,
|
|
||||||
z.number()
|
|
||||||
);
|
|
||||||
const string = () => z.preprocess(
|
|
||||||
val => typeof val !== 'string' ? String(val) : val,
|
|
||||||
z.string()
|
|
||||||
);
|
|
||||||
export const coerce = { boolean, number, string };
|
|
@@ -2,20 +2,22 @@ import path from 'node:path';
|
|||||||
import fs from 'node:fs';
|
import fs from 'node:fs';
|
||||||
import type { NapCatCore } from '@/core';
|
import type { NapCatCore } from '@/core';
|
||||||
import json5 from 'json5';
|
import json5 from 'json5';
|
||||||
import { z } from 'zod';
|
import Ajv, { AnySchema, ValidateFunction } from 'ajv';
|
||||||
|
|
||||||
export abstract class ConfigBase<T> {
|
export abstract class ConfigBase<T> {
|
||||||
name: string;
|
name: string;
|
||||||
core: NapCatCore;
|
core: NapCatCore;
|
||||||
configPath: string;
|
configPath: string;
|
||||||
configData: T = {} as T;
|
configData: T = {} as T;
|
||||||
schema: z.ZodType<T>;
|
ajv: Ajv;
|
||||||
|
validate: ValidateFunction<T>;
|
||||||
|
|
||||||
protected constructor(name: string, core: NapCatCore, configPath: string, schema: z.ZodType<T>) {
|
protected constructor(name: string, core: NapCatCore, configPath: string, ConfigSchema: AnySchema) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.core = core;
|
this.core = core;
|
||||||
this.configPath = configPath;
|
this.configPath = configPath;
|
||||||
this.schema = schema;
|
this.ajv = new Ajv({ useDefaults: true, coerceTypes: true });
|
||||||
|
this.validate = this.ajv.compile<T>(ConfigSchema);
|
||||||
fs.mkdirSync(this.configPath, { recursive: true });
|
fs.mkdirSync(this.configPath, { recursive: true });
|
||||||
this.read();
|
this.read();
|
||||||
}
|
}
|
||||||
@@ -40,16 +42,11 @@ export abstract class ConfigBase<T> {
|
|||||||
|
|
||||||
private loadConfig(configPath: string): T {
|
private loadConfig(configPath: string): T {
|
||||||
try {
|
try {
|
||||||
let configData = json5.parse(fs.readFileSync(configPath, 'utf-8'));
|
let newConfigData = json5.parse(fs.readFileSync(configPath, 'utf-8'));
|
||||||
const result = this.schema.safeParse(configData);
|
this.validate(newConfigData);
|
||||||
|
this.configData = newConfigData;
|
||||||
if (result.success) {
|
this.core.context.logger.logDebug(`[Core] [Config] 配置文件${configPath}加载`, this.configData);
|
||||||
this.configData = result.data;
|
return this.configData;
|
||||||
this.core.context.logger.logDebug(`[Core] [Config] 配置文件${configPath}加载`, this.configData);
|
|
||||||
return this.configData;
|
|
||||||
} else {
|
|
||||||
throw new Error(`配置文件验证失败: ${result.error.message}`);
|
|
||||||
}
|
|
||||||
} catch (e: unknown) {
|
} catch (e: unknown) {
|
||||||
this.handleError(e, '读取配置文件时发生错误');
|
this.handleError(e, '读取配置文件时发生错误');
|
||||||
return {} as T;
|
return {} as T;
|
||||||
@@ -58,14 +55,10 @@ export abstract class ConfigBase<T> {
|
|||||||
|
|
||||||
save(newConfigData: T = this.configData): void {
|
save(newConfigData: T = this.configData): void {
|
||||||
const configPath = this.getConfigPath(this.core.selfInfo.uin);
|
const configPath = this.getConfigPath(this.core.selfInfo.uin);
|
||||||
|
this.validate(newConfigData);
|
||||||
|
this.configData = newConfigData;
|
||||||
try {
|
try {
|
||||||
const result = this.schema.safeParse(newConfigData);
|
fs.writeFileSync(configPath, JSON.stringify(this.configData, null, 2));
|
||||||
if (result.success) {
|
|
||||||
this.configData = result.data;
|
|
||||||
fs.writeFileSync(configPath, JSON.stringify(this.configData, null, 2));
|
|
||||||
} else {
|
|
||||||
throw new Error(`配置文件验证失败: ${result.error.message}`);
|
|
||||||
}
|
|
||||||
} catch (e: unknown) {
|
} catch (e: unknown) {
|
||||||
this.handleError(e, `保存配置文件 ${configPath} 时发生错误:`);
|
this.handleError(e, `保存配置文件 ${configPath} 时发生错误:`);
|
||||||
}
|
}
|
||||||
@@ -74,8 +67,6 @@ export abstract class ConfigBase<T> {
|
|||||||
private handleError(e: unknown, message: string): void {
|
private handleError(e: unknown, message: string): void {
|
||||||
if (e instanceof SyntaxError) {
|
if (e instanceof SyntaxError) {
|
||||||
this.core.context.logger.logError('[Core] [Config] 操作配置文件格式错误,请检查配置文件:', e.message);
|
this.core.context.logger.logError('[Core] [Config] 操作配置文件格式错误,请检查配置文件:', e.message);
|
||||||
} else if (e instanceof z.ZodError) {
|
|
||||||
this.core.context.logger.logError('[Core] [Config] 配置文件验证错误:', e.message);
|
|
||||||
} else {
|
} else {
|
||||||
this.core.context.logger.logError(`[Core] [Config] ${message}:`, (e as Error).message);
|
this.core.context.logger.logError(`[Core] [Config] ${message}:`, (e as Error).message);
|
||||||
}
|
}
|
||||||
|
@@ -281,28 +281,72 @@ export async function downloadFFmpeg(
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检查系统PATH环境变量中是否存在指定可执行文件
|
||||||
|
* @param executable 可执行文件名
|
||||||
|
* @returns 如果找到返回完整路径,否则返回null
|
||||||
|
*/
|
||||||
|
function findExecutableInPath(executable: string): string | null {
|
||||||
|
// 仅适用于Windows系统
|
||||||
|
if (os.platform() !== 'win32') return null;
|
||||||
|
|
||||||
|
// 获取PATH环境变量
|
||||||
|
const pathEnv = process.env['PATH'] || '';
|
||||||
|
const pathDirs = pathEnv.split(';');
|
||||||
|
|
||||||
|
// 检查每个目录
|
||||||
|
for (const dir of pathDirs) {
|
||||||
|
if (!dir) continue;
|
||||||
|
try {
|
||||||
|
const filePath = path.join(dir, executable);
|
||||||
|
if (fs.existsSync(filePath)) {
|
||||||
|
return filePath;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
export async function downloadFFmpegIfNotExists(log: LogWrapper) {
|
export async function downloadFFmpegIfNotExists(log: LogWrapper) {
|
||||||
// 仅限Windows
|
// 仅限Windows
|
||||||
if (os.platform() !== 'win32') {
|
if (os.platform() !== 'win32') {
|
||||||
return {
|
return {
|
||||||
path: null,
|
path: null,
|
||||||
isExist: false
|
reset: false
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
const ffmpegInPath = findExecutableInPath('ffmpeg.exe');
|
||||||
|
const ffprobeInPath = findExecutableInPath('ffprobe.exe');
|
||||||
|
|
||||||
|
if (ffmpegInPath && ffprobeInPath) {
|
||||||
|
const ffmpegDir = path.dirname(ffmpegInPath);
|
||||||
|
return {
|
||||||
|
path: ffmpegDir,
|
||||||
|
reset: true
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果环境变量中没有,检查项目目录中是否存在
|
||||||
const currentPath = path.dirname(fileURLToPath(import.meta.url));
|
const currentPath = path.dirname(fileURLToPath(import.meta.url));
|
||||||
const ffmpeg_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffmpeg.exe'));
|
const ffmpeg_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffmpeg.exe'));
|
||||||
const ffprobe_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffprobe.exe'));
|
const ffprobe_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffprobe.exe'));
|
||||||
|
|
||||||
if (!ffmpeg_exist || !ffprobe_exist) {
|
if (!ffmpeg_exist || !ffprobe_exist) {
|
||||||
await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
|
await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
|
||||||
log.log(`[Ffmpeg] [Download] ${percentage}% - ${message}`);
|
log.log(`[FFmpeg] [Download] ${percentage}% - ${message}`);
|
||||||
});
|
});
|
||||||
return {
|
return {
|
||||||
path: path.join(currentPath, 'ffmpeg'),
|
path: path.join(currentPath, 'ffmpeg'),
|
||||||
isExist: false
|
reset: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
path: path.join(currentPath, 'ffmpeg'),
|
path: path.join(currentPath, 'ffmpeg'),
|
||||||
isExist: true
|
reset: true
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -7,6 +7,7 @@ import { fileTypeFromFile } from 'file-type';
|
|||||||
import imageSize from 'image-size';
|
import imageSize from 'image-size';
|
||||||
import { fileURLToPath } from 'node:url';
|
import { fileURLToPath } from 'node:url';
|
||||||
import { platform } from 'node:os';
|
import { platform } from 'node:os';
|
||||||
|
import { LogWrapper } from './log';
|
||||||
const currentPath = dirname(fileURLToPath(import.meta.url));
|
const currentPath = dirname(fileURLToPath(import.meta.url));
|
||||||
const execFileAsync = promisify(execFile);
|
const execFileAsync = promisify(execFile);
|
||||||
const getFFmpegPath = (tool: string): string => {
|
const getFFmpegPath = (tool: string): string => {
|
||||||
@@ -19,16 +20,14 @@ const getFFmpegPath = (tool: string): string => {
|
|||||||
};
|
};
|
||||||
export let FFMPEG_CMD = getFFmpegPath('ffmpeg');
|
export let FFMPEG_CMD = getFFmpegPath('ffmpeg');
|
||||||
export let FFPROBE_CMD = getFFmpegPath('ffprobe');
|
export let FFPROBE_CMD = getFFmpegPath('ffprobe');
|
||||||
console.log('[Info] ffmpeg:', FFMPEG_CMD);
|
|
||||||
console.log('[Info] ffprobe:', FFPROBE_CMD);
|
|
||||||
export class FFmpegService {
|
export class FFmpegService {
|
||||||
// 确保目标目录存在
|
// 确保目标目录存在
|
||||||
public static setFfmpegPath(ffmpegPath: string): void {
|
public static setFfmpegPath(ffmpegPath: string,logger:LogWrapper): void {
|
||||||
if (platform() === 'win32') {
|
if (platform() === 'win32') {
|
||||||
FFMPEG_CMD = path.join(ffmpegPath, 'ffmpeg.exe');
|
FFMPEG_CMD = path.join(ffmpegPath, 'ffmpeg.exe');
|
||||||
FFPROBE_CMD = path.join(ffmpegPath, 'ffprobe.exe');
|
FFPROBE_CMD = path.join(ffmpegPath, 'ffprobe.exe');
|
||||||
console.log('[Info] ffmpeg:', FFMPEG_CMD);
|
logger.log('[Check] ffmpeg:', FFMPEG_CMD);
|
||||||
console.log('[Info] ffprobe:', FFPROBE_CMD);
|
logger.log('[Check] ffprobe:', FFPROBE_CMD);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private static ensureDirExists(filePath: string): void {
|
private static ensureDirExists(filePath: string): void {
|
||||||
|
@@ -115,7 +115,7 @@ async function tryDownload(options: string | HttpDownloadOptions, useReferer: bo
|
|||||||
if (useReferer && !headers['Referer']) {
|
if (useReferer && !headers['Referer']) {
|
||||||
headers['Referer'] = url;
|
headers['Referer'] = url;
|
||||||
}
|
}
|
||||||
const fetchRes = await fetch(url, { headers }).catch((err) => {
|
const fetchRes = await fetch(url, { headers, redirect: 'follow' }).catch((err) => {
|
||||||
if (err.cause) {
|
if (err.cause) {
|
||||||
throw err.cause;
|
throw err.cause;
|
||||||
}
|
}
|
||||||
@@ -145,8 +145,8 @@ export enum FileUriType {
|
|||||||
|
|
||||||
export async function checkUriType(Uri: string) {
|
export async function checkUriType(Uri: string) {
|
||||||
const LocalFileRet = await solveProblem((uri: string) => {
|
const LocalFileRet = await solveProblem((uri: string) => {
|
||||||
if (fs.existsSync(uri)) {
|
if (fs.existsSync(path.normalize(uri))) {
|
||||||
return { Uri: uri, Type: FileUriType.Local };
|
return { Uri: path.normalize(uri), Type: FileUriType.Local };
|
||||||
}
|
}
|
||||||
return undefined;
|
return undefined;
|
||||||
}, Uri);
|
}, Uri);
|
||||||
@@ -182,28 +182,28 @@ export async function uriToLocalFile(dir: string, uri: string, filename: string
|
|||||||
const filePath = path.join(dir, filename);
|
const filePath = path.join(dir, filename);
|
||||||
|
|
||||||
switch (UriType) {
|
switch (UriType) {
|
||||||
case FileUriType.Local: {
|
case FileUriType.Local: {
|
||||||
const fileExt = path.extname(HandledUri);
|
const fileExt = path.extname(HandledUri);
|
||||||
const localFileName = path.basename(HandledUri, fileExt) + fileExt;
|
const localFileName = path.basename(HandledUri, fileExt) + fileExt;
|
||||||
const tempFilePath = path.join(dir, filename + fileExt);
|
const tempFilePath = path.join(dir, filename + fileExt);
|
||||||
fs.copyFileSync(HandledUri, tempFilePath);
|
fs.copyFileSync(HandledUri, tempFilePath);
|
||||||
return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
|
return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
|
||||||
}
|
}
|
||||||
|
|
||||||
case FileUriType.Remote: {
|
case FileUriType.Remote: {
|
||||||
const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
|
const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
|
||||||
fs.writeFileSync(filePath, buffer);
|
fs.writeFileSync(filePath, buffer);
|
||||||
return { success: true, errMsg: '', fileName: filename, path: filePath };
|
return { success: true, errMsg: '', fileName: filename, path: filePath };
|
||||||
}
|
}
|
||||||
|
|
||||||
case FileUriType.Base64: {
|
case FileUriType.Base64: {
|
||||||
const base64 = HandledUri.replace(/^base64:\/\//, '');
|
const base64 = HandledUri.replace(/^base64:\/\//, '');
|
||||||
const base64Buffer = Buffer.from(base64, 'base64');
|
const base64Buffer = Buffer.from(base64, 'base64');
|
||||||
fs.writeFileSync(filePath, base64Buffer);
|
fs.writeFileSync(filePath, base64Buffer);
|
||||||
return { success: true, errMsg: '', fileName: filename, path: filePath };
|
return { success: true, errMsg: '', fileName: filename, path: filePath };
|
||||||
}
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
|
return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -109,7 +109,6 @@ export class RequestUtil {
|
|||||||
req.end();
|
req.end();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// 请求返回都是原始内容
|
// 请求返回都是原始内容
|
||||||
static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string } = {}) {
|
static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string } = {}) {
|
||||||
return this.HttpGetJson<string>(url, method, data, headers, false, false);
|
return this.HttpGetJson<string>(url, method, data, headers, false, false);
|
||||||
|
@@ -1 +1 @@
|
|||||||
export const napCatVersion = '4.7.27';
|
export const napCatVersion = '4.7.45';
|
||||||
|
@@ -9,7 +9,7 @@ export async function runTask<T, R>(workerScript: string, taskData: T): Promise<
|
|||||||
console.error('Worker Log--->:', (result as { log: string }).log);
|
console.error('Worker Log--->:', (result as { log: string }).log);
|
||||||
}
|
}
|
||||||
if ((result as any)?.error) {
|
if ((result as any)?.error) {
|
||||||
reject(new Error('Worker error: ' + (result as { error: string }).error));
|
reject(new Error("Worker error: " + (result as { error: string }).error));
|
||||||
}
|
}
|
||||||
resolve(result);
|
resolve(result);
|
||||||
});
|
});
|
||||||
|
@@ -44,7 +44,7 @@ export class NTQQFileApi {
|
|||||||
'https://secret-service.bietiaop.com/rkeys',
|
'https://secret-service.bietiaop.com/rkeys',
|
||||||
'http://ss.xingzhige.com/music_card/rkey',
|
'http://ss.xingzhige.com/music_card/rkey',
|
||||||
],
|
],
|
||||||
this.context.logger
|
this.context.logger
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -308,18 +308,18 @@ export class NTQQFileApi {
|
|||||||
element.elementType === ElementType.FILE
|
element.elementType === ElementType.FILE
|
||||||
) {
|
) {
|
||||||
switch (element.elementType) {
|
switch (element.elementType) {
|
||||||
case ElementType.PIC:
|
case ElementType.PIC:
|
||||||
element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
|
element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
|
||||||
break;
|
break;
|
||||||
case ElementType.VIDEO:
|
case ElementType.VIDEO:
|
||||||
element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
|
element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
|
||||||
break;
|
break;
|
||||||
case ElementType.PTT:
|
case ElementType.PTT:
|
||||||
element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
|
element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
|
||||||
break;
|
break;
|
||||||
case ElementType.FILE:
|
case ElementType.FILE:
|
||||||
element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
|
element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elementIndex++;
|
elementIndex++;
|
||||||
}
|
}
|
||||||
@@ -345,6 +345,7 @@ export class NTQQFileApi {
|
|||||||
'NodeIKernelMsgListener/onRichMediaDownloadComplete',
|
'NodeIKernelMsgListener/onRichMediaDownloadComplete',
|
||||||
[{
|
[{
|
||||||
fileModelId: '0',
|
fileModelId: '0',
|
||||||
|
downSourceType: 0,
|
||||||
downloadSourceType: 0,
|
downloadSourceType: 0,
|
||||||
triggerType: 1,
|
triggerType: 1,
|
||||||
msgId: msgId,
|
msgId: msgId,
|
||||||
|
@@ -86,4 +86,31 @@ export class NTQQFriendApi {
|
|||||||
accept,
|
accept,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
async handleDoubtFriendRequest(friendUid: string, str1: string = '', str2: string = '') {
|
||||||
|
this.context.session.getBuddyService().approvalDoubtBuddyReq(friendUid, str1, str2);
|
||||||
|
}
|
||||||
|
async getDoubtFriendRequest(count: number) {
|
||||||
|
let date = Date.now().toString();
|
||||||
|
const [, ret] = await this.core.eventWrapper.callNormalEventV2(
|
||||||
|
'NodeIKernelBuddyService/getDoubtBuddyReq',
|
||||||
|
'NodeIKernelBuddyListener/onDoubtBuddyReqChange',
|
||||||
|
[date, count, ''],
|
||||||
|
() => true,
|
||||||
|
(data) => data.reqId === date
|
||||||
|
);
|
||||||
|
let requests = Promise.all(ret.doubtList.map(async (item) => {
|
||||||
|
return {
|
||||||
|
flag: item.uid, //注意强制String 非isNumeric 不遵守则不符合设计
|
||||||
|
uin: await this.core.apis.UserApi.getUinByUidV2(item.uid) ?? 0,// 信息字段
|
||||||
|
nick: item.nick, // 信息字段 这个不是nickname 可能是来源的群内的昵称
|
||||||
|
source: item.source, // 信息字段
|
||||||
|
reason: item.reason, // 信息字段
|
||||||
|
msg: item.msg, // 信息字段
|
||||||
|
group_code: item.groupCode, // 信息字段
|
||||||
|
time: item.reqTime, // 信息字段
|
||||||
|
type: 'doubt' //保留字段
|
||||||
|
};
|
||||||
|
}))
|
||||||
|
return requests;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -17,6 +17,24 @@ export class NTQQMsgApi {
|
|||||||
return this.context.session.getMsgService().clickInlineKeyboardButton(...params);
|
return this.context.session.getMsgService().clickInlineKeyboardButton(...params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async searchMsgWithKeywords(keyWords: string[], param: Peer & { searchFields: number, pageLimit: number }) {
|
||||||
|
let outputSearchId = 0;
|
||||||
|
return this.core.eventWrapper.callNormalEventV2(
|
||||||
|
'NodeIKernelSearchService/searchMsgWithKeywords',
|
||||||
|
'NodeIKernelSearchListener/onSearchMsgKeywordsResult',
|
||||||
|
[keyWords, param],
|
||||||
|
(searchId) => {
|
||||||
|
outputSearchId = searchId;
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
(event) => {
|
||||||
|
return event.searchId == outputSearchId;
|
||||||
|
},
|
||||||
|
1,
|
||||||
|
5000
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
getMsgByClientSeqAndTime(peer: Peer, replyMsgClientSeq: string, replyMsgTime: string) {
|
getMsgByClientSeqAndTime(peer: Peer, replyMsgClientSeq: string, replyMsgTime: string) {
|
||||||
// https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType 可以用过特殊方式拉取
|
// https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType 可以用过特殊方式拉取
|
||||||
return this.context.session.getMsgService().getMsgByClientSeqAndTime(peer, replyMsgClientSeq, replyMsgTime);
|
return this.context.session.getMsgService().getMsgByClientSeqAndTime(peer, replyMsgClientSeq, replyMsgTime);
|
||||||
@@ -137,7 +155,6 @@ export class NTQQMsgApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async queryFirstMsgBySender(peer: Peer, SendersUid: string[]) {
|
async queryFirstMsgBySender(peer: Peer, SendersUid: string[]) {
|
||||||
console.log(peer, SendersUid);
|
|
||||||
return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
|
return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
|
||||||
chatInfo: peer,
|
chatInfo: peer,
|
||||||
filterMsgType: [],
|
filterMsgType: [],
|
||||||
@@ -149,7 +166,30 @@ export class NTQQMsgApi {
|
|||||||
pageLimit: 20000,
|
pageLimit: 20000,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
async queryFirstMsgBySenderTime(peer: Peer, SendersUid: string[], filterMsgFromTime: string, filterMsgToTime: string) {
|
||||||
|
return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
|
||||||
|
chatInfo: peer,
|
||||||
|
filterMsgType: [],
|
||||||
|
filterSendersUid: SendersUid,
|
||||||
|
filterMsgToTime: filterMsgToTime,
|
||||||
|
filterMsgFromTime: filterMsgFromTime,
|
||||||
|
isReverseOrder: true,
|
||||||
|
isIncludeCurrent: true,
|
||||||
|
pageLimit: 20000,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
async queryFirstMsgByTime(peer: Peer, filterMsgFromTime: string, filterMsgToTime: string) {
|
||||||
|
return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
|
||||||
|
chatInfo: peer,
|
||||||
|
filterMsgType: [],
|
||||||
|
filterSendersUid: [],
|
||||||
|
filterMsgToTime: filterMsgToTime,
|
||||||
|
filterMsgFromTime: filterMsgFromTime,
|
||||||
|
isReverseOrder: true,
|
||||||
|
isIncludeCurrent: true,
|
||||||
|
pageLimit: 20000,
|
||||||
|
});
|
||||||
|
}
|
||||||
async setMsgRead(peer: Peer) {
|
async setMsgRead(peer: Peer) {
|
||||||
return this.context.session.getMsgService().setMsgRead(peer);
|
return this.context.session.getMsgService().setMsgRead(peer);
|
||||||
}
|
}
|
||||||
|
316
src/core/external/appid.json
vendored
316
src/core/external/appid.json
vendored
@@ -1,4 +1,76 @@
|
|||||||
{
|
{
|
||||||
|
"3.1.2-13107": {
|
||||||
|
"appid": 537146866,
|
||||||
|
"qua": "V1_LNX_NQ_3.1.2-13107_RDM_B"
|
||||||
|
},
|
||||||
|
"3.2.10-25765": {
|
||||||
|
"appid": 537234773,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.10_25765_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.12-26702": {
|
||||||
|
"appid": 537237950,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.12_26702_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.12-26740": {
|
||||||
|
"appid": 537237950,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.12_26740_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.12-26909": {
|
||||||
|
"appid": 537237923,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.12_26909_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.12-27187": {
|
||||||
|
"appid": 537240645,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.12_27187_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.12-27206": {
|
||||||
|
"appid": 537240645,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.12_27206_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.12-27254": {
|
||||||
|
"appid": 537240795,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.12_27254_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.11-24815": {
|
||||||
|
"appid": 537226656,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.11_24815_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.12-25493": {
|
||||||
|
"appid": 537231759,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.12_25493_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.12-25765": {
|
||||||
|
"appid": 537234702,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.12_25765_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.12-26299": {
|
||||||
|
"appid": 537234826,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.12_26299_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.12-26339": {
|
||||||
|
"appid": 537234826,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.12_26339_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.12-26466": {
|
||||||
|
"appid": 537234826,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.12_26466_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.15-26702": {
|
||||||
|
"appid": 537237765,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.15_26702_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.15-26740": {
|
||||||
|
"appid": 537237765,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.15_26740_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.12-27556": {
|
||||||
|
"appid": 537243600,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.12_27556_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.12-27597": {
|
||||||
|
"appid": 537243600,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.12_27597_GW_B"
|
||||||
|
},
|
||||||
"9.9.15-28060": {
|
"9.9.15-28060": {
|
||||||
"appid": 537246092,
|
"appid": 537246092,
|
||||||
"qua": "V1_WIN_NQ_9.9.15_28060_GW_B"
|
"qua": "V1_WIN_NQ_9.9.15_28060_GW_B"
|
||||||
@@ -246,5 +318,249 @@
|
|||||||
"9.9.19-34362": {
|
"9.9.19-34362": {
|
||||||
"appid": 537279260,
|
"appid": 537279260,
|
||||||
"qua": "V1_WIN_NQ_9.9.19_34362_GW_B"
|
"qua": "V1_WIN_NQ_9.9.19_34362_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.17-34362": {
|
||||||
|
"appid": 537279296,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.17_34362_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.19-34467": {
|
||||||
|
"appid": 537282256,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.19_34467_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.17-34467": {
|
||||||
|
"appid": 537282292,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.17_34467_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.19-34566": {
|
||||||
|
"appid": 537282307,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.19_34566_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.17-34566": {
|
||||||
|
"appid": 537282343,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.17_34566_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.17-34606": {
|
||||||
|
"appid": 537282343,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.17_34606_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.19-34606": {
|
||||||
|
"appid": 537282307,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.19_34606_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.19-34740": {
|
||||||
|
"appid": 537290691,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.19_34740_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.17-34740": {
|
||||||
|
"appid": 537290727,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.17_34740_GW_B"
|
||||||
|
},
|
||||||
|
"8.9.50-Android": {
|
||||||
|
"appid": 537155551,
|
||||||
|
"qua": "V1_AND_SQ_8.9.50_3898_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.1-Watch": {
|
||||||
|
"appid": 537214131,
|
||||||
|
"qua": "V1_AND_SQ_8.9.68_0_RDM_B"
|
||||||
|
},
|
||||||
|
"6.8.2-21241": {
|
||||||
|
"appid": 537128930,
|
||||||
|
"qua": "V1_IOS_SQ_6.8.2_21241_YYB_D"
|
||||||
|
},
|
||||||
|
"8.8.88-Android": {
|
||||||
|
"appid": 537118044,
|
||||||
|
"qua": "V1_IOS_SQ_8.8.88_2770_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.90-Android": {
|
||||||
|
"appid": 537185007,
|
||||||
|
"qua": "V1_AND_SQ_8.9.90_4938_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.33-Android": {
|
||||||
|
"appid": 537151682,
|
||||||
|
"qua": "V1_AND_SQ_8.9.33_3898_YYB_D"
|
||||||
|
},
|
||||||
|
"3.5.1-Tim": {
|
||||||
|
"appid": 537150355,
|
||||||
|
"qua": "V1_AND_SQ_8.3.9_351_TIM_D"
|
||||||
|
},
|
||||||
|
"8.9.58-Android": {
|
||||||
|
"appid": 537163194,
|
||||||
|
"qua": "V1_AND_SQ_8.9.58_4108_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.63-Android": {
|
||||||
|
"appid": 537163194,
|
||||||
|
"qua": "V1_AND_SQ_8.9.63_4194_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.68-Android": {
|
||||||
|
"appid": 537168313,
|
||||||
|
"qua": "V1_AND_SQ_8.9.68_4264_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.70-Android": {
|
||||||
|
"appid": 537169928,
|
||||||
|
"qua": "V1_AND_SQ_8.9.70_4330_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.71-Android": {
|
||||||
|
"appid": 537170024,
|
||||||
|
"qua": "V1_AND_SQ_8.9.71_4332_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.73-Android": {
|
||||||
|
"appid": 537171689,
|
||||||
|
"qua": "V1_AND_SQ_8.9.73_4416_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.75-Android": {
|
||||||
|
"appid": 537173381,
|
||||||
|
"qua": "V1_AND_SQ_8.9.75_4482_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.76-Android": {
|
||||||
|
"appid": 537173477,
|
||||||
|
"qua": "V1_AND_SQ_8.9.76_4484_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.78-Android": {
|
||||||
|
"appid": 537175315,
|
||||||
|
"qua": "V1_AND_SQ_8.9.78_4548_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.80-Android": {
|
||||||
|
"appid": 537176863,
|
||||||
|
"qua": "V1_AND_SQ_8.9.80_4614_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.83-Android": {
|
||||||
|
"appid": 537178646,
|
||||||
|
"qua": "V1_AND_SQ_8.9.83_4680_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.85-Android": {
|
||||||
|
"appid": 537180568,
|
||||||
|
"qua": "V1_AND_SQ_8.9.85_4766_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.88-Android": {
|
||||||
|
"appid": 537182769,
|
||||||
|
"qua": "V1_AND_SQ_8.9.88_4852_YYB_D"
|
||||||
|
},
|
||||||
|
"8.9.93-Android": {
|
||||||
|
"appid": 537187398,
|
||||||
|
"qua": "V1_AND_SQ_8.9.93_5028_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.0-Android": {
|
||||||
|
"appid": 537194351,
|
||||||
|
"qua": "V1_AND_SQ_9.0.0_5282_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.8-Android": {
|
||||||
|
"appid": 537200218,
|
||||||
|
"qua": "V1_AND_SQ_9.0.8_5540_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.17-Android": {
|
||||||
|
"appid": 537204056,
|
||||||
|
"qua": "V1_AND_SQ_9.0.17_5712_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.25-Android": {
|
||||||
|
"appid": 537210084,
|
||||||
|
"qua": "V1_AND_SQ_9.0.25_5942_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.35-Android": {
|
||||||
|
"appid": 537215475,
|
||||||
|
"qua": "V1_AND_SQ_9.0.35_6150_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.50-Android": {
|
||||||
|
"appid": 537217916,
|
||||||
|
"qua": "V1_AND_SQ_9.0.50_6258_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.56-Android": {
|
||||||
|
"appid": 537220323,
|
||||||
|
"qua": "V1_AND_SQ_9.0.56_6372_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.60-Android": {
|
||||||
|
"appid": 537222797,
|
||||||
|
"qua": "V1_AND_SQ_9.0.60_6478_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.65-Android": {
|
||||||
|
"appid": 537225139,
|
||||||
|
"qua": "V1_AND_SQ_9.0.65_6588_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.70-Android": {
|
||||||
|
"appid": 537228487,
|
||||||
|
"qua": "V1_AND_SQ_9.0.70_6698_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.81-Android": {
|
||||||
|
"appid": 537233527,
|
||||||
|
"qua": "V1_AND_SQ_9.0.81_6922_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.85-Android": {
|
||||||
|
"appid": 537236316,
|
||||||
|
"qua": "V1_AND_SQ_9.0.85_7068_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.90-Android":{
|
||||||
|
"appid": 537239255,
|
||||||
|
"qua": "V1_AND_SQ_9.0.90_7218_YYB_D"
|
||||||
|
},
|
||||||
|
"9.0.95-Android": {
|
||||||
|
"appid": 537242075,
|
||||||
|
"qua": "V1_AND_SQ_9.0.95_7368_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.0-Android": {
|
||||||
|
"appid": 537244893,
|
||||||
|
"qua": "V1_AND_SQ_9.1.0_7518_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.20-Android": {
|
||||||
|
"appid": 537257414,
|
||||||
|
"qua": "V1_AND_SQ_9.1.20_8198_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.25-Android": {
|
||||||
|
"appid": 537260030,
|
||||||
|
"qua": "V1_AND_SQ_9.1.25_8368_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.67-Android": {
|
||||||
|
"appid": 537284101,
|
||||||
|
"qua": "V1_AND_SQ_9.1.67_9728_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.70-Android": {
|
||||||
|
"appid": 537285947,
|
||||||
|
"qua": "V1_AND_SQ_9.1.70_9898_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.65-Android": {
|
||||||
|
"appid": 537278302,
|
||||||
|
"qua": "V1_AND_SQ_9.1.65_9558_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.60-Android": {
|
||||||
|
"appid": 537275636,
|
||||||
|
"qua": "V1_AND_SQ_9.1.60_9388_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.55-Android": {
|
||||||
|
"appid": 537272835,
|
||||||
|
"qua": "V1_AND_SQ_9.1.55_9218_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.52-Android": {
|
||||||
|
"appid": 537270265,
|
||||||
|
"qua": "V1_AND_SQ_9.1.52_9054_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.50-Android": {
|
||||||
|
"appid": 537270031,
|
||||||
|
"qua": "V1_AND_SQ_9.1.50_9048_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.5-Android": {
|
||||||
|
"appid": 537247779,
|
||||||
|
"qua": "V1_AND_SQ_9.1.5_7688_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.35-Android": {
|
||||||
|
"appid": 537265576,
|
||||||
|
"qua": "V1_AND_SQ_9.1.35_8708_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.31-Android": {
|
||||||
|
"appid": 537262715,
|
||||||
|
"qua": "V1_AND_SQ_9.1.31_8542_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.30-Android": {
|
||||||
|
"appid": 537262559,
|
||||||
|
"qua": "V1_AND_SQ_9.1.30_8538_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.16-Android": {
|
||||||
|
"appid": 537254305,
|
||||||
|
"qua": "V1_AND_SQ_9.1.16_8032_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.15-Android": {
|
||||||
|
"appid": 537254149,
|
||||||
|
"qua": "V1_AND_SQ_9.1.15_8028_YYB_D"
|
||||||
|
},
|
||||||
|
"9.1.10-Android": {
|
||||||
|
"appid": 537251380,
|
||||||
|
"qua": "V1_AND_SQ_9.1.10_7858_YYB_D"
|
||||||
}
|
}
|
||||||
}
|
}
|
26
src/core/external/offset.json
vendored
26
src/core/external/offset.json
vendored
@@ -327,8 +327,32 @@
|
|||||||
"send": "770CDC0",
|
"send": "770CDC0",
|
||||||
"recv": "77106F0"
|
"recv": "77106F0"
|
||||||
},
|
},
|
||||||
"9.9.19-34362-x64":{
|
"9.9.19-34362-x64": {
|
||||||
"send": "3BD80D0",
|
"send": "3BD80D0",
|
||||||
"recv": "3BDC8D0"
|
"recv": "3BDC8D0"
|
||||||
|
},
|
||||||
|
"9.9.19-34467-x64": {
|
||||||
|
"send": "3BD8690",
|
||||||
|
"recv": "3BDCE90"
|
||||||
|
},
|
||||||
|
"9.9.19-34566-x64": {
|
||||||
|
"send": "3BDA110",
|
||||||
|
"recv": "3BDE910"
|
||||||
|
},
|
||||||
|
"9.9.19-34606-x64": {
|
||||||
|
"send": "3BDA110",
|
||||||
|
"recv": "3BDE910"
|
||||||
|
},
|
||||||
|
"3.2.17-34606-x64": {
|
||||||
|
"send": "AD7DC60",
|
||||||
|
"recv": "AD81680"
|
||||||
|
},
|
||||||
|
"3.2.17-34606-arm64": {
|
||||||
|
"send": "7711270",
|
||||||
|
"recv": "7714BA0"
|
||||||
|
},
|
||||||
|
"9.9.19-34740-x64": {
|
||||||
|
"send": "3BDD8D0",
|
||||||
|
"recv": "3BE20D0"
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -1,22 +1,22 @@
|
|||||||
import { ConfigBase } from '@/common/config-base';
|
import { ConfigBase } from '@/common/config-base';
|
||||||
import { NapCatCore } from '@/core';
|
import { NapCatCore } from '@/core';
|
||||||
import { coerce } from '@/common/coerce';
|
import { Type, Static } from '@sinclair/typebox';
|
||||||
import { z } from 'zod';
|
import { AnySchema } from 'ajv';
|
||||||
|
|
||||||
export const NapcatConfigSchema = z.object({
|
export const NapcatConfigSchema = Type.Object({
|
||||||
fileLog: coerce.boolean().default(false),
|
fileLog: Type.Boolean({ default: false }),
|
||||||
consoleLog: coerce.boolean().default(true),
|
consoleLog: Type.Boolean({ default: true }),
|
||||||
fileLogLevel: coerce.string().default('debug'),
|
fileLogLevel: Type.String({ default: 'debug' }),
|
||||||
consoleLogLevel: coerce.string().default('info'),
|
consoleLogLevel: Type.String({ default: 'info' }),
|
||||||
packetBackend: coerce.string().default('auto'),
|
packetBackend: Type.String({ default: 'auto' }),
|
||||||
packetServer: coerce.string().default(''),
|
packetServer: Type.String({ default: '' }),
|
||||||
o3HookMode: coerce.number().default(0),
|
o3HookMode: Type.Number({ default: 0 }),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type NapcatConfig = z.infer<typeof NapcatConfigSchema>;
|
export type NapcatConfig = Static<typeof NapcatConfigSchema>;
|
||||||
|
|
||||||
export class NapCatConfigLoader extends ConfigBase<NapcatConfig> {
|
export class NapCatConfigLoader extends ConfigBase<NapcatConfig> {
|
||||||
constructor(core: NapCatCore, configPath: string, schema: z.ZodType<any>) {
|
constructor(core: NapCatCore, configPath: string, schema: AnySchema) {
|
||||||
super('napcat', core, configPath, schema);
|
super('napcat', core, configPath, schema);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -40,12 +40,30 @@ export class NodeIKernelBuddyListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onDelBatchBuddyInfos(arg: unknown): any {
|
onDelBatchBuddyInfos(arg: unknown): any {
|
||||||
|
console.log('onDelBatchBuddyInfos not implemented', ...arguments);
|
||||||
}
|
}
|
||||||
|
|
||||||
onDoubtBuddyReqChange(arg: unknown): any {
|
onDoubtBuddyReqChange(_arg:
|
||||||
|
{
|
||||||
|
reqId: string;
|
||||||
|
cookie: string;
|
||||||
|
doubtList: Array<{
|
||||||
|
uid: string;
|
||||||
|
nick: string;
|
||||||
|
age: number,
|
||||||
|
sex: number;
|
||||||
|
commFriendNum: number;
|
||||||
|
reqTime: string;
|
||||||
|
msg: string;
|
||||||
|
source: string;
|
||||||
|
reason: string;
|
||||||
|
groupCode: string;
|
||||||
|
nameMore?: null;
|
||||||
|
}>;
|
||||||
|
}): void | Promise<void> {
|
||||||
}
|
}
|
||||||
|
|
||||||
onDoubtBuddyReqUnreadNumChange(arg: unknown): any {
|
onDoubtBuddyReqUnreadNumChange(_num: number): void | Promise<void> {
|
||||||
}
|
}
|
||||||
|
|
||||||
onNickUpdated(arg: unknown): any {
|
onNickUpdated(arg: unknown): any {
|
||||||
|
@@ -21,7 +21,8 @@ export interface OnRichMediaDownloadCompleteParams {
|
|||||||
clientMsg: string,
|
clientMsg: string,
|
||||||
businessId: number,
|
businessId: number,
|
||||||
userTotalSpacePerDay: unknown,
|
userTotalSpacePerDay: unknown,
|
||||||
userUsedSpacePerDay: unknown
|
userUsedSpacePerDay: unknown,
|
||||||
|
chatType: number,
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface GroupFileInfoUpdateParamType {
|
export interface GroupFileInfoUpdateParamType {
|
||||||
@@ -97,112 +98,112 @@ export interface TempOnRecvParams {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class NodeIKernelMsgListener {
|
export class NodeIKernelMsgListener {
|
||||||
onAddSendMsg(msgRecord: RawMessage): any {
|
onAddSendMsg(_msgRecord: RawMessage): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown): any {
|
onBroadcastHelperDownloadComplete(_broadcastHelperTransNotifyInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onBroadcastHelperProgressUpdate(broadcastHelperTransNotifyInfo: unknown): any {
|
onBroadcastHelperProgressUpdate(_broadcastHelperTransNotifyInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onChannelFreqLimitInfoUpdate(contact: unknown, z: unknown, freqLimitInfo: unknown): any {
|
onChannelFreqLimitInfoUpdate(_contact: unknown, _z: unknown, _freqLimitInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onContactUnreadCntUpdate(hashMap: unknown): any {
|
onContactUnreadCntUpdate(_hashMap: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onCustomWithdrawConfigUpdate(customWithdrawConfig: unknown): any {
|
onCustomWithdrawConfigUpdate(_customWithdrawConfig: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onDraftUpdate(contact: unknown, arrayList: unknown, j2: unknown): any {
|
onDraftUpdate(_contact: unknown, _arrayList: unknown, _j2: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onEmojiDownloadComplete(emojiNotifyInfo: unknown): any {
|
onEmojiDownloadComplete(_emojiNotifyInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onEmojiResourceUpdate(emojiResourceInfo: unknown): any {
|
onEmojiResourceUpdate(_emojiResourceInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
|
onFeedEventUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onFileMsgCome(arrayList: unknown): any {
|
onFileMsgCome(_arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onFirstViewDirectMsgUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
|
onFirstViewDirectMsgUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onFirstViewGroupGuildMapping(arrayList: unknown): any {
|
onFirstViewGroupGuildMapping(_arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onGrabPasswordRedBag(i2: unknown, str: unknown, i3: unknown, recvdOrder: unknown, msgRecord: unknown): any {
|
onGrabPasswordRedBag(_i2: unknown, _str: unknown, _i3: unknown, _recvdOrder: unknown, _msgRecord: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onGroupFileInfoAdd(groupItem: unknown): any {
|
onGroupFileInfoAdd(_groupItem: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onGroupFileInfoUpdate(groupFileListResult: GroupFileInfoUpdateParamType): any {
|
onGroupFileInfoUpdate(_groupFileListResult: GroupFileInfoUpdateParamType): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onGroupGuildUpdate(groupGuildNotifyInfo: unknown): any {
|
onGroupGuildUpdate(_groupGuildNotifyInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
onGroupTransferInfoAdd(groupItem: unknown): any {
|
onGroupTransferInfoAdd(_groupItem: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onGroupTransferInfoUpdate(groupFileListResult: unknown): any {
|
onGroupTransferInfoUpdate(_groupFileListResult: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onGuildInteractiveUpdate(guildInteractiveNotificationItem: unknown): any {
|
onGuildInteractiveUpdate(_guildInteractiveNotificationItem: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onGuildMsgAbFlagChanged(guildMsgAbFlag: unknown): any {
|
onGuildMsgAbFlagChanged(_guildMsgAbFlag: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: unknown): any {
|
onGuildNotificationAbstractUpdate(_guildNotificationAbstractInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onHitCsRelatedEmojiResult(downloadRelateEmojiResultInfo: unknown): any {
|
onHitCsRelatedEmojiResult(_downloadRelateEmojiResultInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onHitEmojiKeywordResult(hitRelatedEmojiWordsResult: unknown): any {
|
onHitEmojiKeywordResult(_hitRelatedEmojiWordsResult: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onHitRelatedEmojiResult(relatedWordEmojiInfo: unknown): any {
|
onHitRelatedEmojiResult(_relatedWordEmojiInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onImportOldDbProgressUpdate(importOldDbMsgNotifyInfo: unknown): any {
|
onImportOldDbProgressUpdate(_importOldDbMsgNotifyInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onInputStatusPush(inputStatusInfo: {
|
onInputStatusPush(_inputStatusInfo: {
|
||||||
chatType: number;
|
chatType: number;
|
||||||
eventType: number;
|
eventType: number;
|
||||||
fromUin: string;
|
fromUin: string;
|
||||||
@@ -215,55 +216,55 @@ export class NodeIKernelMsgListener {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onKickedOffLine(kickedInfo: KickedOffLineInfo): any {
|
onKickedOffLine(_kickedInfo: KickedOffLineInfo): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onLineDev(arrayList: unknown): any {
|
onLineDev(_arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onLogLevelChanged(j2: unknown): any {
|
onLogLevelChanged(_j2: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgAbstractUpdate(arrayList: unknown): any {
|
onMsgAbstractUpdate(_arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgBoxChanged(arrayList: unknown): any {
|
onMsgBoxChanged(_arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgDelete(contact: unknown, arrayList: unknown): any {
|
onMsgDelete(_contact: unknown, _arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgEventListUpdate(hashMap: unknown): any {
|
onMsgEventListUpdate(_hashMap: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgInfoListAdd(arrayList: unknown): any {
|
onMsgInfoListAdd(_arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgInfoListUpdate(msgList: RawMessage[]): any {
|
onMsgInfoListUpdate(_msgList: RawMessage[]): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgQRCodeStatusChanged(i2: unknown): any {
|
onMsgQRCodeStatusChanged(_i2: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgRecall(chatType: ChatType, uid: string, msgSeq: string): any {
|
onMsgRecall(_chatType: ChatType, _uid: string, _msgSeq: string): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgSecurityNotify(msgRecord: unknown): any {
|
onMsgSecurityNotify(_msgRecord: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgSettingUpdate(msgSetting: unknown): any {
|
onMsgSettingUpdate(_msgSetting: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -279,108 +280,108 @@ export class NodeIKernelMsgListener {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onReadFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
|
onReadFeedEventUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onRecvGroupGuildFlag(i2: unknown): any {
|
onRecvGroupGuildFlag(_i2: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onRecvMsg(arrayList: RawMessage[]): any {
|
onRecvMsg(_arrayList: RawMessage[]): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onRecvMsgSvrRspTransInfo(j2: unknown, contact: unknown, i2: unknown, i3: unknown, str: unknown, bArr: unknown): any {
|
onRecvMsgSvrRspTransInfo(_j2: unknown, _contact: unknown, _i2: unknown, _i3: unknown, _str: unknown, _bArr: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onRecvOnlineFileMsg(arrayList: unknown): any {
|
onRecvOnlineFileMsg(_arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onRecvS2CMsg(arrayList: unknown): any {
|
onRecvS2CMsg(_arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onRecvSysMsg(arrayList: Array<number>): any {
|
onRecvSysMsg(_arrayList: Array<number>): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onRecvUDCFlag(i2: unknown): any {
|
onRecvUDCFlag(_i2: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onRichMediaDownloadComplete(fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): any {
|
onRichMediaDownloadComplete(_fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): any {
|
||||||
}
|
}
|
||||||
|
|
||||||
onRichMediaProgerssUpdate(fileTransNotifyInfo: unknown): any {
|
onRichMediaProgerssUpdate(_fileTransNotifyInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onRichMediaUploadComplete(fileTransNotifyInfo: unknown): any {
|
onRichMediaUploadComplete(_fileTransNotifyInfo: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onSearchGroupFileInfoUpdate(searchGroupFileResult: unknown): any {
|
onSearchGroupFileInfoUpdate(_searchGroupFileResult: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown): any {
|
onSendMsgError(_j2: unknown, _contact: unknown, _i2: unknown, _str: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown): any {
|
onSysMsgNotification(_i2: unknown, _j2: unknown, _j3: unknown, _arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams): any {
|
onTempChatInfoUpdate(_tempChatInfo: TempOnRecvParams): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onUnreadCntAfterFirstView(hashMap: unknown): any {
|
onUnreadCntAfterFirstView(_hashMap: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onUnreadCntUpdate(hashMap: unknown): any {
|
onUnreadCntUpdate(_hashMap: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onUserChannelTabStatusChanged(z: unknown): any {
|
onUserChannelTabStatusChanged(_z: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onUserOnlineStatusChanged(z: unknown): any {
|
onUserOnlineStatusChanged(_z: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onUserTabStatusChanged(arrayList: unknown): any {
|
onUserTabStatusChanged(_arrayList: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onlineStatusBigIconDownloadPush(i2: unknown, j2: unknown, str: unknown): any {
|
onlineStatusBigIconDownloadPush(_i2: unknown, _j2: unknown, _str: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onlineStatusSmallIconDownloadPush(i2: unknown, j2: unknown, str: unknown): any {
|
onlineStatusSmallIconDownloadPush(_i2: unknown, _j2: unknown, _str: unknown): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 第一次发现于Linux
|
// 第一次发现于Linux
|
||||||
onUserSecQualityChanged(...args: unknown[]): any {
|
onUserSecQualityChanged(..._args: unknown[]): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMsgWithRichLinkInfoUpdate(...args: unknown[]): any {
|
onMsgWithRichLinkInfoUpdate(..._args: unknown[]): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onRedTouchChanged(...args: unknown[]): any {
|
onRedTouchChanged(..._args: unknown[]): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 第一次发现于Win 9.9.9-23159
|
// 第一次发现于Win 9.9.9-23159
|
||||||
onBroadcastHelperProgerssUpdate(...args: unknown[]): any {
|
onBroadcastHelperProgerssUpdate(..._args: unknown[]): any {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -96,7 +96,7 @@ export interface NodeIKernelSearchListener {
|
|||||||
}): any;
|
}): any;
|
||||||
|
|
||||||
onSearchMsgKeywordsResult(params: {
|
onSearchMsgKeywordsResult(params: {
|
||||||
searchId: string,
|
searchId: number,
|
||||||
hasMore: boolean,
|
hasMore: boolean,
|
||||||
resultItems: Array<{
|
resultItems: Array<{
|
||||||
msgId: string,
|
msgId: string,
|
||||||
|
@@ -8,7 +8,8 @@ import { LRUCache } from '@/common/lru-cache';
|
|||||||
import { LogStack } from '@/core/packet/context/clientContext';
|
import { LogStack } from '@/core/packet/context/clientContext';
|
||||||
import { NapCoreContext } from '@/core/packet/context/napCoreContext';
|
import { NapCoreContext } from '@/core/packet/context/napCoreContext';
|
||||||
import { PacketLogger } from '@/core/packet/context/loggerContext';
|
import { PacketLogger } from '@/core/packet/context/loggerContext';
|
||||||
|
import { ProtoBufDecode } from 'napcat.protobuf';
|
||||||
|
export const MsgData = new LRUCache<string, string>(5000);
|
||||||
// 0 send 1 recv
|
// 0 send 1 recv
|
||||||
export interface NativePacketExportType {
|
export interface NativePacketExportType {
|
||||||
InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void, o3_hook: boolean) => boolean;
|
InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void, o3_hook: boolean) => boolean;
|
||||||
@@ -56,6 +57,19 @@ export class NativePacketClient extends IPacketClient {
|
|||||||
// console.log('callback:', callback, trace_id);
|
// console.log('callback:', callback, trace_id);
|
||||||
callback?.({ seq, cmd, hex_data });
|
callback?.({ seq, cmd, hex_data });
|
||||||
}
|
}
|
||||||
|
if (cmd === 'trpc.msg.olpush.OlPushService.MsgPush') {
|
||||||
|
try {
|
||||||
|
let msg_info = ProtoBufDecode(Buffer.from(hex_data, 'hex')) as any;
|
||||||
|
let group_id = (msg_info['1']['1']['8']['1'] as number).toString()
|
||||||
|
let msg_seq = (msg_info['1']['2']['5'] as number).toString()
|
||||||
|
let msg_id = group_id + '_' + msg_seq;
|
||||||
|
MsgData.put(msg_id, hex_data);
|
||||||
|
console.log('add msgid:', msg_id);
|
||||||
|
} catch (error) {
|
||||||
|
console.log('error:', error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}, this.napcore.config.o3HookMode == 1);
|
}, this.napcore.config.o3HookMode == 1);
|
||||||
this.available = true;
|
this.available = true;
|
||||||
}
|
}
|
||||||
|
@@ -6,13 +6,14 @@ import {
|
|||||||
PacketMsgFileElement,
|
PacketMsgFileElement,
|
||||||
PacketMsgPicElement,
|
PacketMsgPicElement,
|
||||||
PacketMsgPttElement,
|
PacketMsgPttElement,
|
||||||
PacketMsgVideoElement
|
PacketMsgReplyElement,
|
||||||
|
PacketMsgVideoElement,
|
||||||
} from '@/core/packet/message/element';
|
} from '@/core/packet/message/element';
|
||||||
import { ChatType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
|
import { ChatType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
|
||||||
import { MiniAppRawData, MiniAppReqParams } from '@/core/packet/entities/miniApp';
|
import { MiniAppRawData, MiniAppReqParams } from '@/core/packet/entities/miniApp';
|
||||||
import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
|
import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
|
||||||
import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
|
import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
|
||||||
import { IndexNode, LongMsgResult, MsgInfo } from '@/core/packet/transformer/proto';
|
import { IndexNode, LongMsgResult, MsgInfo, PushMsgBody } from '@/core/packet/transformer/proto';
|
||||||
import { OidbPacket } from '@/core/packet/transformer/base';
|
import { OidbPacket } from '@/core/packet/transformer/base';
|
||||||
import { ImageOcrResult } from '@/core/packet/entities/ocrResult';
|
import { ImageOcrResult } from '@/core/packet/entities/ocrResult';
|
||||||
import { gunzipSync } from 'zlib';
|
import { gunzipSync } from 'zlib';
|
||||||
@@ -76,22 +77,24 @@ export class PacketOperationContext {
|
|||||||
async UploadResources(msg: PacketMsg[], groupUin: number = 0) {
|
async UploadResources(msg: PacketMsg[], groupUin: number = 0) {
|
||||||
const chatType = groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C;
|
const chatType = groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C;
|
||||||
const peerUid = groupUin ? String(groupUin) : this.context.napcore.basicInfo.uid;
|
const peerUid = groupUin ? String(groupUin) : this.context.napcore.basicInfo.uid;
|
||||||
const reqList = msg.flatMap(m =>
|
const reqList = msg.flatMap((m) =>
|
||||||
m.msg.map(e => {
|
m.msg
|
||||||
if (e instanceof PacketMsgPicElement) {
|
.map((e) => {
|
||||||
return this.context.highway.uploadImage({ chatType, peerUid }, e);
|
if (e instanceof PacketMsgPicElement) {
|
||||||
} else if (e instanceof PacketMsgVideoElement) {
|
return this.context.highway.uploadImage({ chatType, peerUid }, e);
|
||||||
return this.context.highway.uploadVideo({ chatType, peerUid }, e);
|
} else if (e instanceof PacketMsgVideoElement) {
|
||||||
} else if (e instanceof PacketMsgPttElement) {
|
return this.context.highway.uploadVideo({ chatType, peerUid }, e);
|
||||||
return this.context.highway.uploadPtt({ chatType, peerUid }, e);
|
} else if (e instanceof PacketMsgPttElement) {
|
||||||
} else if (e instanceof PacketMsgFileElement) {
|
return this.context.highway.uploadPtt({ chatType, peerUid }, e);
|
||||||
return this.context.highway.uploadFile({ chatType, peerUid }, e);
|
} else if (e instanceof PacketMsgFileElement) {
|
||||||
}
|
return this.context.highway.uploadFile({ chatType, peerUid }, e);
|
||||||
return null;
|
}
|
||||||
}).filter(Boolean)
|
return null;
|
||||||
|
})
|
||||||
|
.filter(Boolean)
|
||||||
);
|
);
|
||||||
const res = await Promise.allSettled(reqList);
|
const res = await Promise.allSettled(reqList);
|
||||||
this.context.logger.info(`上传资源${res.length}个,失败${res.filter(r => r.status === 'rejected').length}个`);
|
this.context.logger.info(`上传资源${res.length}个,失败${res.filter((r) => r.status === 'rejected').length}个`);
|
||||||
res.forEach((result, index) => {
|
res.forEach((result, index) => {
|
||||||
if (result.status === 'rejected') {
|
if (result.status === 'rejected') {
|
||||||
this.context.logger.error(`上传第${index + 1}个资源失败:${result.reason.stack}`);
|
this.context.logger.error(`上传第${index + 1}个资源失败:${result.reason.stack}`);
|
||||||
@@ -100,10 +103,13 @@ export class PacketOperationContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async UploadImage(img: PacketMsgPicElement) {
|
async UploadImage(img: PacketMsgPicElement) {
|
||||||
await this.context.highway.uploadImage({
|
await this.context.highway.uploadImage(
|
||||||
chatType: ChatType.KCHATTYPEC2C,
|
{
|
||||||
peerUid: this.context.napcore.basicInfo.uid
|
chatType: ChatType.KCHATTYPEC2C,
|
||||||
}, img);
|
peerUid: this.context.napcore.basicInfo.uid,
|
||||||
|
},
|
||||||
|
img
|
||||||
|
);
|
||||||
const index = img.msgInfo?.msgInfoBody?.at(0)?.index;
|
const index = img.msgInfo?.msgInfoBody?.at(0)?.index;
|
||||||
if (!index) {
|
if (!index) {
|
||||||
throw new Error('img.msgInfo?.msgInfoBody![0].index! is undefined');
|
throw new Error('img.msgInfo?.msgInfoBody![0].index! is undefined');
|
||||||
@@ -137,24 +143,66 @@ export class PacketOperationContext {
|
|||||||
coordinates: item.polygon.coordinates.map((c) => {
|
coordinates: item.polygon.coordinates.map((c) => {
|
||||||
return {
|
return {
|
||||||
x: c.x,
|
x: c.x,
|
||||||
y: c.y
|
y: c.y,
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
language: res.ocrRspBody.language
|
language: res.ocrRspBody.language,
|
||||||
} as ImageOcrResult;
|
} as ImageOcrResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
|
private async SendPreprocess(msg: PacketMsg[], groupUin: number = 0) {
|
||||||
|
const ps = msg.map((m) => {
|
||||||
|
return m.msg.map(async(e) => {
|
||||||
|
if (e instanceof PacketMsgReplyElement && !e.targetElems) {
|
||||||
|
this.context.logger.debug(`Cannot find reply element's targetElems, prepare to fetch it...`);
|
||||||
|
if (!e.targetPeer?.peerUid) {
|
||||||
|
this.context.logger.error(`targetPeer is undefined!`);
|
||||||
|
}
|
||||||
|
let targetMsg: NapProtoEncodeStructType<typeof PushMsgBody>[] | undefined;
|
||||||
|
if (e.isGroupReply) {
|
||||||
|
targetMsg = await this.FetchGroupMessage(+(e.targetPeer?.peerUid ?? 0), e.targetMessageSeq, e.targetMessageSeq);
|
||||||
|
} else {
|
||||||
|
targetMsg = await this.FetchC2CMessage(await this.context.napcore.basicInfo.uin2uid(e.targetUin), e.targetMessageSeq, e.targetMessageSeq);
|
||||||
|
}
|
||||||
|
e.targetElems = targetMsg.at(0)?.body?.richText?.elems;
|
||||||
|
e.targetSourceMsg = targetMsg.at(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}).flat();
|
||||||
|
await Promise.all(ps)
|
||||||
await this.UploadResources(msg, groupUin);
|
await this.UploadResources(msg, groupUin);
|
||||||
|
}
|
||||||
|
|
||||||
|
async FetchGroupMessage(groupUin: number, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
|
||||||
|
const req = trans.FetchGroupMessage.build(groupUin, startSeq, endSeq);
|
||||||
|
const resp = await this.context.client.sendOidbPacket(req, true);
|
||||||
|
const res = trans.FetchGroupMessage.parse(resp);
|
||||||
|
return res.body.messages
|
||||||
|
}
|
||||||
|
|
||||||
|
async FetchC2CMessage(targetUid: string, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
|
||||||
|
const req = trans.FetchC2CMessage.build(targetUid, startSeq, endSeq);
|
||||||
|
const resp = await this.context.client.sendOidbPacket(req, true);
|
||||||
|
const res = trans.FetchC2CMessage.parse(resp);
|
||||||
|
return res.messages
|
||||||
|
}
|
||||||
|
|
||||||
|
async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
|
||||||
|
await this.SendPreprocess(msg, groupUin);
|
||||||
const req = trans.UploadForwardMsg.build(this.context.napcore.basicInfo.uid, msg, groupUin);
|
const req = trans.UploadForwardMsg.build(this.context.napcore.basicInfo.uid, msg, groupUin);
|
||||||
const resp = await this.context.client.sendOidbPacket(req, true);
|
const resp = await this.context.client.sendOidbPacket(req, true);
|
||||||
const res = trans.UploadForwardMsg.parse(resp);
|
const res = trans.UploadForwardMsg.parse(resp);
|
||||||
return res.result.resId;
|
return res.result.resId;
|
||||||
}
|
}
|
||||||
|
|
||||||
async MoveGroupFile(groupUin: number, fileUUID: string, currentParentDirectory: string, targetParentDirectory: string) {
|
async MoveGroupFile(
|
||||||
|
groupUin: number,
|
||||||
|
fileUUID: string,
|
||||||
|
currentParentDirectory: string,
|
||||||
|
targetParentDirectory: string
|
||||||
|
) {
|
||||||
const req = trans.MoveGroupFile.build(groupUin, fileUUID, currentParentDirectory, targetParentDirectory);
|
const req = trans.MoveGroupFile.build(groupUin, fileUUID, currentParentDirectory, targetParentDirectory);
|
||||||
const resp = await this.context.client.sendOidbPacket(req, true);
|
const resp = await this.context.client.sendOidbPacket(req, true);
|
||||||
const res = trans.MoveGroupFile.parse(resp);
|
const res = trans.MoveGroupFile.parse(resp);
|
||||||
@@ -203,12 +251,17 @@ export class PacketOperationContext {
|
|||||||
return res.content.map((item) => {
|
return res.content.map((item) => {
|
||||||
return {
|
return {
|
||||||
category: item.category,
|
category: item.category,
|
||||||
voices: item.voices
|
voices: item.voices,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async GetAiVoice(groupUin: number, voiceId: string, text: string, chatType: AIVoiceChatType): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
|
async GetAiVoice(
|
||||||
|
groupUin: number,
|
||||||
|
voiceId: string,
|
||||||
|
text: string,
|
||||||
|
chatType: AIVoiceChatType
|
||||||
|
): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
|
||||||
let reqTime = 0;
|
let reqTime = 0;
|
||||||
const reqMaxTime = 30;
|
const reqMaxTime = 30;
|
||||||
const sessionId = crypto.randomBytes(4).readUInt32BE(0);
|
const sessionId = crypto.randomBytes(4).readUInt32BE(0);
|
||||||
@@ -236,6 +289,7 @@ export class PacketOperationContext {
|
|||||||
if (!main?.actionData.msgBody) {
|
if (!main?.actionData.msgBody) {
|
||||||
throw new Error('msgBody is empty');
|
throw new Error('msgBody is empty');
|
||||||
}
|
}
|
||||||
|
this.context.logger.debug('rawChains ', inflate.toString('hex'));
|
||||||
|
|
||||||
const messagesPromises = main.actionData.msgBody.map(async (msg) => {
|
const messagesPromises = main.actionData.msgBody.map(async (msg) => {
|
||||||
if (!msg?.body?.richText?.elems) {
|
if (!msg?.body?.richText?.elems) {
|
||||||
@@ -251,12 +305,12 @@ export class PacketOperationContext {
|
|||||||
const groupUin = msg?.responseHead.grp?.groupUin ?? 0;
|
const groupUin = msg?.responseHead.grp?.groupUin ?? 0;
|
||||||
element.picElement = {
|
element.picElement = {
|
||||||
...element.picElement,
|
...element.picElement,
|
||||||
originImageUrl: await this.GetGroupImageUrl(groupUin, index!)
|
originImageUrl: await this.GetGroupImageUrl(groupUin, index!),
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
element.picElement = {
|
element.picElement = {
|
||||||
...element.picElement,
|
...element.picElement,
|
||||||
originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!)
|
originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return element;
|
return element;
|
||||||
@@ -269,7 +323,7 @@ export class PacketOperationContext {
|
|||||||
elements: elements,
|
elements: elements,
|
||||||
guildId: '',
|
guildId: '',
|
||||||
isOnlineMsg: false,
|
isOnlineMsg: false,
|
||||||
msgId: '7467703692092974645', // TODO: no necessary
|
msgId: '7467703692092974645', // TODO: no necessary
|
||||||
msgRandom: '0',
|
msgRandom: '0',
|
||||||
msgSeq: String(msg.contentHead.sequence ?? 0),
|
msgSeq: String(msg.contentHead.sequence ?? 0),
|
||||||
msgTime: String(msg.contentHead.timeStamp ?? 0),
|
msgTime: String(msg.contentHead.timeStamp ?? 0),
|
||||||
|
@@ -24,12 +24,15 @@ export class PacketMsgBuilder {
|
|||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
responseHead: {
|
responseHead: {
|
||||||
fromUid: '',
|
|
||||||
fromUin: node.senderUin,
|
fromUin: node.senderUin,
|
||||||
toUid: node.groupId ? undefined : selfUid,
|
type: 0,
|
||||||
|
sigMap: 0,
|
||||||
|
toUin: 0,
|
||||||
|
fromUid: '',
|
||||||
forward: node.groupId ? undefined : {
|
forward: node.groupId ? undefined : {
|
||||||
friendName: node.senderName,
|
friendName: node.senderName,
|
||||||
},
|
},
|
||||||
|
toUid: node.groupId ? undefined : selfUid,
|
||||||
grp: node.groupId ? {
|
grp: node.groupId ? {
|
||||||
groupUin: node.groupId,
|
groupUin: node.groupId,
|
||||||
memberName: node.senderName,
|
memberName: node.senderName,
|
||||||
@@ -40,16 +43,13 @@ export class PacketMsgBuilder {
|
|||||||
type: node.groupId ? 82 : 9,
|
type: node.groupId ? 82 : 9,
|
||||||
subType: node.groupId ? undefined : 4,
|
subType: node.groupId ? undefined : 4,
|
||||||
divSeq: node.groupId ? undefined : 4,
|
divSeq: node.groupId ? undefined : 4,
|
||||||
msgId: crypto.randomBytes(4).readUInt32LE(0),
|
autoReply: 0,
|
||||||
sequence: crypto.randomBytes(4).readUInt32LE(0),
|
sequence: crypto.randomBytes(4).readUInt32LE(0),
|
||||||
timeStamp: +node.time.toString().substring(0, 10),
|
timeStamp: +node.time.toString().substring(0, 10),
|
||||||
field7: BigInt(1),
|
|
||||||
field8: 0,
|
|
||||||
field9: 0,
|
|
||||||
forward: {
|
forward: {
|
||||||
field1: 0,
|
field1: 0,
|
||||||
field2: 0,
|
field2: 0,
|
||||||
field3: node.groupId ? 0 : 2,
|
field3: node.groupId ? 1 : 2,
|
||||||
unknownBase64: avatar,
|
unknownBase64: avatar,
|
||||||
avatar: avatar
|
avatar: avatar
|
||||||
}
|
}
|
||||||
|
@@ -10,6 +10,7 @@ import {
|
|||||||
MsgInfo,
|
MsgInfo,
|
||||||
NotOnlineImage,
|
NotOnlineImage,
|
||||||
OidbSvcTrpcTcp0XE37_800Response,
|
OidbSvcTrpcTcp0XE37_800Response,
|
||||||
|
PushMsgBody,
|
||||||
QBigFaceExtra,
|
QBigFaceExtra,
|
||||||
QSmallFaceExtra,
|
QSmallFaceExtra,
|
||||||
} from '@/core/packet/transformer/proto';
|
} from '@/core/packet/transformer/proto';
|
||||||
@@ -29,7 +30,8 @@ import {
|
|||||||
SendReplyElement,
|
SendReplyElement,
|
||||||
SendMultiForwardMsgElement,
|
SendMultiForwardMsgElement,
|
||||||
SendTextElement,
|
SendTextElement,
|
||||||
SendVideoElement
|
SendVideoElement,
|
||||||
|
Peer
|
||||||
} from '@/core';
|
} from '@/core';
|
||||||
import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
|
import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
|
||||||
import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
|
import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
|
||||||
@@ -146,41 +148,40 @@ export class PacketMsgAtElement extends PacketMsgTextElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
|
export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
|
||||||
messageId: bigint;
|
time: number;
|
||||||
messageSeq: number;
|
targetMessageId: bigint;
|
||||||
messageClientSeq: number;
|
targetMessageSeq: number;
|
||||||
|
targetMessageClientSeq: number;
|
||||||
targetUin: number;
|
targetUin: number;
|
||||||
targetUid: string;
|
targetUid: string;
|
||||||
time: number;
|
targetElems?: NapProtoEncodeStructType<typeof Elem>[];
|
||||||
elems: PacketMsg[];
|
targetSourceMsg?: NapProtoEncodeStructType<typeof PushMsgBody>;
|
||||||
|
targetPeer?: Peer;
|
||||||
|
|
||||||
constructor(element: SendReplyElement) {
|
constructor(element: SendReplyElement) {
|
||||||
super(element);
|
super(element);
|
||||||
this.messageId = BigInt(element.replyElement.replayMsgId ?? 0);
|
this.time = +(element.replyElement.replyMsgTime ?? Math.floor(Date.now() / 1000));
|
||||||
this.messageSeq = +(element.replyElement.replayMsgSeq ?? 0);
|
this.targetMessageId = BigInt(element.replyElement.replayMsgId ?? 0);
|
||||||
this.messageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
|
this.targetMessageSeq = +(element.replyElement.replayMsgSeq ?? 0);
|
||||||
|
this.targetMessageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
|
||||||
this.targetUin = +(element.replyElement.senderUin ?? 0);
|
this.targetUin = +(element.replyElement.senderUin ?? 0);
|
||||||
this.targetUid = element.replyElement.senderUidStr ?? '';
|
this.targetUid = element.replyElement.senderUidStr ?? '';
|
||||||
this.time = +(element.replyElement.replyMsgTime ?? 0);
|
this.targetPeer = element.replyElement._replyMsgPeer;
|
||||||
this.elems = []; // TODO: in replyElement.sourceMsgTextElems
|
|
||||||
}
|
}
|
||||||
|
|
||||||
get isGroupReply(): boolean {
|
get isGroupReply(): boolean {
|
||||||
return this.messageClientSeq === 0;
|
return this.targetMessageClientSeq === 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
override buildElement(): NapProtoEncodeStructType<typeof Elem>[] {
|
override buildElement(): NapProtoEncodeStructType<typeof Elem>[] {
|
||||||
return [{
|
return [{
|
||||||
srcMsg: {
|
srcMsg: {
|
||||||
origSeqs: [this.isGroupReply ? this.messageClientSeq : this.messageSeq],
|
origSeqs: [this.isGroupReply ? this.targetMessageSeq : this.targetMessageClientSeq],
|
||||||
senderUin: BigInt(this.targetUin),
|
senderUin: BigInt(this.targetUin),
|
||||||
time: this.time,
|
time: this.time,
|
||||||
elems: [], // TODO: in replyElement.sourceMsgTextElems
|
elems: this.targetElems ?? [],
|
||||||
pbReserve: {
|
sourceMsg: new NapProtoMsg(PushMsgBody).encode(this.targetSourceMsg ?? {}),
|
||||||
messageId: this.messageId,
|
toUin: BigInt(0),
|
||||||
},
|
|
||||||
toUin: BigInt(this.targetUin),
|
|
||||||
type: 1,
|
|
||||||
}
|
}
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
|
27
src/core/packet/transformer/message/FetchC2CMessage.ts
Normal file
27
src/core/packet/transformer/message/FetchC2CMessage.ts
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
import * as proto from '@/core/packet/transformer/proto';
|
||||||
|
import { NapProtoMsg } from '@napneko/nap-proto-core';
|
||||||
|
import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
|
||||||
|
|
||||||
|
class FetchC2CMessage extends PacketTransformer<typeof proto.SsoGetC2cMsgResponse> {
|
||||||
|
constructor() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
build(targetUid: string, startSeq: number, endSeq: number): OidbPacket {
|
||||||
|
const req = new NapProtoMsg(proto.SsoGetC2cMsg).encode({
|
||||||
|
friendUid: targetUid,
|
||||||
|
startSequence: startSeq,
|
||||||
|
endSequence: endSeq,
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetC2cMsg',
|
||||||
|
data: PacketHexStrBuilder(req)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
parse(data: Buffer) {
|
||||||
|
return new NapProtoMsg(proto.SsoGetC2cMsgResponse).decode(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default new FetchC2CMessage();
|
30
src/core/packet/transformer/message/FetchGroupMessage.ts
Normal file
30
src/core/packet/transformer/message/FetchGroupMessage.ts
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
import * as proto from '@/core/packet/transformer/proto';
|
||||||
|
import { NapProtoMsg } from '@napneko/nap-proto-core';
|
||||||
|
import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
|
||||||
|
|
||||||
|
class FetchGroupMessage extends PacketTransformer<typeof proto.SsoGetGroupMsgResponse> {
|
||||||
|
constructor() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
build(groupUin: number, startSeq: number, endSeq: number): OidbPacket {
|
||||||
|
const req = new NapProtoMsg(proto.SsoGetGroupMsg).encode({
|
||||||
|
info: {
|
||||||
|
groupUin: groupUin,
|
||||||
|
startSequence: startSeq,
|
||||||
|
endSequence: endSeq
|
||||||
|
},
|
||||||
|
direction: true
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetGroupMsg',
|
||||||
|
data: PacketHexStrBuilder(req)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
parse(data: Buffer) {
|
||||||
|
return new NapProtoMsg(proto.SsoGetGroupMsgResponse).decode(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default new FetchGroupMessage();
|
@@ -1,2 +1,4 @@
|
|||||||
export { default as UploadForwardMsg } from './UploadForwardMsg';
|
export { default as UploadForwardMsg } from './UploadForwardMsg';
|
||||||
export { default as DownloadForwardMsg } from './DownloadForwardMsg';
|
export { default as FetchGroupMessage } from './FetchGroupMessage';
|
||||||
|
export { default as FetchC2CMessage } from './FetchC2CMessage';
|
||||||
|
export { default as DownloadForwardMsg } from './DownloadForwardMsg';
|
||||||
|
@@ -13,13 +13,15 @@ import {
|
|||||||
export const ContentHead = {
|
export const ContentHead = {
|
||||||
type: ProtoField(1, ScalarType.UINT32),
|
type: ProtoField(1, ScalarType.UINT32),
|
||||||
subType: ProtoField(2, ScalarType.UINT32, true),
|
subType: ProtoField(2, ScalarType.UINT32, true),
|
||||||
divSeq: ProtoField(3, ScalarType.UINT32, true),
|
c2cCmd: ProtoField(3, ScalarType.UINT32, true),
|
||||||
msgId: ProtoField(4, ScalarType.UINT32, true),
|
ranDom: ProtoField(4, ScalarType.UINT32, true),
|
||||||
sequence: ProtoField(5, ScalarType.UINT32, true),
|
sequence: ProtoField(5, ScalarType.UINT32, true),
|
||||||
timeStamp: ProtoField(6, ScalarType.UINT32, true),
|
timeStamp: ProtoField(6, ScalarType.UINT32, true),
|
||||||
field7: ProtoField(7, ScalarType.UINT64, true),
|
pkgNum: ProtoField(7, ScalarType.UINT64, true),
|
||||||
field8: ProtoField(8, ScalarType.UINT32, true),
|
pkgIndex: ProtoField(8, ScalarType.UINT32, true),
|
||||||
field9: ProtoField(9, ScalarType.UINT32, true),
|
divSeq: ProtoField(9, ScalarType.UINT32, true),
|
||||||
|
autoReply: ProtoField(10, ScalarType.UINT32),
|
||||||
|
ntMsgSeq: ProtoField(10, ScalarType.UINT32, true),
|
||||||
newId: ProtoField(12, ScalarType.UINT64, true),
|
newId: ProtoField(12, ScalarType.UINT64, true),
|
||||||
forward: ProtoField(15, () => ForwardHead, true),
|
forward: ProtoField(15, () => ForwardHead, true),
|
||||||
};
|
};
|
||||||
|
@@ -106,15 +106,15 @@ export interface NodeIKernelBuddyService {
|
|||||||
|
|
||||||
getAddMeSetting(): unknown;
|
getAddMeSetting(): unknown;
|
||||||
|
|
||||||
getDoubtBuddyReq(): unknown;
|
getDoubtBuddyReq(reqId: string, num: number,uk:string): Promise<GeneralCallResult>;
|
||||||
|
|
||||||
getDoubtBuddyUnreadNum(): number;
|
getDoubtBuddyUnreadNum(): number;
|
||||||
|
|
||||||
approvalDoubtBuddyReq(uid: number, isAgree: boolean): void;
|
approvalDoubtBuddyReq(uid: string, str1: string, str2: string): void;
|
||||||
|
|
||||||
delDoubtBuddyReq(uid: number): void;
|
delDoubtBuddyReq(uid: number): void;
|
||||||
|
|
||||||
delAllDoubtBuddyReq(): void;
|
delAllDoubtBuddyReq(): Promise<GeneralCallResult>;
|
||||||
|
|
||||||
reportDoubtBuddyReqUnread(): void;
|
reportDoubtBuddyReqUnread(): void;
|
||||||
|
|
||||||
|
@@ -425,7 +425,20 @@ export interface NodeIKernelMsgService {
|
|||||||
|
|
||||||
switchToOfflineGetRichMediaElement(...args: unknown[]): unknown;
|
switchToOfflineGetRichMediaElement(...args: unknown[]): unknown;
|
||||||
|
|
||||||
downloadRichMedia(...args: unknown[]): unknown;
|
downloadRichMedia(args: {
|
||||||
|
fileModelId: string,
|
||||||
|
downSourceType: number,
|
||||||
|
triggerType: number,
|
||||||
|
msgId: string,
|
||||||
|
chatType: number,
|
||||||
|
peerUid: string,
|
||||||
|
elementId: string,
|
||||||
|
thumbSize: number,
|
||||||
|
downloadType: number,
|
||||||
|
filePath: string
|
||||||
|
} & {
|
||||||
|
downloadSourceType: number, //33800左右一下的老版本 新版34606已经完全上面格式
|
||||||
|
}): unknown;
|
||||||
|
|
||||||
getFirstUnreadMsgSeq(args: {
|
getFirstUnreadMsgSeq(args: {
|
||||||
peerUid: string
|
peerUid: string
|
||||||
|
@@ -54,7 +54,7 @@ export interface NodeIKernelSearchService {
|
|||||||
|
|
||||||
cancelSearchChatMsgs(...args: unknown[]): unknown;// needs 3 arguments
|
cancelSearchChatMsgs(...args: unknown[]): unknown;// needs 3 arguments
|
||||||
|
|
||||||
searchMsgWithKeywords(keyWords: string[], param: Peer & { searchFields: number, pageLimit: number }): Promise<GeneralCallResult>;
|
searchMsgWithKeywords(keyWords: string[], param: Peer & { searchFields: number, pageLimit: number }): number;
|
||||||
|
|
||||||
searchMoreMsgWithKeywords(...args: unknown[]): unknown;// needs 1 arguments
|
searchMoreMsgWithKeywords(...args: unknown[]): unknown;// needs 1 arguments
|
||||||
|
|
||||||
|
@@ -1,4 +1,15 @@
|
|||||||
import { ElementType, MessageElement, NTGrayTipElementSubTypeV2, PicSubType, PicType, TipAioOpGrayTipElement, TipGroupElement, NTVideoType, FaceType } from './msg';
|
import {
|
||||||
|
ElementType,
|
||||||
|
MessageElement,
|
||||||
|
NTGrayTipElementSubTypeV2,
|
||||||
|
PicSubType,
|
||||||
|
PicType,
|
||||||
|
TipAioOpGrayTipElement,
|
||||||
|
TipGroupElement,
|
||||||
|
NTVideoType,
|
||||||
|
FaceType,
|
||||||
|
Peer
|
||||||
|
} from './msg';
|
||||||
|
|
||||||
type ElementFullBase = Omit<MessageElement, 'elementType' | 'elementId' | 'extBufForUI'>;
|
type ElementFullBase = Omit<MessageElement, 'elementType' | 'elementId' | 'extBufForUI'>;
|
||||||
|
|
||||||
@@ -213,6 +224,9 @@ export interface ReplyElement {
|
|||||||
senderUidStr?: string;
|
senderUidStr?: string;
|
||||||
replyMsgTime?: string;
|
replyMsgTime?: string;
|
||||||
replyMsgClientSeq?: string;
|
replyMsgClientSeq?: string;
|
||||||
|
// HACK: Attributes that were not originally available,
|
||||||
|
// but were added due to NTQQ and NapCat's internal implementation, are used to supplement NapCat
|
||||||
|
_replyMsgPeer?: Peer;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CalendarElement {
|
export interface CalendarElement {
|
||||||
|
@@ -403,7 +403,7 @@ export interface NTGroupGrayMember {
|
|||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 群灰色提示邀请者和被邀请者接口
|
* 群灰色提示邀请者和被邀请者接口
|
||||||
*
|
*
|
||||||
* */
|
* */
|
||||||
export interface NTGroupGrayInviterAndInvite {
|
export interface NTGroupGrayInviterAndInvite {
|
||||||
invited: NTGroupGrayMember;
|
invited: NTGroupGrayMember;
|
||||||
@@ -501,6 +501,7 @@ export interface RawMessage {
|
|||||||
elements: MessageElement[];// 消息元素
|
elements: MessageElement[];// 消息元素
|
||||||
sourceType: MsgSourceType;// 消息来源类型
|
sourceType: MsgSourceType;// 消息来源类型
|
||||||
isOnlineMsg: boolean;// 是否为在线消息
|
isOnlineMsg: boolean;// 是否为在线消息
|
||||||
|
clientSeq?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -565,4 +566,4 @@ export enum FaceType {
|
|||||||
AniSticke = 3, // 动画贴纸
|
AniSticke = 3, // 动画贴纸
|
||||||
Lottie = 4,// 新格式表情
|
Lottie = 4,// 新格式表情
|
||||||
Poke = 5 // 可变Poke
|
Poke = 5 // 可变Poke
|
||||||
}
|
}
|
||||||
|
@@ -38,13 +38,15 @@ export async function NCoreInitFramework(
|
|||||||
const logger = new LogWrapper(pathWrapper.logsPath);
|
const logger = new LogWrapper(pathWrapper.logsPath);
|
||||||
const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
|
const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
|
||||||
const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
|
const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
|
||||||
downloadFFmpegIfNotExists(logger).then(({ path, isExist }) => {
|
if (!process.env['NAPCAT_DISABLE_FFMPEG_DOWNLOAD']) {
|
||||||
if (!isExist && path) {
|
downloadFFmpegIfNotExists(logger).then(({ path, reset }) => {
|
||||||
FFmpegService.setFfmpegPath(path);
|
if (reset && path) {
|
||||||
}
|
FFmpegService.setFfmpegPath(path, logger);
|
||||||
}).catch(e => {
|
}
|
||||||
logger.logError('[Ffmpeg] Error:', e);
|
}).catch(e => {
|
||||||
});
|
logger.logError('[Ffmpeg] Error:', e);
|
||||||
|
});
|
||||||
|
}
|
||||||
//直到登录成功后,执行下一步
|
//直到登录成功后,执行下一步
|
||||||
const selfInfo = await new Promise<SelfInfo>((resolveSelfInfo) => {
|
const selfInfo = await new Promise<SelfInfo>((resolveSelfInfo) => {
|
||||||
const loginListener = new NodeIKernelLoginListener();
|
const loginListener = new NodeIKernelLoginListener();
|
||||||
|
@@ -1,8 +1,9 @@
|
|||||||
import { ActionName, BaseCheckResult } from './router';
|
import { ActionName, BaseCheckResult } from './router';
|
||||||
|
import Ajv, { ErrorObject, ValidateFunction } from 'ajv';
|
||||||
import { NapCatCore } from '@/core';
|
import { NapCatCore } from '@/core';
|
||||||
import { NapCatOneBot11Adapter, OB11Return } from '@/onebot';
|
import { NapCatOneBot11Adapter, OB11Return } from '@/onebot';
|
||||||
import { NetworkAdapterConfig } from '../config/config';
|
import { NetworkAdapterConfig } from '../config/config';
|
||||||
import { z } from 'zod';
|
import { TSchema } from '@sinclair/typebox';
|
||||||
|
|
||||||
export class OB11Response {
|
export class OB11Response {
|
||||||
private static createResponse<T>(data: T, status: string, retcode: number, message: string = '', echo: unknown = null): OB11Return<T> {
|
private static createResponse<T>(data: T, status: string, retcode: number, message: string = '', echo: unknown = null): OB11Return<T> {
|
||||||
@@ -32,7 +33,8 @@ export class OB11Response {
|
|||||||
export abstract class OneBotAction<PayloadType, ReturnDataType> {
|
export abstract class OneBotAction<PayloadType, ReturnDataType> {
|
||||||
actionName: typeof ActionName[keyof typeof ActionName] = ActionName.Unknown;
|
actionName: typeof ActionName[keyof typeof ActionName] = ActionName.Unknown;
|
||||||
core: NapCatCore;
|
core: NapCatCore;
|
||||||
payloadSchema?: z.ZodType<unknown> = undefined;
|
private validate?: ValidateFunction<unknown> = undefined;
|
||||||
|
payloadSchema?: TSchema = undefined;
|
||||||
obContext: NapCatOneBot11Adapter;
|
obContext: NapCatOneBot11Adapter;
|
||||||
|
|
||||||
constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
|
constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
|
||||||
@@ -40,30 +42,19 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
|
|||||||
this.core = core;
|
this.core = core;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async check(payload: unknown): Promise<BaseCheckResult> {
|
protected async check(payload: PayloadType): Promise<BaseCheckResult> {
|
||||||
if (!this.payloadSchema) {
|
if (this.payloadSchema) {
|
||||||
return { valid: true };
|
this.validate = new Ajv({ allowUnionTypes: true, useDefaults: true, coerceTypes: true }).compile(this.payloadSchema);
|
||||||
}
|
}
|
||||||
|
if (this.validate && !this.validate(payload)) {
|
||||||
try {
|
const errors = this.validate.errors as ErrorObject[];
|
||||||
// 使用 zod 验证并转换数据
|
const errorMessages = errors.map(e => `Key: ${e.instancePath.split('/').slice(1).join('.')}, Message: ${e.message}`);
|
||||||
this.payloadSchema.parse(payload);
|
|
||||||
return { valid: true };
|
|
||||||
} catch (error) {
|
|
||||||
if (error instanceof z.ZodError) {
|
|
||||||
const errorMessages = error.errors.map(e =>
|
|
||||||
`Key: ${e.path.join('.')}, Message: ${e.message}`
|
|
||||||
);
|
|
||||||
return {
|
|
||||||
valid: false,
|
|
||||||
message: errorMessages.join('\n') || '未知错误',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return {
|
return {
|
||||||
valid: false,
|
valid: false,
|
||||||
message: '验证过程中发生未知错误'
|
message: errorMessages.join('\n') ?? '未知错误',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
return { valid: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
public async handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
|
public async handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
|
||||||
@@ -95,4 +86,4 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
abstract _handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<ReturnDataType>;
|
abstract _handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<ReturnDataType>;
|
||||||
}
|
}
|
||||||
|
@@ -1,16 +1,16 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { OneBotAction } from '../OneBotAction';
|
import { OneBotAction } from '../OneBotAction';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
bot_appid: coerce.string(),
|
bot_appid: Type.String(),
|
||||||
button_id: coerce.string().default(''),
|
button_id: Type.String({ default: '' }),
|
||||||
callback_data: coerce.string().default(''),
|
callback_data: Type.String({ default: '' }),
|
||||||
msg_seq: coerce.string().default('10086'),
|
msg_seq: Type.String({ default: '10086' }),
|
||||||
});
|
});
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
|
||||||
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class ClickInlineKeyboardButton extends OneBotAction<Payload, unknown> {
|
export class ClickInlineKeyboardButton extends OneBotAction<Payload, unknown> {
|
||||||
override actionName = ActionName.ClickInlineKeyboardButton;
|
override actionName = ActionName.ClickInlineKeyboardButton;
|
||||||
@@ -25,6 +25,6 @@ export class ClickInlineKeyboardButton extends OneBotAction<Payload, unknown> {
|
|||||||
callback_data: payload.callback_data,
|
callback_data: payload.callback_data,
|
||||||
dmFlag: 0,
|
dmFlag: 0,
|
||||||
chatType: 2
|
chatType: 2
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,13 +1,13 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Type, Static } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
rawData: coerce.string(),
|
rawData: Type.String(),
|
||||||
brief: coerce.string(),
|
brief: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class CreateCollection extends OneBotAction<Payload, unknown> {
|
export class CreateCollection extends OneBotAction<Payload, unknown> {
|
||||||
override actionName = ActionName.CreateCollection;
|
override actionName = ActionName.CreateCollection;
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
import { z } from 'zod';
|
import { Type, Static } from '@sinclair/typebox';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
count: coerce.number().default(48),
|
count: Type.Union([Type.Number(), Type.String()], { default: 48 }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class FetchCustomFace extends OneBotAction<Payload, string[]> {
|
export class FetchCustomFace extends OneBotAction<Payload, string[]> {
|
||||||
override actionName = ActionName.FetchCustomFace;
|
override actionName = ActionName.FetchCustomFace;
|
||||||
|
@@ -1,17 +1,17 @@
|
|||||||
import { z } from 'zod';
|
import { Type, Static } from '@sinclair/typebox';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { MessageUnique } from '@/common/message-unique';
|
import { MessageUnique } from '@/common/message-unique';
|
||||||
import { type NTQQMsgApi } from '@/core/apis';
|
import { type NTQQMsgApi } from '@/core/apis';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
message_id: coerce.string(),
|
message_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
emojiId: coerce.string(),
|
emojiId: Type.Union([Type.Number(), Type.String()]),
|
||||||
emojiType: coerce.string(),
|
emojiType: Type.Union([Type.Number(), Type.String()]),
|
||||||
count: coerce.number().default(20),
|
count: Type.Union([Type.Number(), Type.String()], { default: 20 }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class FetchEmojiLike extends OneBotAction<Payload, Awaited<ReturnType<NTQQMsgApi['getMsgEmojiLikesList']>>> {
|
export class FetchEmojiLike extends OneBotAction<Payload, Awaited<ReturnType<NTQQMsgApi['getMsgEmojiLikesList']>>> {
|
||||||
override actionName = ActionName.FetchEmojiLike;
|
override actionName = ActionName.FetchEmojiLike;
|
||||||
@@ -23,7 +23,7 @@ export class FetchEmojiLike extends OneBotAction<Payload, Awaited<ReturnType<NTQ
|
|||||||
const msg = (await this.core.apis.MsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0];
|
const msg = (await this.core.apis.MsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0];
|
||||||
if (!msg) throw new Error('消息不存在');
|
if (!msg) throw new Error('消息不存在');
|
||||||
return await this.core.apis.MsgApi.getMsgEmojiLikesList(
|
return await this.core.apis.MsgApi.getMsgEmojiLikesList(
|
||||||
msgIdPeer.Peer, msg.msgSeq, payload.emojiId, payload.emojiType, +payload.count
|
msgIdPeer.Peer, msg.msgSeq, payload.emojiId.toString(), payload.emojiType.toString(), +payload.count
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
|
import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
|
||||||
import { z } from 'zod';
|
import { Type, Static } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
chat_type: coerce.number().default(1),
|
chat_type: Type.Union([Type.Union([Type.Number(), Type.String()])], { default: 1 }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
interface GetAiCharactersResponse {
|
interface GetAiCharactersResponse {
|
||||||
type: string;
|
type: string;
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
import { type NTQQCollectionApi } from '@/core/apis/collection';
|
import { type NTQQCollectionApi } from '@/core/apis/collection';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Type, Static } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
category: coerce.number(),
|
category: Type.Union([Type.Number(), Type.String()]),
|
||||||
count: coerce.number().default(1),
|
count: Type.Union([Type.Union([Type.Number(), Type.String()])], { default: 1 }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetCollectionList extends OneBotAction<Payload, Awaited<ReturnType<NTQQCollectionApi['getAllCollection']>>> {
|
export class GetCollectionList extends OneBotAction<Payload, Awaited<ReturnType<NTQQCollectionApi['getAllCollection']>>> {
|
||||||
override actionName = ActionName.GetCollectionList;
|
override actionName = ActionName.GetCollectionList;
|
||||||
|
@@ -1,18 +1,17 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Type, Static } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
const SchemaData = Type.Object({
|
||||||
const SchemaData = z.object({
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
group_id: coerce.string(),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetGroupInfoEx extends OneBotAction<Payload, unknown> {
|
export class GetGroupInfoEx extends OneBotAction<Payload, unknown> {
|
||||||
override actionName = ActionName.GetGroupInfoEx;
|
override actionName = ActionName.GetGroupInfoEx;
|
||||||
override payloadSchema = SchemaData;
|
override payloadSchema = SchemaData;
|
||||||
|
|
||||||
async _handle(payload: Payload) {
|
async _handle(payload: Payload) {
|
||||||
return (await this.core.apis.GroupApi.getGroupExtFE0Info([payload.group_id])).result.groupExtInfos.get(payload.group_id);
|
return (await this.core.apis.GroupApi.getGroupExtFE0Info([payload.group_id.toString()])).result.groupExtInfos.get(payload.group_id.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2,38 +2,38 @@ import { ActionName } from '@/onebot/action/router';
|
|||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { MiniAppInfo, MiniAppInfoHelper } from '@/core/packet/utils/helper/miniAppHelper';
|
import { MiniAppInfo, MiniAppInfoHelper } from '@/core/packet/utils/helper/miniAppHelper';
|
||||||
import { MiniAppData, MiniAppRawData, MiniAppReqCustomParams, MiniAppReqParams } from '@/core/packet/entities/miniApp';
|
import { MiniAppData, MiniAppRawData, MiniAppReqCustomParams, MiniAppReqParams } from '@/core/packet/entities/miniApp';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.union([
|
const SchemaData = Type.Union([
|
||||||
z.object({
|
Type.Object({
|
||||||
type: z.union([z.literal('bili'), z.literal('weibo')]),
|
type: Type.Union([Type.Literal('bili'), Type.Literal('weibo')]),
|
||||||
title: coerce.string(),
|
title: Type.String(),
|
||||||
desc: coerce.string(),
|
desc: Type.String(),
|
||||||
picUrl: coerce.string(),
|
picUrl: Type.String(),
|
||||||
jumpUrl: coerce.string(),
|
jumpUrl: Type.String(),
|
||||||
webUrl: coerce.string().optional(),
|
webUrl: Type.Optional(Type.String()),
|
||||||
rawArkData: coerce.string().optional()
|
rawArkData: Type.Optional(Type.Union([Type.String()]))
|
||||||
}),
|
}),
|
||||||
z.object({
|
Type.Object({
|
||||||
title: coerce.string(),
|
title: Type.String(),
|
||||||
desc: coerce.string(),
|
desc: Type.String(),
|
||||||
picUrl: coerce.string(),
|
picUrl: Type.String(),
|
||||||
jumpUrl: coerce.string(),
|
jumpUrl: Type.String(),
|
||||||
iconUrl: coerce.string(),
|
iconUrl: Type.String(),
|
||||||
webUrl: coerce.string().optional(),
|
webUrl: Type.Optional(Type.String()),
|
||||||
appId: coerce.string(),
|
appId: Type.String(),
|
||||||
scene: z.union([coerce.number(), coerce.string()]),
|
scene: Type.Union([Type.Number(), Type.String()]),
|
||||||
templateType: z.union([coerce.number(), coerce.string()]),
|
templateType: Type.Union([Type.Number(), Type.String()]),
|
||||||
businessType: z.union([coerce.number(), coerce.string()]),
|
businessType: Type.Union([Type.Number(), Type.String()]),
|
||||||
verType: z.union([coerce.number(), coerce.string()]),
|
verType: Type.Union([Type.Number(), Type.String()]),
|
||||||
shareType: z.union([coerce.number(), coerce.string()]),
|
shareType: Type.Union([Type.Number(), Type.String()]),
|
||||||
versionId: coerce.string(),
|
versionId: Type.String(),
|
||||||
sdkId: coerce.string(),
|
sdkId: Type.String(),
|
||||||
withShareTicket: z.union([coerce.number(), coerce.string()]),
|
withShareTicket: Type.Union([Type.Number(), Type.String()]),
|
||||||
rawArkData: coerce.string().optional()
|
rawArkData: Type.Optional(Type.Union([Type.String()]))
|
||||||
})
|
})
|
||||||
]);
|
]);
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetMiniAppArk extends GetPacketStatusDepends<Payload, {
|
export class GetMiniAppArk extends GetPacketStatusDepends<Payload, {
|
||||||
data: MiniAppData | MiniAppRawData
|
data: MiniAppData | MiniAppRawData
|
||||||
|
@@ -1,15 +1,15 @@
|
|||||||
import { NTVoteInfo } from '@/core';
|
import { NTVoteInfo } from '@/core';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Type, Static } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
user_id: coerce.string().optional(),
|
user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
||||||
start: coerce.number().default(0),
|
start: Type.Union([Type.Number(), Type.String()], { default: 0 }),
|
||||||
count: coerce.number().default(10),
|
count: Type.Union([Type.Number(), Type.String()], { default: 10 })
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetProfileLike extends OneBotAction<Payload, {
|
export class GetProfileLike extends OneBotAction<Payload, {
|
||||||
uid: string;
|
uid: string;
|
||||||
|
@@ -36,7 +36,7 @@ export class GetUnidirectionalFriendList extends OneBotAction<void, Friend[]> {
|
|||||||
uint64_uin: self_id,
|
uint64_uin: self_id,
|
||||||
uint64_top: 0,
|
uint64_top: 0,
|
||||||
uint32_req_num: 99,
|
uint32_req_num: 99,
|
||||||
bytes_cookies: ''
|
bytes_cookies: ""
|
||||||
};
|
};
|
||||||
const packed_data = await this.pack_data(JSON.stringify(req_json));
|
const packed_data = await this.pack_data(JSON.stringify(req_json));
|
||||||
const data = Buffer.from(packed_data).toString('hex');
|
const data = Buffer.from(packed_data).toString('hex');
|
||||||
|
@@ -1,18 +1,18 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
user_id: coerce.number(),
|
user_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetUserStatus extends GetPacketStatusDepends<Payload, { status: number; ext_status: number; } | undefined> {
|
export class GetUserStatus extends GetPacketStatusDepends<Payload, { status: number; ext_status: number; } | undefined> {
|
||||||
override actionName = ActionName.GetUserStatus;
|
override actionName = ActionName.GetUserStatus;
|
||||||
override payloadSchema = SchemaData;
|
override payloadSchema = SchemaData;
|
||||||
|
|
||||||
async _handle(payload: Payload) {
|
async _handle(payload: Payload) {
|
||||||
return await this.core.apis.PacketApi.pkt.operation.GetStrangerStatus(payload.user_id);
|
return await this.core.apis.PacketApi.pkt.operation.GetStrangerStatus(+payload.user_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,16 +1,16 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
file_id: coerce.string(),
|
file_id: Type.String(),
|
||||||
current_parent_directory: coerce.string(),
|
current_parent_directory: Type.String(),
|
||||||
target_parent_directory: coerce.string(),
|
target_parent_directory: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
interface MoveGroupFileResponse {
|
interface MoveGroupFileResponse {
|
||||||
ok: boolean;
|
ok: boolean;
|
||||||
|
@@ -2,14 +2,14 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { checkFileExist, uriToLocalFile } from '@/common/file';
|
import { checkFileExist, uriToLocalFile } from '@/common/file';
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { GeneralCallResultStatus } from '@/core';
|
import { GeneralCallResultStatus } from '@/core';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
image: coerce.string(),
|
image: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
class OCRImageBase extends OneBotAction<Payload, GeneralCallResultStatus> {
|
class OCRImageBase extends OneBotAction<Payload, GeneralCallResultStatus> {
|
||||||
override payloadSchema = SchemaData;
|
override payloadSchema = SchemaData;
|
||||||
|
@@ -1,16 +1,16 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
file_id: coerce.string(),
|
file_id: Type.String(),
|
||||||
current_parent_directory: coerce.string(),
|
current_parent_directory: Type.String(),
|
||||||
new_name: coerce.string(),
|
new_name: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
interface RenameGroupFileResponse {
|
interface RenameGroupFileResponse {
|
||||||
ok: boolean;
|
ok: boolean;
|
||||||
|
@@ -1,22 +1,22 @@
|
|||||||
import { PacketHexStr } from '@/core/packet/transformer/base';
|
import { PacketHexStr } from '@/core/packet/transformer/base';
|
||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
cmd: coerce.string(),
|
cmd: Type.String(),
|
||||||
data: coerce.string(),
|
data: Type.String(),
|
||||||
rsp: coerce.boolean().default(true),
|
rsp: Type.Union([Type.String(), Type.Boolean()], { default: true }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class SendPacket extends GetPacketStatusDepends<Payload, string | undefined> {
|
export class SendPacket extends GetPacketStatusDepends<Payload, string | undefined> {
|
||||||
override payloadSchema = SchemaData;
|
override payloadSchema = SchemaData;
|
||||||
override actionName = ActionName.SendPacket;
|
override actionName = ActionName.SendPacket;
|
||||||
async _handle(payload: Payload) {
|
async _handle(payload: Payload) {
|
||||||
const data = await this.core.apis.PacketApi.pkt.operation.sendPacket({ cmd: payload.cmd, data: payload.data as PacketHexStr }, payload.rsp);
|
const rsp = typeof payload.rsp === 'boolean' ? payload.rsp : payload.rsp === 'true';
|
||||||
|
const data = await this.core.apis.PacketApi.pkt.operation.sendPacket({ cmd: payload.cmd, data: payload.data as PacketHexStr }, rsp);
|
||||||
return typeof data === 'object' ? data.toString('hex') : undefined;
|
return typeof data === 'object' ? data.toString('hex') : undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
face_id: coerce.string(),// 参考 face_config.json 的 QSid
|
face_id: Type.Union([Type.Number(), Type.String()]),// 参考 face_config.json 的 QSid
|
||||||
face_type: coerce.string().default('1'),
|
face_type: Type.Union([Type.Number(), Type.String()], { default: '1' }),
|
||||||
wording: coerce.string().default(' '),
|
wording: Type.String({ default: ' ' }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class SetDiyOnlineStatus extends OneBotAction<Payload, string> {
|
export class SetDiyOnlineStatus extends OneBotAction<Payload, string> {
|
||||||
override actionName = ActionName.SetDiyOnlineStatus;
|
override actionName = ActionName.SetDiyOnlineStatus;
|
||||||
|
@@ -1,13 +1,13 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.String(),
|
||||||
remark: coerce.string(),
|
remark: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export default class SetGroupRemark extends OneBotAction<Payload, null> {
|
export default class SetGroupRemark extends OneBotAction<Payload, null> {
|
||||||
override actionName = ActionName.SetGroupRemark;
|
override actionName = ActionName.SetGroupRemark;
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
class SetGroupSignBase extends GetPacketStatusDepends<Payload, void> {
|
class SetGroupSignBase extends GetPacketStatusDepends<Payload, void> {
|
||||||
override payloadSchema = SchemaData;
|
override payloadSchema = SchemaData;
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { ChatType } from '@/core';
|
import { ChatType } from '@/core';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
user_id: coerce.string(),
|
user_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
event_type: coerce.number(),
|
event_type: Type.Number(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class SetInputStatus extends OneBotAction<Payload, unknown> {
|
export class SetInputStatus extends OneBotAction<Payload, unknown> {
|
||||||
override actionName = ActionName.SetInputStatus;
|
override actionName = ActionName.SetInputStatus;
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
longNick: coerce.string(),
|
longNick: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class SetLongNick extends OneBotAction<Payload, unknown> {
|
export class SetLongNick extends OneBotAction<Payload, unknown> {
|
||||||
override actionName = ActionName.SetLongNick;
|
override actionName = ActionName.SetLongNick;
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
status: coerce.number(),
|
status: Type.Union([Type.Number(), Type.String()]),
|
||||||
ext_status: coerce.number(),
|
ext_status: Type.Union([Type.Number(), Type.String()]),
|
||||||
battery_status: coerce.number(),
|
battery_status: Type.Union([Type.Number(), Type.String()]),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class SetOnlineStatus extends OneBotAction<Payload, null> {
|
export class SetOnlineStatus extends OneBotAction<Payload, null> {
|
||||||
override actionName = ActionName.SetOnlineStatus;
|
override actionName = ActionName.SetOnlineStatus;
|
||||||
|
@@ -2,13 +2,13 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import fs from 'node:fs/promises';
|
import fs from 'node:fs/promises';
|
||||||
import { checkFileExist, uriToLocalFile } from '@/common/file';
|
import { checkFileExist, uriToLocalFile } from '@/common/file';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
file: coerce.string(),
|
file: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export default class SetAvatar extends OneBotAction<Payload, null> {
|
export default class SetAvatar extends OneBotAction<Payload, null> {
|
||||||
override actionName = ActionName.SetQQAvatar;
|
override actionName = ActionName.SetQQAvatar;
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
user_id: coerce.string(),
|
user_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
special_title: coerce.string().default(''),
|
special_title: Type.String({ default: '' }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class SetSpecialTitle extends GetPacketStatusDepends<Payload, void> {
|
export class SetSpecialTitle extends GetPacketStatusDepends<Payload, void> {
|
||||||
override actionName = ActionName.SetSpecialTitle;
|
override actionName = ActionName.SetSpecialTitle;
|
||||||
|
@@ -1,15 +1,15 @@
|
|||||||
import { GeneralCallResult } from '@/core';
|
import { GeneralCallResult } from '@/core';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
user_id: coerce.string().optional(),
|
user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
||||||
group_id: coerce.string().optional(),
|
group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
||||||
phoneNumber: coerce.string().default(''),
|
phoneNumber: Type.String({ default: '' }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class SharePeer extends OneBotAction<Payload, GeneralCallResult & {
|
export class SharePeer extends OneBotAction<Payload, GeneralCallResult & {
|
||||||
arkMsg?: string;
|
arkMsg?: string;
|
||||||
@@ -28,11 +28,11 @@ export class SharePeer extends OneBotAction<Payload, GeneralCallResult & {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const SchemaDataGroupEx = z.object({
|
const SchemaDataGroupEx = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
});
|
});
|
||||||
|
|
||||||
type PayloadGroupEx = z.infer<typeof SchemaDataGroupEx>;
|
type PayloadGroupEx = Static<typeof SchemaDataGroupEx>;
|
||||||
|
|
||||||
export class ShareGroupEx extends OneBotAction<PayloadGroupEx, string> {
|
export class ShareGroupEx extends OneBotAction<PayloadGroupEx, string> {
|
||||||
override actionName = ActionName.ShareGroupEx;
|
override actionName = ActionName.ShareGroupEx;
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
file_id: coerce.string(),
|
file_id: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
interface TransGroupFileResponse {
|
interface TransGroupFileResponse {
|
||||||
ok: boolean;
|
ok: boolean;
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
words: z.array(coerce.string()),
|
words: Type.Array(Type.String()),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class TranslateEnWordToZn extends OneBotAction<Payload, Array<unknown> | null> {
|
export class TranslateEnWordToZn extends OneBotAction<Payload, Array<unknown> | null> {
|
||||||
override actionName = ActionName.TranslateEnWordToZn;
|
override actionName = ActionName.TranslateEnWordToZn;
|
||||||
|
@@ -3,8 +3,8 @@ import fs from 'fs/promises';
|
|||||||
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { OB11MessageImage, OB11MessageVideo } from '@/onebot/types';
|
import { OB11MessageImage, OB11MessageVideo } from '@/onebot/types';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
export interface GetFileResponse {
|
export interface GetFileResponse {
|
||||||
file?: string; // path
|
file?: string; // path
|
||||||
url?: string;
|
url?: string;
|
||||||
@@ -13,13 +13,13 @@ export interface GetFileResponse {
|
|||||||
base64?: string;
|
base64?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const GetFileBase_PayloadSchema = z.object({
|
const GetFileBase_PayloadSchema = Type.Object({
|
||||||
file: coerce.string().optional(),
|
file: Type.Optional(Type.String()),
|
||||||
file_id: coerce.string().optional(),
|
file_id: Type.Optional(Type.String())
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
export type GetFilePayload = z.infer<typeof GetFileBase_PayloadSchema>;
|
export type GetFilePayload = Static<typeof GetFileBase_PayloadSchema>;
|
||||||
|
|
||||||
export class GetFileBase extends OneBotAction<GetFilePayload, GetFileResponse> {
|
export class GetFileBase extends OneBotAction<GetFilePayload, GetFileResponse> {
|
||||||
override payloadSchema = GetFileBase_PayloadSchema;
|
override payloadSchema = GetFileBase_PayloadSchema;
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
file_id: coerce.string(),
|
file_id: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
interface GetGroupFileUrlResponse {
|
interface GetGroupFileUrlResponse {
|
||||||
url?: string;
|
url?: string;
|
||||||
|
@@ -1,13 +1,13 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
file_id: coerce.string(),
|
file_id: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
interface GetPrivateFileUrlResponse {
|
interface GetPrivateFileUrlResponse {
|
||||||
url?: string;
|
url?: string;
|
||||||
|
@@ -1,13 +1,13 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
folder_name: coerce.string(),
|
folder_name: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
interface ResponseType{
|
interface ResponseType{
|
||||||
result:unknown;
|
result:unknown;
|
||||||
groupItem:unknown;
|
groupItem:unknown;
|
||||||
|
@@ -2,15 +2,15 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
import { FileNapCatOneBotUUID } from '@/common/file-uuid';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { NTQQGroupApi } from '@/core/apis';
|
import { NTQQGroupApi } from '@/core/apis';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
file_id: coerce.string(),
|
file_id: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class DeleteGroupFile extends OneBotAction<Payload, Awaited<ReturnType<NTQQGroupApi['delGroupFile']>>> {
|
export class DeleteGroupFile extends OneBotAction<Payload, Awaited<ReturnType<NTQQGroupApi['delGroupFile']>>> {
|
||||||
override actionName = ActionName.GOCQHTTP_DeleteGroupFile;
|
override actionName = ActionName.GOCQHTTP_DeleteGroupFile;
|
||||||
|
@@ -1,15 +1,15 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { NTQQGroupApi } from '@/core/apis';
|
import { NTQQGroupApi } from '@/core/apis';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
folder_id: coerce.string().optional(),
|
folder_id: Type.Optional(Type.String()),
|
||||||
folder: coerce.string().optional(),
|
folder: Type.Optional(Type.String()),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class DeleteGroupFileFolder extends OneBotAction<Payload, Awaited<ReturnType<NTQQGroupApi['delGroupFileFolder']>>['groupFileCommonResult']> {
|
export class DeleteGroupFileFolder extends OneBotAction<Payload, Awaited<ReturnType<NTQQGroupApi['delGroupFileFolder']>>['groupFileCommonResult']> {
|
||||||
override actionName = ActionName.GoCQHTTP_DeleteGroupFileFolder;
|
override actionName = ActionName.GoCQHTTP_DeleteGroupFileFolder;
|
||||||
|
@@ -4,20 +4,20 @@ import fs from 'fs';
|
|||||||
import { join as joinPath } from 'node:path';
|
import { join as joinPath } from 'node:path';
|
||||||
import { calculateFileMD5, uriToLocalFile } from '@/common/file';
|
import { calculateFileMD5, uriToLocalFile } from '@/common/file';
|
||||||
import { randomUUID } from 'crypto';
|
import { randomUUID } from 'crypto';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
interface FileResponse {
|
interface FileResponse {
|
||||||
file: string;
|
file: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
url: coerce.string().optional(),
|
url: Type.Optional(Type.String()),
|
||||||
base64: coerce.string().optional(),
|
base64: Type.Optional(Type.String()),
|
||||||
name: coerce.string().optional(),
|
name: Type.Optional(Type.String()),
|
||||||
headers: z.union([coerce.string(), z.array(coerce.string())]).optional(),
|
headers: Type.Optional(Type.Union([Type.String(), Type.Array(Type.String())])),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export default class GoCQHTTPDownloadFile extends OneBotAction<Payload, FileResponse> {
|
export default class GoCQHTTPDownloadFile extends OneBotAction<Payload, FileResponse> {
|
||||||
override actionName = ActionName.GoCQHTTP_DownloadFile;
|
override actionName = ActionName.GoCQHTTP_DownloadFile;
|
||||||
|
@@ -2,16 +2,16 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
|
|||||||
import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward, OB11MessageNodePlain as OB11MessageNode } from '@/onebot';
|
import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward, OB11MessageNodePlain as OB11MessageNode } from '@/onebot';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { MessageUnique } from '@/common/message-unique';
|
import { MessageUnique } from '@/common/message-unique';
|
||||||
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { ChatType, ElementType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
|
import { ChatType, ElementType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
|
||||||
import { z } from 'zod';
|
|
||||||
import { isNumeric } from '@/common/helper';
|
import { isNumeric } from '@/common/helper';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
|
||||||
message_id: coerce.string().optional(),
|
|
||||||
id: coerce.string().optional(),
|
|
||||||
});
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
|
||||||
|
|
||||||
|
const SchemaData = Type.Object({
|
||||||
|
message_id: Type.Optional(Type.String()),
|
||||||
|
id: Type.Optional(Type.String()),
|
||||||
|
});
|
||||||
|
|
||||||
|
type Payload = Static<typeof SchemaData>;
|
||||||
export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
|
export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
|
||||||
messages: OB11Message[] | undefined;
|
messages: OB11Message[] | undefined;
|
||||||
}> {
|
}> {
|
||||||
|
@@ -3,22 +3,22 @@ import { OB11Message } from '@/onebot';
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { ChatType } from '@/core/types';
|
import { ChatType } from '@/core/types';
|
||||||
import { MessageUnique } from '@/common/message-unique';
|
import { MessageUnique } from '@/common/message-unique';
|
||||||
import { z } from 'zod';
|
|
||||||
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { NetworkAdapterConfig } from '@/onebot/config/config';
|
import { NetworkAdapterConfig } from '@/onebot/config/config';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
|
|
||||||
interface Response {
|
interface Response {
|
||||||
messages: OB11Message[];
|
messages: OB11Message[];
|
||||||
}
|
}
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
user_id: coerce.string(),
|
user_id: Type.String(),
|
||||||
message_seq: coerce.string().optional(),
|
message_seq: Type.Optional(Type.String()),
|
||||||
count: coerce.number().default(20),
|
count: Type.Number({ default: 20 }),
|
||||||
reverseOrder: coerce.boolean().default(false)
|
reverseOrder: Type.Boolean({ default: false })
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export default class GetFriendMsgHistory extends OneBotAction<Payload, Response> {
|
export default class GetFriendMsgHistory extends OneBotAction<Payload, Response> {
|
||||||
override actionName = ActionName.GetFriendMsgHistory;
|
override actionName = ActionName.GetFriendMsgHistory;
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string()
|
group_id: Type.Union([Type.Number(), Type.String()])
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
interface ResponseType {
|
interface ResponseType {
|
||||||
can_at_all: boolean;
|
can_at_all: boolean;
|
||||||
remain_at_all_count_for_group: number;
|
remain_at_all_count_for_group: number;
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string()
|
group_id: Type.Union([Type.Number(), Type.String()])
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetGroupFileSystemInfo extends OneBotAction<Payload, {
|
export class GetGroupFileSystemInfo extends OneBotAction<Payload, {
|
||||||
file_count: number,
|
file_count: number,
|
||||||
|
@@ -2,16 +2,16 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { OB11Construct } from '@/onebot/helper/data';
|
import { OB11Construct } from '@/onebot/helper/data';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
folder_id: coerce.string().optional(),
|
folder_id: Type.Optional(Type.String()),
|
||||||
folder: coerce.string().optional(),
|
folder: Type.Optional(Type.String()),
|
||||||
file_count: coerce.number().default(50),
|
file_count: Type.Union([Type.Number(), Type.String()], { default: 50 }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetGroupFilesByFolder extends OneBotAction<Payload, {
|
export class GetGroupFilesByFolder extends OneBotAction<Payload, {
|
||||||
files: ReturnType<typeof OB11Construct.file>[],
|
files: ReturnType<typeof OB11Construct.file>[],
|
||||||
|
@@ -1,16 +1,16 @@
|
|||||||
import { WebHonorType } from '@/core';
|
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { WebHonorType } from '@/core/types';
|
||||||
import { coerce } from '@/common/coerce';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
const SchemaData = z.object({
|
|
||||||
group_id: coerce.string(),
|
const SchemaData = Type.Object({
|
||||||
type: z.nativeEnum(WebHonorType).optional()
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
|
type: Type.Optional(Type.Enum(WebHonorType))
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetGroupHonorInfo extends OneBotAction<Payload, unknown> {
|
export class GetGroupHonorInfo extends OneBotAction<Payload, Array<unknown>> {
|
||||||
override actionName = ActionName.GetGroupHonorInfo;
|
override actionName = ActionName.GetGroupHonorInfo;
|
||||||
override payloadSchema = SchemaData;
|
override payloadSchema = SchemaData;
|
||||||
|
|
||||||
|
@@ -3,23 +3,22 @@ import { OB11Message } from '@/onebot';
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { ChatType, Peer } from '@/core/types';
|
import { ChatType, Peer } from '@/core/types';
|
||||||
import { MessageUnique } from '@/common/message-unique';
|
import { MessageUnique } from '@/common/message-unique';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { NetworkAdapterConfig } from '@/onebot/config/config';
|
import { NetworkAdapterConfig } from '@/onebot/config/config';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
|
|
||||||
interface Response {
|
interface Response {
|
||||||
messages: OB11Message[];
|
messages: OB11Message[];
|
||||||
}
|
}
|
||||||
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.String(),
|
||||||
message_seq: coerce.string().optional(),
|
message_seq: Type.Optional(Type.String()),
|
||||||
count: coerce.number().default(20),
|
count: Type.Number({ default: 20 }),
|
||||||
reverseOrder: coerce.boolean().default(false)
|
reverseOrder: Type.Boolean({ default: false })
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
|
|
||||||
export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Response> {
|
export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Response> {
|
||||||
|
@@ -3,14 +3,14 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot';
|
import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot';
|
||||||
import { OB11Construct } from '@/onebot/helper/data';
|
import { OB11Construct } from '@/onebot/helper/data';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
file_count: coerce.number().default(50),
|
file_count: Type.Union([Type.Number(), Type.String()], { default: 50 }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetGroupRootFiles extends OneBotAction<Payload, {
|
export class GetGroupRootFiles extends OneBotAction<Payload, {
|
||||||
files: OB11GroupFile[],
|
files: OB11GroupFile[],
|
||||||
|
@@ -3,15 +3,14 @@ import { OB11User, OB11UserSex } from '@/onebot';
|
|||||||
import { OB11Construct } from '@/onebot/helper/data';
|
import { OB11Construct } from '@/onebot/helper/data';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { calcQQLevel } from '@/common/helper';
|
import { calcQQLevel } from '@/common/helper';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
user_id: coerce.string(),
|
user_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
no_cache: coerce.boolean().default(false),
|
no_cache: Type.Union([Type.Boolean(), Type.String()], { default: false }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11User & { uid: string }> {
|
export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11User & { uid: string }> {
|
||||||
override actionName = ActionName.GoCQHTTP_GetStrangerInfo;
|
override actionName = ActionName.GoCQHTTP_GetStrangerInfo;
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
url: coerce.string(),
|
url: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GoCQHTTPCheckUrlSafely extends OneBotAction<Payload, { level: number }> {
|
export class GoCQHTTPCheckUrlSafely extends OneBotAction<Payload, { level: number }> {
|
||||||
override actionName = ActionName.GoCQHTTP_CheckUrlSafely;
|
override actionName = ActionName.GoCQHTTP_CheckUrlSafely;
|
||||||
|
@@ -1,16 +1,15 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
friend_id: coerce.string().optional(),
|
friend_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
|
||||||
user_id: coerce.string().optional(),
|
user_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
|
||||||
temp_block: coerce.boolean().optional(),
|
temp_block: Type.Optional(Type.Boolean()),
|
||||||
temp_both_del: coerce.boolean().optional(),
|
temp_both_del: Type.Optional(Type.Boolean()),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GoCQHTTPDeleteFriend extends OneBotAction<Payload, unknown> {
|
export class GoCQHTTPDeleteFriend extends OneBotAction<Payload, unknown> {
|
||||||
override actionName = ActionName.GoCQHTTP_DeleteFriend;
|
override actionName = ActionName.GoCQHTTP_DeleteFriend;
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
model: coerce.string(),
|
model: Type.Optional(Type.String()),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GoCQHTTPGetModelShow extends OneBotAction<Payload, Array<{
|
export class GoCQHTTPGetModelShow extends OneBotAction<Payload, Array<{
|
||||||
variants: {
|
variants: {
|
||||||
|
@@ -2,20 +2,20 @@ import { checkFileExist, uriToLocalFile } from '@/common/file';
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { unlink } from 'node:fs/promises';
|
import { unlink } from 'node:fs/promises';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
content: coerce.string(),
|
content: Type.String(),
|
||||||
image: coerce.string().optional(),
|
image: Type.Optional(Type.String()),
|
||||||
pinned: coerce.number().default(0),
|
pinned: Type.Union([Type.Number(), Type.String()], { default: 0 }),
|
||||||
type: coerce.number().default(1),
|
type: Type.Union([Type.Number(), Type.String()], { default: 1 }),
|
||||||
confirm_required: coerce.number().default(1),
|
confirm_required: Type.Union([Type.Number(), Type.String()], { default: 1 }),
|
||||||
is_show_edit_card: coerce.number().default(0),
|
is_show_edit_card: Type.Union([Type.Number(), Type.String()], { default: 0 }),
|
||||||
tip_window_type: coerce.number().default(0),
|
tip_window_type: Type.Union([Type.Number(), Type.String()], { default: 0 })
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class SendGroupNotice extends OneBotAction<Payload, null> {
|
export class SendGroupNotice extends OneBotAction<Payload, null> {
|
||||||
override actionName = ActionName.GoCQHTTP_SendGroupNotice;
|
override actionName = ActionName.GoCQHTTP_SendGroupNotice;
|
||||||
|
@@ -1,16 +1,15 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { checkFileExistV2, uriToLocalFile } from '@/common/file';
|
import { checkFileExistV2, uriToLocalFile } from '@/common/file';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import fs from 'node:fs/promises';
|
import fs from 'node:fs/promises';
|
||||||
import { GeneralCallResult } from '@/core';
|
import { GeneralCallResult } from '@/core';
|
||||||
import { coerce } from '@/common/coerce';
|
const SchemaData = Type.Object({
|
||||||
const SchemaData = z.object({
|
file: Type.String(),
|
||||||
file: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()])
|
||||||
group_id: coerce.string()
|
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export default class SetGroupPortrait extends OneBotAction<Payload, GeneralCallResult> {
|
export default class SetGroupPortrait extends OneBotAction<Payload, GeneralCallResult> {
|
||||||
override actionName = ActionName.SetGroupPortrait;
|
override actionName = ActionName.SetGroupPortrait;
|
||||||
|
@@ -1,15 +1,15 @@
|
|||||||
import { NTQQUserApi } from '@/core/apis';
|
import { NTQQUserApi } from '@/core/apis';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
nickname: coerce.string(),
|
nickname: Type.String(),
|
||||||
personal_note: coerce.string().optional(),
|
personal_note: Type.Optional(Type.String()),
|
||||||
sex: coerce.string().optional(), // 传Sex值?建议传0
|
sex: Type.Optional(Type.Union([Type.Number(), Type.String()])), // 传Sex值?建议传0
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
export class SetQQProfile extends OneBotAction<Payload, Awaited<ReturnType<NTQQUserApi['modifySelfProfile']>> | null> {
|
export class SetQQProfile extends OneBotAction<Payload, Awaited<ReturnType<NTQQUserApi['modifySelfProfile']>> | null> {
|
||||||
override actionName = ActionName.SetQQProfile;
|
override actionName = ActionName.SetQQProfile;
|
||||||
override payloadSchema = SchemaData;
|
override payloadSchema = SchemaData;
|
||||||
|
@@ -4,17 +4,17 @@ import { ChatType, Peer } from '@/core/types';
|
|||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
import { uriToLocalFile } from '@/common/file';
|
import { uriToLocalFile } from '@/common/file';
|
||||||
import { SendMessageContext } from '@/onebot/api';
|
import { SendMessageContext } from '@/onebot/api';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
file: coerce.string(),
|
file: Type.String(),
|
||||||
name: coerce.string(),
|
name: Type.String(),
|
||||||
folder: coerce.string().optional(),
|
folder: Type.Optional(Type.String()),
|
||||||
folder_id: coerce.string().optional(),//临时扩展
|
folder_id: Type.Optional(Type.String()),//临时扩展
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export default class GoCQHTTPUploadGroupFile extends OneBotAction<Payload, null> {
|
export default class GoCQHTTPUploadGroupFile extends OneBotAction<Payload, null> {
|
||||||
override actionName = ActionName.GoCQHTTP_UploadGroupFile;
|
override actionName = ActionName.GoCQHTTP_UploadGroupFile;
|
||||||
@@ -38,6 +38,7 @@ export default class GoCQHTTPUploadGroupFile extends OneBotAction<Payload, null>
|
|||||||
deleteAfterSentFiles: []
|
deleteAfterSentFiles: []
|
||||||
};
|
};
|
||||||
const sendFileEle = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name, payload.folder ?? payload.folder_id);
|
const sendFileEle = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name, payload.folder ?? payload.folder_id);
|
||||||
|
msgContext.deleteAfterSentFiles.push(downloadResult.path);
|
||||||
await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, [sendFileEle], msgContext.deleteAfterSentFiles);
|
await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, [sendFileEle], msgContext.deleteAfterSentFiles);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@@ -5,15 +5,15 @@ import fs from 'fs';
|
|||||||
import { uriToLocalFile } from '@/common/file';
|
import { uriToLocalFile } from '@/common/file';
|
||||||
import { SendMessageContext } from '@/onebot/api';
|
import { SendMessageContext } from '@/onebot/api';
|
||||||
import { ContextMode, createContext } from '@/onebot/action/msg/SendMsg';
|
import { ContextMode, createContext } from '@/onebot/action/msg/SendMsg';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
user_id: coerce.string(),
|
user_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
file: coerce.string(),
|
file: Type.String(),
|
||||||
name: coerce.string(),
|
name: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, null> {
|
export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, null> {
|
||||||
override actionName = ActionName.GOCQHTTP_UploadPrivateFile;
|
override actionName = ActionName.GOCQHTTP_UploadPrivateFile;
|
||||||
@@ -23,7 +23,7 @@ export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, nul
|
|||||||
if (payload.user_id) {
|
if (payload.user_id) {
|
||||||
const peerUid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
|
const peerUid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
|
||||||
if (!peerUid) {
|
if (!peerUid) {
|
||||||
throw new Error( `私聊${payload.user_id}不存在`);
|
throw new Error(`私聊${payload.user_id}不存在`);
|
||||||
}
|
}
|
||||||
const isBuddy = await this.core.apis.FriendApi.isBuddy(peerUid);
|
const isBuddy = await this.core.apis.FriendApi.isBuddy(peerUid);
|
||||||
return { chatType: isBuddy ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid };
|
return { chatType: isBuddy ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid };
|
||||||
@@ -48,6 +48,7 @@ export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, nul
|
|||||||
deleteAfterSentFiles: []
|
deleteAfterSentFiles: []
|
||||||
};
|
};
|
||||||
const sendFileEle: SendFileElement = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name);
|
const sendFileEle: SendFileElement = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name);
|
||||||
|
msgContext.deleteAfterSentFiles.push(downloadResult.path);
|
||||||
await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(await this.getPeer(payload), [sendFileEle], msgContext.deleteAfterSentFiles);
|
await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(await this.getPeer(payload), [sendFileEle], msgContext.deleteAfterSentFiles);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@@ -1,13 +1,13 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { MessageUnique } from '@/common/message-unique';
|
import { MessageUnique } from '@/common/message-unique';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
message_id: coerce.string(),
|
message_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
export default class DelEssenceMsg extends OneBotAction<Payload, unknown> {
|
export default class DelEssenceMsg extends OneBotAction<Payload, unknown> {
|
||||||
override actionName = ActionName.DelEssenceMsg;
|
override actionName = ActionName.DelEssenceMsg;
|
||||||
override payloadSchema = SchemaData;
|
override payloadSchema = SchemaData;
|
||||||
@@ -16,7 +16,7 @@ export default class DelEssenceMsg extends OneBotAction<Payload, unknown> {
|
|||||||
const msg = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id);
|
const msg = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id);
|
||||||
if (!msg) {
|
if (!msg) {
|
||||||
const data = this.core.apis.GroupApi.essenceLRU.getValue(+payload.message_id);
|
const data = this.core.apis.GroupApi.essenceLRU.getValue(+payload.message_id);
|
||||||
if (!data) throw new Error('消息不存在');
|
if(!data) throw new Error('消息不存在');
|
||||||
const { msg_seq, msg_random, group_id } = JSON.parse(data) as { msg_seq: string, msg_random: string, group_id: string };
|
const { msg_seq, msg_random, group_id } = JSON.parse(data) as { msg_seq: string, msg_random: string, group_id: string };
|
||||||
return await this.core.apis.GroupApi.removeGroupEssenceBySeq(group_id, msg_seq, msg_random);
|
return await this.core.apis.GroupApi.removeGroupEssenceBySeq(group_id, msg_seq, msg_random);
|
||||||
}
|
}
|
||||||
|
@@ -1,13 +1,13 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
notice_id: coerce.string()
|
notice_id: Type.String()
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class DelGroupNotice extends OneBotAction<Payload, void> {
|
export class DelGroupNotice extends OneBotAction<Payload, void> {
|
||||||
override actionName = ActionName.DelGroupNotice;
|
override actionName = ActionName.DelGroupNotice;
|
||||||
|
@@ -1,15 +1,15 @@
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
|
||||||
import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
|
import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
character: coerce.string(),
|
character: Type.String(),
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
text: coerce.string(),
|
text: Type.String(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetAiRecord extends GetPacketStatusDepends<Payload, string> {
|
export class GetAiRecord extends GetPacketStatusDepends<Payload, string> {
|
||||||
override actionName = ActionName.GetAiRecord;
|
override actionName = ActionName.GetAiRecord;
|
||||||
|
@@ -3,14 +3,14 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
|
|||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { MessageUnique } from '@/common/message-unique';
|
import { MessageUnique } from '@/common/message-unique';
|
||||||
import crypto from 'crypto';
|
import crypto from 'crypto';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { NetworkAdapterConfig } from '@/onebot/config/config';
|
import { NetworkAdapterConfig } from '@/onebot/config/config';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetGroupEssence extends OneBotAction<Payload, unknown> {
|
export class GetGroupEssence extends OneBotAction<Payload, unknown> {
|
||||||
override actionName = ActionName.GoCQHTTP_GetEssenceMsg;
|
override actionName = ActionName.GoCQHTTP_GetEssenceMsg;
|
||||||
|
@@ -2,13 +2,13 @@ import { OB11Group } from '@/onebot';
|
|||||||
import { OB11Construct } from '@/onebot/helper/data';
|
import { OB11Construct } from '@/onebot/helper/data';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
|
class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
|
||||||
override actionName = ActionName.GetGroupInfo;
|
override actionName = ActionName.GetGroupInfo;
|
||||||
|
@@ -2,14 +2,13 @@ import { OB11Group } from '@/onebot';
|
|||||||
import { OB11Construct } from '@/onebot/helper/data';
|
import { OB11Construct } from '@/onebot/helper/data';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
no_cache: coerce.boolean().default(false),
|
no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
class GetGroupList extends OneBotAction<Payload, OB11Group[]> {
|
class GetGroupList extends OneBotAction<Payload, OB11Group[]> {
|
||||||
override actionName = ActionName.GetGroupList;
|
override actionName = ActionName.GetGroupList;
|
||||||
|
@@ -2,16 +2,15 @@ import { OB11GroupMember } from '@/onebot';
|
|||||||
import { OB11Construct } from '@/onebot/helper/data';
|
import { OB11Construct } from '@/onebot/helper/data';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
user_id: coerce.string(),
|
user_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
no_cache: coerce.boolean().default(false),
|
no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
|
class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
|
||||||
override actionName = ActionName.GetGroupMemberInfo;
|
override actionName = ActionName.GetGroupMemberInfo;
|
||||||
|
@@ -2,16 +2,15 @@ import { OB11GroupMember } from '@/onebot';
|
|||||||
import { OB11Construct } from '@/onebot/helper/data';
|
import { OB11Construct } from '@/onebot/helper/data';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { GroupMember } from '@/core';
|
import { GroupMember } from '@/core';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
no_cache: coerce.boolean().default(false)
|
no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]> {
|
export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]> {
|
||||||
override actionName = ActionName.GetGroupMemberList;
|
override actionName = ActionName.GetGroupMemberList;
|
||||||
|
@@ -1,8 +1,7 @@
|
|||||||
import { WebApiGroupNoticeFeed } from '@/core';
|
import { WebApiGroupNoticeFeed } from '@/core';
|
||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { z } from 'zod';
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
import { coerce } from '@/common/coerce';
|
|
||||||
interface GroupNotice {
|
interface GroupNotice {
|
||||||
sender_id: number;
|
sender_id: number;
|
||||||
publish_time: number;
|
publish_time: number;
|
||||||
@@ -17,11 +16,11 @@ interface GroupNotice {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const SchemaData = z.object({
|
const SchemaData = Type.Object({
|
||||||
group_id: coerce.string(),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = z.infer<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
type ApiGroupNotice = GroupNotice & WebApiGroupNoticeFeed;
|
type ApiGroupNotice = GroupNotice & WebApiGroupNoticeFeed;
|
||||||
|
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user