refactor: Info

src/onebot11/action/file/GetFile.ts

@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import fs from 'fs/promises';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import { ob11Config } from '@/onebot11/config';
 import { log, logDebug } from '@/common/utils/log';
 import { sleep } from '@/common/utils/helper';

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

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { OB11ForwardMessage, OB11Message, OB11MessageData } from '../../types';
 import { NTQQMsgApi } from '@/core/apis';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import { OB11Constructor } from '../../constructor';
 import { ActionName, BaseCheckResult } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';

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

@@ -3,7 +3,7 @@ import { OB11Message, OB11User } from '../../types';
 import { getFriend, friends, uid2UinMap, getUidByUin } from '@/core/data';
 import { ActionName } from '../types';
 import { ChatType } from '@/core/entities';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import { NTQQMsgApi } from '@/core/apis/msg';
 import { OB11Constructor } from '../../constructor';
 import { logDebug } from '@/common/utils/log';

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

@@ -3,7 +3,7 @@ import { OB11Message, OB11User } from '../../types';
 import { getGroup, groups } from '@/core/data';
 import { ActionName } from '../types';
 import { ChatType } from '@/core/entities';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import { NTQQMsgApi } from '@/core/apis/msg';
 import { OB11Constructor } from '../../constructor';
 import { logDebug } from '@/common/utils/log';

src/onebot11/action/group/GetGroupMemberList.ts

@@ -8,7 +8,7 @@ import { WebApi } from '@/core/apis/webapi';
 import { logDebug } from '@/common/utils/log';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { ob11Config } from '@/onebot11/config';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 
 const SchemaData = {
   type: 'object',

src/onebot11/action/msg/DeleteMsg.ts

@@ -1,7 +1,7 @@
 import { NTQQMsgApi } from '@/core/apis';
 import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 const SchemaData = {

src/onebot11/action/msg/ForwardSingleMsg.ts

@@ -1,62 +1,62 @@
-import BaseAction from '../BaseAction';
-import { NTQQMsgApi } from '@/core/apis';
-import { ChatType, Peer } from '@/core/entities';
-import { dbUtil } from '@/core/utils/db';
-import { getUidByUin } from '@/core/data';
-import { ActionName } from '../types';
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-
-const SchemaData = {
-  type: 'object',
-  properties: {
-    message_id: { type: 'number' },
-    group_id: { type: 'number' },
-    user_id: { type: 'number' }
-  },
-  required: ['message_id']
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-class ForwardSingleMsg extends BaseAction<Payload, null> {
-  protected async getTargetPeer(payload: Payload): Promise<Peer> {
-    if (payload.user_id) {
-      const peerUid = getUidByUin(payload.user_id.toString());
-      if (!peerUid) {
-        throw new Error(`无法找到私聊对象${payload.user_id}`);
-      }
-      return { chatType: ChatType.friend, peerUid };
-    }
-    return { chatType: ChatType.group, peerUid: payload.group_id!.toString() };
-  }
-
-  protected async _handle(payload: Payload): Promise<null> {
-    const msg = await dbUtil.getMsgByShortId(payload.message_id);
-    if (!msg) {
-      throw new Error(`无法找到消息${payload.message_id}`);
-    }
-    const peer = await this.getTargetPeer(payload);
-    const ret = await NTQQMsgApi.forwardMsg(
-      {
-        chatType: msg.chatType,
-        peerUid: msg.peerUid,
-      },
-      peer,
-      [msg.msgId],
-    );
-    if (ret.result !== 0) {
-      throw new Error(`转发消息失败 ${ret.errMsg}`);
-    }
-    return null;
-  }
-}
-
-export class ForwardFriendSingleMsg extends ForwardSingleMsg {
-  PayloadSchema = SchemaData;
-  actionName = ActionName.ForwardFriendSingleMsg;
-}
-
-export class ForwardGroupSingleMsg extends ForwardSingleMsg {
-  PayloadSchema = SchemaData;
-  actionName = ActionName.ForwardGroupSingleMsg;
-}
+import BaseAction from '../BaseAction';
+import { NTQQMsgApi } from '@/core/apis';
+import { ChatType, Peer } from '@/core/entities';
+import { dbUtil } from '@/common/utils/db';
+import { getUidByUin } from '@/core/data';
+import { ActionName } from '../types';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+
+const SchemaData = {
+  type: 'object',
+  properties: {
+    message_id: { type: 'number' },
+    group_id: { type: 'number' },
+    user_id: { type: 'number' }
+  },
+  required: ['message_id']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+class ForwardSingleMsg extends BaseAction<Payload, null> {
+  protected async getTargetPeer(payload: Payload): Promise<Peer> {
+    if (payload.user_id) {
+      const peerUid = getUidByUin(payload.user_id.toString());
+      if (!peerUid) {
+        throw new Error(`无法找到私聊对象${payload.user_id}`);
+      }
+      return { chatType: ChatType.friend, peerUid };
+    }
+    return { chatType: ChatType.group, peerUid: payload.group_id!.toString() };
+  }
+
+  protected async _handle(payload: Payload): Promise<null> {
+    const msg = await dbUtil.getMsgByShortId(payload.message_id);
+    if (!msg) {
+      throw new Error(`无法找到消息${payload.message_id}`);
+    }
+    const peer = await this.getTargetPeer(payload);
+    const ret = await NTQQMsgApi.forwardMsg(
+      {
+        chatType: msg.chatType,
+        peerUid: msg.peerUid,
+      },
+      peer,
+      [msg.msgId],
+    );
+    if (ret.result !== 0) {
+      throw new Error(`转发消息失败 ${ret.errMsg}`);
+    }
+    return null;
+  }
+}
+
+export class ForwardFriendSingleMsg extends ForwardSingleMsg {
+  PayloadSchema = SchemaData;
+  actionName = ActionName.ForwardFriendSingleMsg;
+}
+
+export class ForwardGroupSingleMsg extends ForwardSingleMsg {
+  PayloadSchema = SchemaData;
+  actionName = ActionName.ForwardGroupSingleMsg;
+}

src/onebot11/action/msg/GetMsg.ts

@@ -2,7 +2,7 @@ import { OB11Message } from '../../types';
 import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 

src/onebot11/action/msg/SendMsg/create-send-elements.ts

@@ -10,7 +10,7 @@ import {
   SendMsgElementConstructor
 } from '@/core';
 import { getGroupMember } from '@/core/data';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import { logDebug, logError } from '@/common/utils/log';
 import { uri2local } from '@/common/utils/file';
 import { ob11Config } from '@/onebot11/config';

src/onebot11/action/msg/SendMsg/handle-forward-node.ts

@@ -1,7 +1,7 @@
 import { ChatType, ElementType, Group, NTQQMsgApi, Peer, RawMessage, SendMessageElement } from '@/core';
 import { OB11MessageNode } from '@/onebot11/types';
 import { selfInfo } from '@/core/data';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import createSendElements from '@/onebot11/action/msg/SendMsg/create-send-elements';
 import { logDebug, logError } from '@/common/utils/log';
 import { sleep } from '@/common/utils/helper';

src/onebot11/action/msg/SendMsg/index.ts

@@ -8,7 +8,7 @@ import {
 } from '@/onebot11/types';
 import { ActionName, BaseCheckResult } from '@/onebot11/action/types';
 import { getFriend, getGroup, getUidByUin } from '@/core/data';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import { ChatType, ElementType, Group, NTQQMsgApi, Peer, SendMessageElement, } from '@/core';
 import fs from 'node:fs';
 import { logDebug, logError } from '@/common/utils/log';

src/onebot11/action/msg/SetMsgEmojiLike.ts

@@ -1,6 +1,6 @@
 import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import { NTQQMsgApi } from '@/core/apis';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 

src/onebot11/action/system/CleanCache.ts

@@ -7,7 +7,7 @@ import {
   ChatCacheListItemBasic,
   CacheFileType
 } from '@/core/entities';
-import { dbUtil } from '@/core/utils/db';
+import { dbUtil } from '@/common/utils/db';
 import { NTQQFileApi, NTQQFileCacheApi } from '@/core/apis/file';
 
 export default class CleanCache extends BaseAction<void, void> {