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: move all utility files to /common

Browse Source
This commit is contained in:
Wesley F. Young
2024-08-27 10:17:19 +08:00
parent 5332254e40
commit e3f6881af9
63 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/onebot/action/OB11Response.ts
View File

@@ -1,6 +1,6 @@
import { OB11Return } from '../types';
import { isNull } from '../../common/utils/helper';
import { isNull } from '../../common/helper';
export class OB11Response {
static res<T>(data: T, status: string, retcode: number, message: string = ''): OB11Return<T> {

2
src/onebot/action/extends/FetchEmojiLike.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
const SchemaData = {
type: 'object',

2
src/onebot/action/extends/OCRImage.ts
View File

@@ -1,7 +1,7 @@
import BaseAction from '../BaseAction';
import { ActionName } from '../types';
import { FromSchema, JSONSchema } from 'json-schema-to-ts';
import { checkFileReceived, uri2local } from '@/common/utils/file';
import { checkFileReceived, uri2local } from '@/common/file';
import fs from 'fs';
const SchemaData = {

2
src/onebot/action/extends/SetQQAvatar.ts
View File

@@ -1,7 +1,7 @@
import BaseAction from '../BaseAction';
import { ActionName, BaseCheckResult } from '../types';
import * as fs from 'node:fs';
import { checkFileReceived, uri2local } from '@/common/utils/file';
import { checkFileReceived, uri2local } from '@/common/file';
interface Payload {
file: string;

2
src/onebot/action/file/GetFile.ts
View File

@@ -1,6 +1,6 @@
import BaseAction from '../BaseAction';
import fs from 'fs/promises';
import { UUIDConverter } from '@/common/utils/helper';
import { UUIDConverter } from '@/common/helper';
import { ActionName } from '../types';
import { ChatType, ElementType, FileElement, Peer, RawMessage, VideoElement } from '@/core/entities';
import { FromSchema, JSONSchema } from 'json-schema-to-ts';

2
src/onebot/action/go-cqhttp/DownloadFile.ts
View File

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
import { ActionName } from '../types';
import fs from 'fs';
import { join as joinPath } from 'node:path';
import { calculateFileMD5, httpDownload } from '@/common/utils/file';
import { calculateFileMD5, httpDownload } from '@/common/file';
import { randomUUID } from 'crypto';
import { FromSchema, JSONSchema } from 'json-schema-to-ts';

2
src/onebot/action/go-cqhttp/GetForwardMsg.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
const SchemaData = {
type: 'object',

2
src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
interface Response {
messages: OB11Message[];

2
src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
interface Response {
messages: OB11Message[];

2
src/onebot/action/go-cqhttp/GetOnlineClient.ts
View File

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

2
src/onebot/action/go-cqhttp/GetStrangerInfo.ts
View File

@@ -3,7 +3,7 @@ import { OB11User, OB11UserSex } from '@/onebot';
import { OB11Entities } from '@/onebot/helper/entities';
import { ActionName } from '../types';
import { FromSchema, JSONSchema } from 'json-schema-to-ts';
import { calcQQLevel } from '@/common/utils/helper';
import { calcQQLevel } from '@/common/helper';
const SchemaData = {
type: 'object',

2
src/onebot/action/go-cqhttp/SendGroupNotice.ts
View File

@@ -1,4 +1,4 @@
import { checkFileReceived, uri2local } from '@/common/utils/file';
import { checkFileReceived, uri2local } from '@/common/file';
import BaseAction from '../BaseAction';
import { ActionName } from '../types';
import { unlink } from 'node:fs';

2
src/onebot/action/go-cqhttp/SetGroupPortrait.ts
View File

@@ -1,7 +1,7 @@
import BaseAction from '../BaseAction';
import { ActionName, BaseCheckResult } from '../types';
import * as fs from 'node:fs';
import { checkFileReceived, uri2local } from '@/common/utils/file';
import { checkFileReceived, uri2local } from '@/common/file';
interface Payload {
file: string,

2
src/onebot/action/go-cqhttp/UploadGroupFile.ts
View File

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
import { ActionName } from '../types';
import { ChatType } from '@/core/entities';
import fs from 'fs';
import { uri2local } from '@/common/utils/file';
import { uri2local } from '@/common/file';
import { FromSchema, JSONSchema } from 'json-schema-to-ts';
const SchemaData = {

2
src/onebot/action/go-cqhttp/UploadPrivateFile.ts
View File

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
import { ActionName } from '../types';
import { ChatType, Peer, SendFileElement } from '@/core/entities';
import fs from 'fs';
import { uri2local } from '@/common/utils/file';
import { uri2local } from '@/common/file';
import { FromSchema, JSONSchema } from 'json-schema-to-ts';
const SchemaData = {

2
src/onebot/action/group/DelEssenceMsg.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
const SchemaData = {
type: 'object',

2
src/onebot/action/group/SetEssenceMsg.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
const SchemaData = {
type: 'object',

2
src/onebot/action/msg/DeleteMsg.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
import { NodeIKernelMsgListener } from '@/core';
const SchemaData = {

2
src/onebot/action/msg/ForwardSingleMsg.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
const SchemaData = {
type: 'object',

2
src/onebot/action/msg/GetMsg.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
export type ReturnDataType = OB11Message

2
src/onebot/action/msg/SendMsg.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendMessageElement } from '@/core';
import BaseAction from '../BaseAction';

2
src/onebot/action/msg/SetMsgEmojiLike.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
const SchemaData = {
type: 'object',

2
src/onebot/action/system/GetVersionInfo.ts
View File

@@ -1,6 +1,6 @@
import BaseAction from '../BaseAction';
import { ActionName } from '../types';
import { napcat_version } from '@/common/framework/napcat';
import { napcat_version } from '@/common/path';
export default class GetVersionInfo extends BaseAction<any, any> {
actionName = ActionName.GetVersionInfo;

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

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
export class OneBotGroupApi {
obContext: NapCatOneBot11Adapter;

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

@@ -1,5 +1,5 @@
import { UUIDConverter } from '@/common/utils/helper';
import { MessageUnique } from '@/common/utils/message-unique';
import { UUIDConverter } from '@/common/helper';
import { MessageUnique } from '@/common/message-unique';
import {
AtType,
ChatType,
@@ -27,8 +27,8 @@ import {
import { OB11Entities } from '../helper';
import { EventType } from '@/onebot/event/OB11BaseEvent';
import { encodeCQCode } from '@/onebot/helper/cqcode';
import { uri2local } from '@/common/utils/file';
import { RequestUtil } from '@/common/utils/request';
import { uri2local } from '@/common/file';
import { RequestUtil } from '@/common/request';
import fs from 'node:fs';
import fsPromise from 'node:fs/promises';

2
src/onebot/api/quick-action.ts
View File

@@ -14,7 +14,7 @@ import { ChatType, GroupRequestOperateTypes, NapCatCore, Peer } from '@/core';
import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest';
import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest';
import { normalize } from '@/onebot/action/msg/SendMsg';
import { isNull } from '@/common/utils/helper';
import { isNull } from '@/common/helper';
export class OneBotQuickActionApi {
constructor(

2
src/onebot/helper/config.ts
View File

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

2
src/onebot/helper/entities.ts
View File

@@ -1,4 +1,4 @@
import { calcQQLevel } from '@/common/utils/helper';
import { calcQQLevel } from '@/common/helper';
import { Friend, FriendV2, Group, GroupMember, SelfInfo, Sex, User } from '@/core';
import { OB11Group, OB11GroupMember, OB11GroupMemberRole, OB11User, OB11UserSex } from '../types';

2
src/onebot/helper/event.ts
View File

@@ -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/message-unique';
import { MessageUnique } from '@/common/message-unique';
import { OB11GroupTitleEvent } from '../event/notice/OB11GroupTitleEvent';
import { NapCatCore, RawMessage, ChatType, NTGrayTipElementSubTypeV2, TipGroupElementType, Peer } from '@/core';

8
src/onebot/index.ts
View File

@@ -21,7 +21,7 @@ import {
OB11PassiveHttpAdapter,
OB11PassiveWebSocketAdapter,
} from '@/onebot/network';
import { NapCatPathWrapper } from '@/common/framework/napcat';
import { NapCatPathWrapper } from '@/common/path';
import {
OneBotFriendApi,
OneBotGroupApi,
@@ -33,15 +33,15 @@ import {
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/message-unique';
import { proxiedListenerOf } from '@/common/utils/proxy-handler';
import { MessageUnique } from '@/common/message-unique';
import { proxiedListenerOf } from '@/common/proxy-handler';
import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest';
import { OB11GroupAdminNoticeEvent } from '@/onebot/event/notice/OB11GroupAdminNoticeEvent';
import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '@/onebot/event/notice/OB11GroupDecreaseEvent';
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-cache';
import { LRUCache } from '@/common/lru-cache';
import { NT2GroupEvent, NT2PrivateEvent } from './helper';
import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener';

2
src/onebot/network/active-http.ts
View File

@@ -1,6 +1,6 @@
import { IOB11NetworkAdapter, OB11EmitEventContent } from '@/onebot/network/index';
import { createHmac } from 'crypto';
import { LogWrapper } from '@/common/utils/log';
import { LogWrapper } from '@/common/log';
import { QuickAction, QuickActionEvent } from '../types';
import { NapCatCore } from '@/core';
import { NapCatOneBot11Adapter } from '..';

2
src/onebot/network/active-websocket.ts
View File

@@ -4,7 +4,7 @@ import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent';
import { NapCatCore } from '@/core';
import { ActionName } from '@/onebot/action/types';
import { OB11Response } from '@/onebot/action/OB11Response';
import { LogWrapper } from '@/common/utils/log';
import { LogWrapper } from '@/common/log';
import { ActionMap } from '@/onebot/action';
import { LifeCycleSubType, OB11LifeCycleEvent } from '../event/meta/OB11LifeCycleEvent';

2
src/onebot/network/passive-websocket.ts
View File

@@ -5,7 +5,7 @@ import { Mutex } from 'async-mutex';
import { OB11Response } from '../action/OB11Response';
import { ActionName } from '../action/types';
import { NapCatCore } from '@/core';
import { LogWrapper } from '@/common/utils/log';
import { LogWrapper } from '@/common/log';
import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent';
import { IncomingMessage } from 'http';
import { ActionMap } from '@/onebot/action';