mirror of https://github.com/Nofated095/Q2TG.git
deps: bump version
This commit is contained in:
parent
242786177f
commit
bffde61890
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"github-actions.workflows.pinned.workflows": [
|
||||
".github/workflows/main.yml"
|
||||
]
|
||||
}
|
|
@ -15,21 +15,21 @@
|
|||
"devDependencies": {
|
||||
"@types/cli-progress": "^3.11.5",
|
||||
"@types/date-and-time": "^3.0.3",
|
||||
"@types/dockerode": "^3.3.26",
|
||||
"@types/dockerode": "^3.3.29",
|
||||
"@types/ejs": "^3.1.5",
|
||||
"@types/fluent-ffmpeg": "^2.1.24",
|
||||
"@types/lodash": "^4.17.0",
|
||||
"@types/lodash": "^4.17.1",
|
||||
"@types/markdown-escape": "^1.1.3",
|
||||
"@types/node": "^20.11.28",
|
||||
"@types/node": "^20.12.8",
|
||||
"@types/probe-image-size": "^7.2.4",
|
||||
"@types/prompts": "^2.4.9",
|
||||
"tsx": "^4.7.1"
|
||||
"tsx": "^4.9.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fastify/http-proxy": "^9.4.0",
|
||||
"@fastify/static": "^7.0.1",
|
||||
"@icqqjs/icqq": "1.1.3",
|
||||
"@prisma/client": "5.9.1",
|
||||
"@fastify/http-proxy": "^9.5.0",
|
||||
"@fastify/static": "^7.0.3",
|
||||
"@icqqjs/icqq": "1.2.0",
|
||||
"@prisma/client": "5.13.0",
|
||||
"axios": "^1.6.8",
|
||||
"baidu-aip-sdk": "^4.16.15",
|
||||
"big-integer": "^1.6.52",
|
||||
|
@ -37,7 +37,7 @@
|
|||
"date-and-time": "^3.1.1",
|
||||
"dockerode": "^4.0.2",
|
||||
"dotenv": "^16.4.5",
|
||||
"ejs": "^3.1.9",
|
||||
"ejs": "^3.1.10",
|
||||
"eviltransform": "^0.2.2",
|
||||
"fastify": "^4.26.2",
|
||||
"file-type": "^19.0.0",
|
||||
|
@ -47,17 +47,17 @@
|
|||
"log4js": "^6.9.1",
|
||||
"markdown-escape": "^2.0.0",
|
||||
"nodejs-base64": "^2.0.0",
|
||||
"prisma": "5.9.1",
|
||||
"prisma": "5.13.0",
|
||||
"probe-image-size": "^7.2.3",
|
||||
"prompts": "^2.4.2",
|
||||
"quote-api": "https://github.com/Clansty/quote-api/archive/014b21138afbbe0e12c91b00561414b1e851fc0f.tar.gz",
|
||||
"sharp": "^0.33.2",
|
||||
"sharp": "^0.33.3",
|
||||
"silk-sdk": "^0.2.2",
|
||||
"telegram": "https://github.com/clansty/gramjs/releases/download/2.19.10%2Brevert_media/telegram-2.19.10.tgz",
|
||||
"tmp-promise": "^3.0.3",
|
||||
"undici": "^6.9.0",
|
||||
"undici": "^6.15.0",
|
||||
"zincsearch-node": "^2.1.1",
|
||||
"zod": "^3.22.4"
|
||||
"zod": "^3.23.6"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^14.13.1 || >=16.0.0"
|
||||
|
|
|
@ -229,15 +229,4 @@ export default class OicqClient extends Client {
|
|||
resid,
|
||||
};
|
||||
}
|
||||
|
||||
public async makeLongMsg(message: Sendable): Promise<LongMsgElem> {
|
||||
const forward = await this.makeForwardMsgSelf({
|
||||
message,
|
||||
user_id: this.uin,
|
||||
});
|
||||
return {
|
||||
type: 'longmsg',
|
||||
resId: forward.resid,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -806,7 +806,7 @@ export default class ForwardService {
|
|||
let messageToSend: Sendable = chainableElements;
|
||||
if (chainableElements.some(it => typeof it === 'object' && it.type === 'markdown')) {
|
||||
this.log.debug(chainableElements);
|
||||
messageToSend = await this.instance.oicq.makeLongMsg(chainableElements);
|
||||
messageToSend = await pair.qq.uploadLongMsg(chainableElements);
|
||||
}
|
||||
qqMessages.push({
|
||||
...await pair.qq.sendMsg(messageToSend, source),
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
"build": "pnpm run --stream --parallel build"
|
||||
},
|
||||
"devDependencies": {
|
||||
"typescript": "^5.4.2"
|
||||
"typescript": "^5.4.5"
|
||||
},
|
||||
"pnpm": {
|
||||
"patchedDependencies": {
|
||||
"@icqqjs/icqq@1.1.3": "patches/@icqqjs__icqq@1.1.3.patch"
|
||||
"@icqqjs/icqq@1.2.0": "patches/@icqqjs__icqq@1.2.0.patch"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,110 +0,0 @@
|
|||
diff --git a/lib/message/converter.d.ts b/lib/message/converter.d.ts
|
||||
index 599b17b7cf4bb2a556f4dde36ef0597b3778357f..3c360ac7e80a00c9f43de71c582a45f8bfc7738d 100644
|
||||
--- a/lib/message/converter.d.ts
|
||||
+++ b/lib/message/converter.d.ts
|
||||
@@ -55,6 +55,7 @@ export declare class Converter {
|
||||
private mirai;
|
||||
private file;
|
||||
private reply;
|
||||
+ private longmsg;
|
||||
/** 转换为分片消息 */
|
||||
toFragments(): Uint8Array[];
|
||||
private _divideText;
|
||||
diff --git a/lib/message/converter.js b/lib/message/converter.js
|
||||
index fea96dfe79cc6a30e9d366a28534ba9dfba47850..d600bc7e4c1b344b714ad9733c5d76bff4c25b1d 100644
|
||||
--- a/lib/message/converter.js
|
||||
+++ b/lib/message/converter.js
|
||||
@@ -93,7 +93,7 @@ class Converter {
|
||||
return;
|
||||
}
|
||||
if (qq === "all") {
|
||||
- var q = 0, flag = 1, display = "全体成员";
|
||||
+ var q = 0, flag = 1, display = text || "全体成员";
|
||||
}
|
||||
else {
|
||||
var q = Number(qq), flag = 0, display = text || String(qq);
|
||||
@@ -103,7 +103,6 @@ class Converter {
|
||||
display = member?.card || member?.nickname || display;
|
||||
}
|
||||
}
|
||||
- display = "@" + display;
|
||||
if (dummy)
|
||||
return this._text(display);
|
||||
const buf = Buffer.allocUnsafe(6);
|
||||
@@ -451,6 +450,15 @@ class Converter {
|
||||
});
|
||||
this.brief += data;
|
||||
}
|
||||
+ longmsg(elem) {
|
||||
+ const { resId } = elem;
|
||||
+ this.elems.push({
|
||||
+ 37: {
|
||||
+ 6: 1,
|
||||
+ 7: resId
|
||||
+ }
|
||||
+ });
|
||||
+ }
|
||||
file(elem) {
|
||||
throw new Error("暂不支持发送或转发file元素,请调用文件相关API完成该操作");
|
||||
}
|
||||
diff --git a/lib/message/elements.d.ts b/lib/message/elements.d.ts
|
||||
index 3bfa7465fe2fa1a2f1aeafe054cb590bf0ed68f0..22976e83d0b747fbceb6e8b8f09ece1eefe808aa 100644
|
||||
--- a/lib/message/elements.d.ts
|
||||
+++ b/lib/message/elements.d.ts
|
||||
@@ -184,6 +184,10 @@ export interface ButtonElem {
|
||||
}[];
|
||||
};
|
||||
}
|
||||
+export interface LongMsgElem {
|
||||
+ type: "longmsg";
|
||||
+ resId: string;
|
||||
+}
|
||||
export interface Button {
|
||||
/** 按钮ID:在一个keyboard消息内设置唯一 */
|
||||
id?: string;
|
||||
@@ -290,7 +294,7 @@ export interface ForwardNode extends Forwardable {
|
||||
export type ChainElem = TextElem | FaceElem | BfaceElem | MfaceElem | ImageElem | AtElem | MiraiElem | ReplyElem | ForwardNode | QuoteElem | MarkdownElem | ButtonElem;
|
||||
export declare const ChainElemTypes: ChainElem["type"][];
|
||||
/** 注意:只有`ChainElem`中的元素可以组合发送,其他元素只能单独发送 */
|
||||
-export type MessageElem = TextElem | FaceElem | BfaceElem | MfaceElem | ImageElem | AtElem | MiraiElem | ReplyElem | FlashElem | PttElem | VideoElem | JsonElem | XmlElem | PokeElem | LocationElem | ShareElem | MusicElem | FileElem | ForwardNode | QuoteElem | MarkdownElem | ButtonElem;
|
||||
+export type MessageElem = TextElem | FaceElem | BfaceElem | MfaceElem | ImageElem | AtElem | MiraiElem | ReplyElem | FlashElem | PttElem | VideoElem | JsonElem | XmlElem | PokeElem | LocationElem | ShareElem | MusicElem | FileElem | ForwardNode | QuoteElem | MarkdownElem | ButtonElem | LongMsgElem;
|
||||
/** 可通过`sendMsg`发送的类型集合 (字符串、元素对象,或它们的数组) */
|
||||
export type Sendable = string | MessageElem | (string | MessageElem)[];
|
||||
/** 用于构造消息元素 */
|
||||
@@ -323,6 +327,7 @@ export declare const segment: {
|
||||
xml(data: string, id?: number): XmlElem;
|
||||
markdown(content: string): MarkdownElem;
|
||||
button(content: ButtonElem["content"]): ButtonElem;
|
||||
+ longmsg(resId: string): LongMsgElem;
|
||||
/** 一种特殊消息(官方客户端无法解析) */
|
||||
mirai(data: string): MiraiElem;
|
||||
/** 音乐 */
|
||||
diff --git a/lib/message/elements.js b/lib/message/elements.js
|
||||
index de3a1d116c794ae2ee9e18836d6669a4d89d59d0..9c6c5c1fc5949eb49636d539aed4ed140bb3ec0a 100644
|
||||
--- a/lib/message/elements.js
|
||||
+++ b/lib/message/elements.js
|
||||
@@ -99,6 +99,11 @@ exports.segment = {
|
||||
type: "button", content
|
||||
};
|
||||
},
|
||||
+ longmsg(resId) {
|
||||
+ return {
|
||||
+ type: "longmsg", resId
|
||||
+ };
|
||||
+ },
|
||||
/** 一种特殊消息(官方客户端无法解析) */
|
||||
mirai(data) {
|
||||
return {
|
||||
diff --git a/lib/message/parser.js b/lib/message/parser.js
|
||||
index f661775a1fb146fefcbb8db73cfa62fba4d737f4..c3d2bd9f295e6cc3d5c0a505b3d90f8c007e3cea 100644
|
||||
--- a/lib/message/parser.js
|
||||
+++ b/lib/message/parser.js
|
||||
@@ -58,7 +58,7 @@ class Parser {
|
||||
this.content = elem.data;
|
||||
break;
|
||||
case 3: //flash
|
||||
- elem = this.parseNewImgElem(proto, "flash");
|
||||
+ elem = this.parseImgElem(type, proto, "flash");
|
||||
brief = "闪照";
|
||||
this.content = `{flash:${elem.file.slice(0, 32).toUpperCase()}}`;
|
||||
break;
|
|
@ -0,0 +1,21 @@
|
|||
diff --git a/lib/message/converter.js b/lib/message/converter.js
|
||||
index 27a659a3290fadd990a1a980918515a6ded4978f..d6156587a02b1ed441ac8d2a3e2104e6343306b2 100644
|
||||
--- a/lib/message/converter.js
|
||||
+++ b/lib/message/converter.js
|
||||
@@ -111,7 +111,7 @@ class Converter {
|
||||
return;
|
||||
}
|
||||
if (qq === "all") {
|
||||
- var q = 0, flag = 1, display = "全体成员";
|
||||
+ var q = 0, flag = 1, display = text || "全体成员";
|
||||
}
|
||||
else {
|
||||
var q = Number(qq), flag = 0, display = text || String(qq);
|
||||
@@ -121,7 +121,6 @@ class Converter {
|
||||
display = member?.card || member?.nickname || display;
|
||||
}
|
||||
}
|
||||
- display = "@" + display;
|
||||
if (dummy)
|
||||
return this._text(display);
|
||||
const buf = Buffer.allocUnsafe(6);
|
1293
pnpm-lock.yaml
1293
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
@ -10,10 +10,10 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@vitejs/plugin-vue-jsx": "^3.1.0",
|
||||
"naive-ui": "^2.38.1",
|
||||
"sass": "^1.72.0",
|
||||
"vite": "^5.1.6",
|
||||
"vue": "^3.4.21",
|
||||
"vue-tg": "^0.3.0"
|
||||
"naive-ui": "^2.38.2",
|
||||
"sass": "^1.76.0",
|
||||
"vite": "^5.2.11",
|
||||
"vue": "^3.4.26",
|
||||
"vue-tg": "^0.6.1"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue