Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-06 13:05:09 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

refactor: video url

Browse Source
This commit is contained in:
手瓜一十雪
2024-06-09 19:40:34 +08:00
parent 8fab4b4978
commit a8099b26f1
47 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/onebot11/constructor.ts
View File

@@ -42,6 +42,7 @@ import { ob11Config } from '@/onebot11/config';
import { deleteGroup, getFriend, getGroupMember, groupMembers, selfInfo, tempGroupCodeMap } from '@/core/data';
import { NTQQFileApi, NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
import { OB11GroupMsgEmojiLikeEvent } from '@/onebot11/event/notice/OB11MsgEmojiLikeEvent';
import { napCatCore } from '@/core';
export class OB11Constructor {
@@ -191,23 +192,13 @@ export class OB11Constructor {
else if (element.videoElement || element.fileElement) {
const videoOrFileElement = element.videoElement || element.fileElement;
const ob11MessageDataType = element.videoElement ? OB11MessageDataType.video : OB11MessageDataType.file;
let videoDownUrl = NTQQFileApi.getVideoUrl(msg, element);
message_data['type'] = ob11MessageDataType;
message_data['data']['file'] = videoOrFileElement.fileName;
message_data['data']['path'] = videoOrFileElement.filePath;
message_data['data']['path'] = videoDownUrl;
message_data['data']['url'] = videoDownUrl;
message_data['data']['file_id'] = videoOrFileElement.fileUuid;
message_data['data']['file_size'] = videoOrFileElement.fileSize;
// 怎么拿到url呢
dbUtil.addFileCache({
msgId: msg.msgId,
name: videoOrFileElement.fileName,
path: videoOrFileElement.filePath,
size: parseInt(videoOrFileElement.fileSize || '0'),
uuid: videoOrFileElement.fileUuid || '',
url: '',
element: element.videoElement || element.fileElement,
elementType: element.videoElement ? ElementType.VIDEO : ElementType.FILE,
elementId: element.elementId
}).then();
}
else if (element.pttElement) {
message_data['type'] = OB11MessageDataType.voice;

4
src/onebot11/main.ts
View File

@@ -5,6 +5,7 @@ import { postOB11Event } from '@/onebot11/server/postOB11Event';
import {
BuddyReqType,
ChatType,
ElementType,
FriendRequest,
Group,
GroupMember,
@@ -36,6 +37,7 @@ import { Data as SysData } from '@/proto/SysMessage';
import { Data as DeviceData } from '@/proto/SysMessage.DeviceChange';
import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent';
import { isEqual } from '@/common/utils/helper';
import e from 'express';
//下面几个其实应该移进Core-Data 缓存实现 但是现在在这里方便
//
@@ -203,7 +205,7 @@ export class NapCatOnebot11 {
// 临时会话更新 tempGroupCodeMap uid -> source/GroupCode
};
msgListener.onRecvMsg = async (msg) => {
// console.log('ob11 onRecvMsg', JSON.stringify(msg, null, 2));
//console.log('ob11 onRecvMsg', JSON.stringify(msg, null, 2));
// logDebug('收到消息', msg);
for (const m of msg) {
// try: 减掉3s 试图修复消息半天收不到