QQ/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-09-28 04:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: 2.4.1

Browse Source
This commit is contained in:
手瓜一十雪 2024-09-09 09:19:23 +08:00
parent 2c54aee63e
commit 919705966c
10 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifest.json
View File

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

2
package.json
View File

@ -2,7 +2,7 @@
"name": "napcat",
"private": true,
"type": "module",
"version": "2.4.0",
"version": "2.4.1",
"scripts": {
"build:framework": "vite build --mode framework",
"build:shell": "vite build --mode shell",

2
src/common/version.ts
View File

@ -1 +1 @@
export const napCatVersion = '2.4.0';
export const napCatVersion = '2.4.1';

8
src/core/apis/group.ts
View File

@ -32,10 +32,10 @@ export class NTQQGroupApi {
for (const group of this.groups) {
this.groupCache.set(group.groupCode, group);
}
let text = await this.context.session.getMsgService().sendSsoCmdReqByContend(
'LightAppSvc.mini_app_share.AdaptShareInfo',
JSON.stringify({ data: 'test' }));
console.log(text);
// let text = await this.context.session.getMsgService().sendSsoCmdReqByContend(
// 'LightAppSvc.mini_app_share.AdaptShareInfo',
// JSON.stringify({ data: 'test' }));
// console.log(text);
this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`);
}

4
src/onebot/api/group.ts
View File

@ -19,6 +19,7 @@ import { OB11GroupPokeEvent } from '@/onebot/event/notice/OB11PokeEvent';
import { OB11GroupEssenceEvent } from '@/onebot/event/notice/OB11GroupEssenceEvent';
import { OB11GroupTitleEvent } from '@/onebot/event/notice/OB11GroupTitleEvent';
import { FileNapCatOneBotUUID } from '@/common/helper';
import { pathToFileURL } from 'node:url';
export class OneBotGroupApi {
obContext: NapCatOneBot11Adapter;
@ -77,7 +78,8 @@ export class OneBotGroupApi {
id: FileNapCatOneBotUUID.encode({
chatType: ChatType.KCHATTYPEGROUP,
peerUid: msg.peerUid,
}, msg.msgId, element.elementId, element.fileElement.fileName),
}, msg.msgId, element.elementId, "."+element.fileElement.fileName),
url: pathToFileURL(element.fileElement.filePath),
name: element.fileElement.fileName,
size: parseInt(element.fileElement.fileSize),
busid: element.fileElement.fileBizId || 0,

33
src/onebot/api/msg.ts
View File

@ -1,5 +1,6 @@
import { FileNapCatOneBotUUID } from '@/common/helper';
import { MessageUnique } from '@/common/message-unique';
import { pathToFileURL } from 'node:url';
import {
AtType,
ChatType,
@ -106,7 +107,7 @@ export class OneBotMsgApi {
peerUid: msg.peerUid,
guildId: '',
};
const encodedFileId = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileName);
const encodedFileId = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "."+element.fileName);
return {
type: OB11MessageDataType.image,
data: {
@ -114,6 +115,7 @@ export class OneBotMsgApi {
sub_type: element.picSubType,
file_id: encodedFileId,
url: await this.core.apis.FileApi.getImageUrl(element),
path: element.filePath,
file_size: element.fileSize,
file_unique: element.fileName
},
@ -135,8 +137,8 @@ export class OneBotMsgApi {
data: {
file: element.fileName,
path: element.filePath,
url: element.filePath,
file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileName),
url: pathToFileURL(element.filePath),
file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "."+element.fileName),
file_size: element.fileSize,
file_unique: element.fileName,
},
@ -175,13 +177,16 @@ export class OneBotMsgApi {
peerUid: msg.peerUid,
guildId: '',
};
const { emojiId } = _;
const dir = emojiId.substring(0, 2);
const url = `https://gxh.vip.qq.com/club/item/parcel/item/${dir}/${emojiId}/raw300.gif`
return {
type: OB11MessageDataType.image,
data: {
file: 'marketface',
file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, ".jpg"),
file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "."+_.key+".jpg"),
path: elementWrapper.elementId,
url: elementWrapper.elementId,
url: url,
file_unique: _.key
},
};
@ -257,14 +262,14 @@ export class OneBotMsgApi {
if (!videoDownUrl) {
videoDownUrl = element.filePath;
}
const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "."+element.fileName)
return {
type: OB11MessageDataType.video,
data: {
file: element.fileName,
file: fileCode,
path: videoDownUrl,
url: videoDownUrl,
file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileName),
url: videoDownUrl ?? pathToFileURL(element.filePath),
file_id: fileCode,
file_size: element.fileSize,
file_unique: element.fileName,
},
@ -277,14 +282,16 @@ export class OneBotMsgApi {
peerUid: msg.peerUid,
guildId: '',
};
const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileName);
const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "."+element.fileName);
return {
type: OB11MessageDataType.voice,
data: {
file: fileCode,
path: element.filePath,
url: pathToFileURL(element.filePath),
file_id: fileCode,
file_size: element.fileSize,
file_unique: element.fileName
},
};
},
@ -793,18 +800,20 @@ export class OneBotMsgApi {
) {
const isBlankUrl = !inputdata.url || inputdata.url === '';
const isBlankFile = !inputdata.file || inputdata.file === '';
const isBlankPath = !inputdata.path || inputdata.path === '';
if (isBlankUrl && isBlankFile) {
this.core.context.logger.logError('文件消息缺少参数', inputdata);
throw Error('文件消息缺少参数');
}
const fileOrUrl = (isBlankUrl ? inputdata.file : inputdata.url) ?? '';
//path->url->file
const realUri = (!isBlankUrl ? inputdata.url :(!isBlankPath ? inputdata.path:inputdata.file ))??'';
const {
path,
isLocal,
fileName,
errMsg,
success,
} = (await uri2local(this.core.NapCatTempPath, fileOrUrl));
} = (await uri2local(this.core.NapCatTempPath, realUri));
if (!success) {
this.core.context.logger.logError('文件下载失败', errMsg);

1
src/onebot/event/notice/OB11GroupUploadNoticeEvent.ts
View File

@ -6,6 +6,7 @@ export interface GroupUploadFile {
name: string,
size: number,
busid: number,
url:string;
}
export class OB11GroupUploadNoticeEvent extends OB11GroupNoticeEvent {

1
src/onebot/types/message.ts
View File

@ -84,6 +84,7 @@ export interface OB11MessageText {
export interface OB11MessageFileBase {
data: {
path?: string;
thumb?: string;
name?: string;
file: string,

2
src/webui/ui/NapCat.ts
View File

@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
SettingItem(
'<span id="napcat-update-title">Napcat</span>',
undefined,
SettingButton('V2.4.0', 'napcat-update-button', 'secondary'),
SettingButton('V2.4.1', 'napcat-update-button', 'secondary'),
),
]),
SettingList([

2
static/assets/renderer.js
View File

@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
SettingItem(
'<span id="napcat-update-title">Napcat</span>',
void 0,
SettingButton("V2.4.0", "napcat-update-button", "secondary")
SettingButton("V2.4.1", "napcat-update-button", "secondary")
)
]),
SettingList([