Merge remote-tracking branch 'origin/main'

This commit is contained in:
linyuchen 2024-04-27 17:05:16 +08:00
commit 45727fce05
6 changed files with 7 additions and 17 deletions

View File

@ -2,3 +2,4 @@
2. 支持了设置已读群/私聊消息接口 2. 支持了设置已读群/私聊消息接口
3. 支持了好友添加上报事件 3. 支持了好友添加上报事件
4. 重构了商城表情URL拼接 4. 重构了商城表情URL拼接
5. 重构了Core日志与服务调用部分

View File

@ -34,6 +34,7 @@ class MarkMsgAsRead extends BaseAction<Payload, null> {
return null; return null;
} }
} }
// 以下为非标准实现
export class MarkPrivateMsgAsRead extends MarkMsgAsRead { export class MarkPrivateMsgAsRead extends MarkMsgAsRead {
actionName = ActionName.MarkPrivateMsgAsRead; actionName = ActionName.MarkPrivateMsgAsRead;
} }

View File

@ -8,7 +8,7 @@ interface ReturnType {
export default class CanSendRecord extends BaseAction<any, ReturnType> { export default class CanSendRecord extends BaseAction<any, ReturnType> {
actionName = ActionName.CanSendRecord; actionName = ActionName.CanSendRecord;
protected async _handle(payload): Promise<ReturnType> { protected async _handle(_payload: void): Promise<ReturnType> {
return { return {
yes: true yes: true
}; };

View File

@ -7,7 +7,7 @@ import {
ChatCacheListItemBasic, ChatCacheListItemBasic,
CacheFileType CacheFileType
} from '@/core/entities'; } from '@/core/entities';
import { dbUtil } from '../../../common/db'; import { dbUtil } from '../../../common/utils/db';
import { NTQQFileApi, NTQQFileCacheApi } from '@/core/apis/file'; import { NTQQFileApi, NTQQFileCacheApi } from '@/core/apis/file';
export default class CleanCache extends BaseAction<void, void> { export default class CleanCache extends BaseAction<void, void> {
@ -23,7 +23,7 @@ export default class CleanCache extends BaseAction<void, void> {
cacheFilePaths.push((await NTQQFileCacheApi.getHotUpdateCachePath())); cacheFilePaths.push((await NTQQFileCacheApi.getHotUpdateCachePath()));
cacheFilePaths.push((await NTQQFileCacheApi.getDesktopTmpPath())); cacheFilePaths.push((await NTQQFileCacheApi.getDesktopTmpPath()));
(await NTQQFileCacheApi.getCacheSessionPathList()).forEach(e => cacheFilePaths.push(e.value)); (await NTQQFileCacheApi.getCacheSessionPathList()).forEach((e: { value: string; }) => cacheFilePaths.push(e.value));
// await NTQQApi.addCacheScannedPaths(); // XXX: 调用就崩溃,原因目前还未知 // await NTQQApi.addCacheScannedPaths(); // XXX: 调用就崩溃,原因目前还未知
const cacheScanResult = await NTQQFileCacheApi.scanCache(); const cacheScanResult = await NTQQFileCacheApi.scanCache();
@ -55,7 +55,7 @@ export default class CleanCache extends BaseAction<void, void> {
const fileTypeAny: any = CacheFileType[name]; const fileTypeAny: any = CacheFileType[name];
const fileType: CacheFileType = fileTypeAny; const fileType: CacheFileType = fileTypeAny;
cacheFileList.push(...(await NTQQFileCacheApi.getFileCacheInfo(fileType)).infos.map(file => file.fileKey)); cacheFileList.push(...(await NTQQFileCacheApi.getFileCacheInfo(fileType)).infos.map((file: { fileKey: any; }) => file.fileKey));
} }
// 一并清除 // 一并清除
@ -89,17 +89,5 @@ function deleteCachePath(pathList: string[]) {
function getCacheList(type: ChatType) { // NOTE: 做这个方法主要是因为目前还不支持针对频道消息的清理 function getCacheList(type: ChatType) { // NOTE: 做这个方法主要是因为目前还不支持针对频道消息的清理
return new Promise<Array<ChatCacheListItemBasic>>((res, rej) => { return new Promise<Array<ChatCacheListItemBasic>>((res, rej) => {
NTQQFileCacheApi.getChatCacheList(type, 1000, 0)
.then(data => {
const list = data.infos.filter(e => e.chatType === type && parseInt(e.basicChatCacheInfo.chatSize) > 0);
const result = list.map(e => {
const result = { ...e.basicChatCacheInfo };
result.chatType = type;
result.isChecked = true;
return result;
});
res(result);
})
.catch(e => rej(e));
}); });
} }

View File

@ -1 +1 @@
export const version = '1.1.2'; export const version = '1.2.0';