refactor: normalize file names in common/utils

src/core/apis/friend.ts

@@ -1,6 +1,6 @@
-import { Friend, FriendV2, User } from '@/core/entities';
+import { FriendV2 } from '@/core/entities';
-import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelBuddyListener, NodeIKernelBuddyService, NodeIKernelProfileService, OnBuddyChangeParams } from '@/core';
+import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelProfileService } from '@/core';
-import { LimitedHashTable } from '@/common/utils/MessageUnique';
+import { LimitedHashTable } from '@/common/utils/message-unique';
 
 export class NTQQFriendApi {
     context: InstanceContext;
@@ -35,7 +35,7 @@ export class NTQQFriendApi {
         const data = await this.core.eventWrapper.callNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
             'NodeIKernelProfileService/getCoreAndBaseInfo', 'nodeStore', uids,
         );
-        data.forEach((value, key) => {
+        data.forEach((value) => {
             retMap.set(value.uin!, value.uid!);
         });
         //console.log('getBuddyIdMap', retMap.getValue);

src/core/helper/config.ts

@@ -1,4 +1,4 @@
-import { ConfigBase } from "@/common/utils/ConfigBase";
+import { ConfigBase } from "@/common/utils/config-base";
 import napCatDefaultConfig from '@/core/external/napcat.json';
 import { NapCatCore } from '@/core';
 

src/core/wrapper/context.ts

@@ -1,5 +1,5 @@
 import { LogWrapper } from '@/common/utils/log';
-import { QQBasicInfoWrapper } from '@/common/utils/QQBasicInfo';
+import { QQBasicInfoWrapper } from '@/common/utils/qq-basic-info';
 import { NapCatCoreWorkingEnv, NodeIKernelLoginService, NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core';
 import { NTQQFileApi, NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQSystemApi, NTQQUserApi, NTQQWebApi } from '../apis';
 import { NTQQCollectionApi } from '../apis/collection';

src/framework/napcat.ts

@@ -1,7 +1,7 @@
 import { NapCatPathWrapper } from '@/common/framework/napcat';
 import { LogWrapper } from '@/common/utils/log';
 import { proxiedListenerOf } from '@/common/utils/proxy-handler';
-import { QQBasicInfoWrapper } from '@/common/utils/QQBasicInfo';
+import { QQBasicInfoWrapper } from '@/common/utils/qq-basic-info';
 import { loadQQWrapper, NapCatCore, NapCatCoreWorkingEnv } from '@/core/core';
 import { InstanceContext } from '@/core';
 import { SelfInfo } from '@/core/entities';

src/onebot/action/extends/FetchEmojiLike.ts

@@ -2,7 +2,7 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/go-cqhttp/GetForwardMsg.ts

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import { OB11ForwardMessage } from '@/onebot';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts

@@ -3,7 +3,7 @@ import { OB11Message } from '@/onebot';
 import { ActionName } from '../types';
 import { ChatType, RawMessage } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 
 interface Response {
     messages: OB11Message[];

src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -3,7 +3,7 @@ import { OB11Message } from '@/onebot';
 import { ActionName } from '../types';
 import { ChatType, Peer, RawMessage } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 
 interface Response {
     messages: OB11Message[];

src/onebot/action/group/DelEssenceMsg.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/group/SetEssenceMsg.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/msg/DeleteMsg.ts

@@ -1,7 +1,7 @@
 import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 import { NodeIKernelMsgListener } from '@/core';
 
 const SchemaData = {
@@ -32,13 +32,8 @@ class DeleteMsg extends BaseAction<Payload, void> {
                 'NodeIKernelMsgListener/onMsgInfoListUpdate',
                 1,
                 5000,
-                (msgs) => {
+                (msgs) => !!msgs.find(m => m.msgId === msg.MsgId && m.recallTime !== '0')
-                    if (msgs.find(m => m.msgId === msg.MsgId && m.recallTime !== '0')) {
+            ).catch(() => new Promise<undefined>((resolve) => {
-                        return true;
-                    }
-                    return false;
-                },
-            ).catch(e => new Promise<undefined>((resolve, reject) => {
                 resolve(undefined);
             }));
             await NTQQMsgApi.recallMsg(msg.Peer, [msg.MsgId]);

src/onebot/action/msg/ForwardSingleMsg.ts

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import { ChatType, Peer } from '@/core/entities';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/msg/GetMsg.ts

@@ -2,7 +2,7 @@ import { OB11Message } from '@/onebot';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 
 
 export type ReturnDataType = OB11Message

src/onebot/action/msg/SendMsg.ts

@@ -7,7 +7,7 @@ import {
 } from '@/onebot/types';
 import { ActionName, BaseCheckResult } from '@/onebot/action/types';
 import { decodeCQCode } from '@/onebot/helper/cqcode';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendMessageElement } from '@/core';
 import BaseAction from '../BaseAction';
 

src/onebot/action/msg/SetMsgEmojiLike.ts

@@ -1,7 +1,7 @@
 import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/api/group.ts

@@ -5,7 +5,7 @@ import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
 import { OB11GroupDecreaseEvent } from '../event/notice/OB11GroupDecreaseEvent';
 import fastXmlParser from 'fast-xml-parser';
 import { OB11GroupMsgEmojiLikeEvent } from '../event/notice/OB11MsgEmojiLikeEvent';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 
 export class OneBotGroupApi {
     obContext: NapCatOneBot11Adapter;
@@ -21,7 +21,7 @@ export class OneBotGroupApi {
         if (!groupElement?.shutUp) return undefined;
         const memberUid = groupElement.shutUp!.member.uid;
         const adminUid = groupElement.shutUp!.admin.uid;
-        let memberUin: string = '';
+        let memberUin: string;
         let duration = parseInt(groupElement.shutUp!.duration);
         const subType: 'ban' | 'lift_ban' = duration > 0 ? 'ban' : 'lift_ban';
         if (memberUid) {

src/onebot/api/msg.ts

@@ -1,5 +1,5 @@
 import { UUIDConverter } from '@/common/utils/helper';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 import {
     AtType,
     ChatType,

src/onebot/helper/config.ts

@@ -1,4 +1,4 @@
-import { ConfigBase } from '@/common/utils/ConfigBase';
+import { ConfigBase } from '@/common/utils/config-base';
 import ob11DefaultConfig from '@/onebot/external/onebot11.json';
 import { NapCatCore } from '@/core';
 

src/onebot/helper/event.ts

@@ -7,7 +7,7 @@ import { OB11GroupDecreaseEvent } from "../event/notice/OB11GroupDecreaseEvent";
 import { OB11GroupUploadNoticeEvent } from "../event/notice/OB11GroupUploadNoticeEvent";
 import { OB11GroupPokeEvent } from "../event/notice/OB11PokeEvent";
 import { OB11GroupEssenceEvent } from "../event/notice/OB11GroupEssenceEvent";
-import { MessageUnique } from "@/common/utils/MessageUnique";
+import { MessageUnique } from "@/common/utils/message-unique";
 import { OB11GroupTitleEvent } from "../event/notice/OB11GroupTitleEvent";
 import { NapCatCore, RawMessage, ChatType, NTGrayTipElementSubTypeV2, TipGroupElementType, Peer } from '@/core';
 

src/onebot/index.ts

@@ -27,7 +27,7 @@ import { OneBotFriendApi, OneBotGroupApi, OneBotMsgApi, OneBotUserApi } from '@/
 import { ActionMap, createActionMap } from '@/onebot/action';
 import { WebUiDataRuntime } from '@/webui/src/helper/Data';
 import { OB11InputStatusEvent } from '@/onebot/event/notice/OB11InputStatusEvent';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { MessageUnique } from '@/common/utils/message-unique';
 import { proxiedListenerOf } from '@/common/utils/proxy-handler';
 import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest';
 import { OB11GroupAdminNoticeEvent } from '@/onebot/event/notice/OB11GroupAdminNoticeEvent';
@@ -35,7 +35,7 @@ import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '@/onebot/event/not
 import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest';
 import { OB11FriendRecallNoticeEvent } from '@/onebot/event/notice/OB11FriendRecallNoticeEvent';
 import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecallNoticeEvent';
-import { LRUCache } from '@/common/utils/LRU';
+import { LRUCache } from '@/common/utils/lru-cache';
 import { NT2GroupEvent, NT2PrivateEvent } from './helper';
 import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener';
 
@@ -135,7 +135,7 @@ export class NapCatOneBot11Adapter {
                     // log("recent contact", msgList, arg0, arg1);
                 }
             });
-        }
+        };
     }
 
     private async reloadNetwork(prev: OB11Config, now: OB11Config) {
@@ -233,7 +233,7 @@ export class NapCatOneBot11Adapter {
         const msgListener = new NodeIKernelMsgListener();
         msgListener.onRecvSysMsg = msg => {
             //console.log('onRecvSysMsg', Buffer.from(msg).toString('hex'));
-        }
+        };
         msgListener.onInputStatusPush = async data => {
             const uin = await this.core.apis.UserApi.getUinByUidV2(data.fromUin);
             this.context.logger.log(`[Notice] [输入状态] ${uin} ${data.statusText}`);

src/shell/napcat.ts

@@ -12,7 +12,7 @@ import {
     NodeIQQNTWrapperSession,
     WrapperNodeApi,
 } from '@/core';
-import { QQBasicInfoWrapper } from '@/common/utils/QQBasicInfo';
+import { QQBasicInfoWrapper } from '@/common/utils/qq-basic-info';
 import { hostname, systemVersion } from '@/common/utils/system';
 import { genSessionConfig } from '@/core/wrapper/helper';
 import { proxiedListenerOf } from '@/common/utils/proxy-handler';