From b3aad8b0d994720d25e8d28e59c56c2dd6f94eda Mon Sep 17 00:00:00 2001
From: linyuchen <lin.yu.chen@hotmail.com>
Date: Wed, 15 May 2024 19:19:10 +0800
Subject: [PATCH] fix: Check pic fil name ext
---
src/ntqqapi/types/msg.ts | 1 +
src/onebot11/constructor.ts | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/ntqqapi/types/msg.ts b/src/ntqqapi/types/msg.ts
index 0250e9b..45fc38b 100644
--- a/src/ntqqapi/types/msg.ts
+++ b/src/ntqqapi/types/msg.ts
@@ -188,6 +188,7 @@ export const IMAGE_HTTP_HOST = 'https://gchat.qpic.cn'
export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn'
export interface PicElement {
+ picType: PicType // 有这玩意儿吗
originImageUrl: string // http url, 没有host，host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn
originImageMd5?: string
sourcePath: string // 图片本地路径
diff --git a/src/onebot11/constructor.ts b/src/onebot11/constructor.ts
index 6d9e01d..17c47fd 100644
--- a/src/onebot11/constructor.ts
+++ b/src/onebot11/constructor.ts
@@ -1,4 +1,4 @@
-import fastXmlParser, { XMLParser } from 'fast-xml-parser'
+import fastXmlParser from 'fast-xml-parser'
import {
OB11Group,
OB11GroupMember,
@@ -16,8 +16,7 @@ import {
GrayTipElementSubType,
Group,
GroupMember,
- IMAGE_HTTP_HOST,
- IMAGE_HTTP_HOST_NT,
+ PicType,
RawMessage,
SelfInfo,
Sex,
@@ -25,7 +24,7 @@ import {
User,
VideoElement,
} from '../ntqqapi/types'
-import { deleteGroup, getFriend, getGroupMember, groups, selfInfo, tempGroupCodeMap } from '../common/data'
+import { deleteGroup, getFriend, getGroupMember, selfInfo, tempGroupCodeMap } from '../common/data'
import { EventType } from './event/OB11BaseEvent'
import { encodeCQCode } from './cqcode'
import { dbUtil } from '../common/db'
@@ -156,7 +155,12 @@ export class OB11Constructor {
else if (element.picElement) {
message_data['type'] = 'image'
// message_data["data"]["file"] = element.picElement.sourcePath
- message_data['data']['file'] = element.picElement.fileName
+ let fileName = element.picElement.fileName;
+ const sourcePath = element.picElement.sourcePath;
+ if (element.picElement.picType === PicType.gif && !fileName.endsWith('.gif')){
+ fileName += ".gif";
+ }
+ message_data['data']['file'] = fileName
// message_data["data"]["path"] = element.picElement.sourcePath
// let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
@@ -164,9 +168,9 @@ export class OB11Constructor {
// message_data["data"]["file_id"] = element.picElement.fileUuid
message_data['data']['file_size'] = element.picElement.fileSize
dbUtil
- .addFileCache(element.picElement.fileName, {
- fileName: element.picElement.fileName,
- filePath: element.picElement.sourcePath,
+ .addFileCache(fileName, {
+ fileName,
+ filePath: sourcePath,
fileSize: element.picElement.fileSize.toString(),
url: message_data['data']['url'],
downloadFunc: async () => {