diff --git a/src/common/utils/ConfigBase.ts b/src/common/utils/config-base.ts similarity index 100% rename from src/common/utils/ConfigBase.ts rename to src/common/utils/config-base.ts diff --git a/src/common/utils/LRU.ts b/src/common/utils/lru-cache.ts similarity index 100% rename from src/common/utils/LRU.ts rename to src/common/utils/lru-cache.ts diff --git a/src/common/utils/MessageUnique.ts b/src/common/utils/message-unique.ts similarity index 100% rename from src/common/utils/MessageUnique.ts rename to src/common/utils/message-unique.ts diff --git a/src/common/utils/QQBasicInfo.ts b/src/common/utils/qq-basic-info.ts similarity index 100% rename from src/common/utils/QQBasicInfo.ts rename to src/common/utils/qq-basic-info.ts diff --git a/src/core/apis/friend.ts b/src/core/apis/friend.ts index 69e5a366..5a1360cb 100644 --- a/src/core/apis/friend.ts +++ b/src/core/apis/friend.ts @@ -1,6 +1,6 @@ -import { Friend, FriendV2, User } from '@/core/entities'; -import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelBuddyListener, NodeIKernelBuddyService, NodeIKernelProfileService, OnBuddyChangeParams } from '@/core'; -import { LimitedHashTable } from '@/common/utils/MessageUnique'; +import { FriendV2 } from '@/core/entities'; +import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelProfileService } from '@/core'; +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', 'nodeStore', uids, ); - data.forEach((value, key) => { + data.forEach((value) => { retMap.set(value.uin!, value.uid!); }); //console.log('getBuddyIdMap', retMap.getValue); diff --git a/src/core/helper/config.ts b/src/core/helper/config.ts index a1b8fcc2..c51fcdec 100644 --- a/src/core/helper/config.ts +++ b/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'; diff --git a/src/core/wrapper/context.ts b/src/core/wrapper/context.ts index 3f997018..078085f8 100644 --- a/src/core/wrapper/context.ts +++ b/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'; diff --git a/src/framework/napcat.ts b/src/framework/napcat.ts index cc4ffe1e..8547e2c1 100644 --- a/src/framework/napcat.ts +++ b/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'; diff --git a/src/onebot/action/extends/FetchEmojiLike.ts b/src/onebot/action/extends/FetchEmojiLike.ts index d21c9dac..b8073984 100644 --- a/src/onebot/action/extends/FetchEmojiLike.ts +++ b/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', diff --git a/src/onebot/action/go-cqhttp/GetForwardMsg.ts b/src/onebot/action/go-cqhttp/GetForwardMsg.ts index a0b78248..e2239689 100644 --- a/src/onebot/action/go-cqhttp/GetForwardMsg.ts +++ b/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', diff --git a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts index 2510742d..646a0e94 100644 --- a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts +++ b/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[]; diff --git a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts index 7cefd132..a14067a1 100644 --- a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts +++ b/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[]; diff --git a/src/onebot/action/group/DelEssenceMsg.ts b/src/onebot/action/group/DelEssenceMsg.ts index dde3781e..9de301e7 100644 --- a/src/onebot/action/group/DelEssenceMsg.ts +++ b/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', diff --git a/src/onebot/action/group/SetEssenceMsg.ts b/src/onebot/action/group/SetEssenceMsg.ts index 9a49db81..0f7f2d0d 100644 --- a/src/onebot/action/group/SetEssenceMsg.ts +++ b/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', diff --git a/src/onebot/action/msg/DeleteMsg.ts b/src/onebot/action/msg/DeleteMsg.ts index e8c31a6c..fb0ba193 100644 --- a/src/onebot/action/msg/DeleteMsg.ts +++ b/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 { 'NodeIKernelMsgListener/onMsgInfoListUpdate', 1, 5000, - (msgs) => { - if (msgs.find(m => m.msgId === msg.MsgId && m.recallTime !== '0')) { - return true; - } - return false; - }, - ).catch(e => new Promise((resolve, reject) => { + (msgs) => !!msgs.find(m => m.msgId === msg.MsgId && m.recallTime !== '0') + ).catch(() => new Promise((resolve) => { resolve(undefined); })); await NTQQMsgApi.recallMsg(msg.Peer, [msg.MsgId]); diff --git a/src/onebot/action/msg/ForwardSingleMsg.ts b/src/onebot/action/msg/ForwardSingleMsg.ts index 7de1c875..12e344dd 100644 --- a/src/onebot/action/msg/ForwardSingleMsg.ts +++ b/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', diff --git a/src/onebot/action/msg/GetMsg.ts b/src/onebot/action/msg/GetMsg.ts index 70a569b6..d90133d5 100644 --- a/src/onebot/action/msg/GetMsg.ts +++ b/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 diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index 1c420347..b5c19f2a 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/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'; diff --git a/src/onebot/action/msg/SetMsgEmojiLike.ts b/src/onebot/action/msg/SetMsgEmojiLike.ts index 79b50e71..3312b020 100644 --- a/src/onebot/action/msg/SetMsgEmojiLike.ts +++ b/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', diff --git a/src/onebot/api/group.ts b/src/onebot/api/group.ts index 04eae235..c295cc69 100644 --- a/src/onebot/api/group.ts +++ b/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) { diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index 6c3abc13..df0ac40d 100644 --- a/src/onebot/api/msg.ts +++ b/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, diff --git a/src/onebot/helper/config.ts b/src/onebot/helper/config.ts index 2ce04bf6..b6cd12bd 100644 --- a/src/onebot/helper/config.ts +++ b/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'; diff --git a/src/onebot/helper/event.ts b/src/onebot/helper/event.ts index 9f9b4b3e..26b1ae92 100644 --- a/src/onebot/helper/event.ts +++ b/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'; diff --git a/src/onebot/index.ts b/src/onebot/index.ts index f522457e..e9251500 100644 --- a/src/onebot/index.ts +++ b/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}`); diff --git a/src/shell/napcat.ts b/src/shell/napcat.ts index 103f657f..4fa63c02 100644 --- a/src/shell/napcat.ts +++ b/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';