diff --git a/src/common/utils/ConfigBase.ts b/src/common/utils/ConfigBase.ts index 3a35d9ef..0304c347 100644 --- a/src/common/utils/ConfigBase.ts +++ b/src/common/utils/ConfigBase.ts @@ -1,6 +1,6 @@ import path from 'node:path'; import fs from 'node:fs'; -import { NapCatCore } from '@/core'; +import type { NapCatCore } from '@/core'; export class ConfigBase { public name: string = 'default_config'; private pathName: string | null = null; // 本次读取的文件路径 diff --git a/src/common/utils/file.ts b/src/common/utils/file.ts index 360ea5a4..262b8bd4 100644 --- a/src/common/utils/file.ts +++ b/src/common/utils/file.ts @@ -7,8 +7,6 @@ import * as fileType from 'file-type'; import { randomUUID } from 'crypto'; import { LogWrapper } from './log'; - - export function isGIF(path: string) { const buffer = Buffer.alloc(4); const fd = fs.openSync(path, 'r'); diff --git a/src/common/utils/helper.ts b/src/common/utils/helper.ts index 307afb42..fe73721a 100644 --- a/src/common/utils/helper.ts +++ b/src/common/utils/helper.ts @@ -3,6 +3,7 @@ import path from "node:path"; import fs from "fs"; import * as fsPromise from "node:fs/promises"; import os from "node:os"; +import { QQLevel } from "@/core"; //下面这个类是用于将uid+msgid合并的类 @@ -152,3 +153,7 @@ export async function deleteOldFiles(directoryPath: string, daysThreshold: numbe //console.error('Error deleting files:', error); } } +export function calcQQLevel(level: QQLevel) { + const { crownNum, sunNum, moonNum, starNum } = level; + return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum; +} diff --git a/src/common/utils/qqlevel.ts b/src/common/utils/qqlevel.ts deleted file mode 100644 index 7e957ddb..00000000 --- a/src/common/utils/qqlevel.ts +++ /dev/null @@ -1,7 +0,0 @@ -// QQ等级换算 -import { QQLevel } from '@/core/entities'; - -export function calcQQLevel(level: QQLevel) { - const { crownNum, sunNum, moonNum, starNum } = level; - return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum; -} diff --git a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts index 887adc23..25003aca 100644 --- a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts +++ b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts @@ -3,7 +3,7 @@ import { OB11User, OB11UserSex } from '../../types'; import { OB11Constructor } from '../../helper/data'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import { calcQQLevel } from '@/common/utils/qqlevel'; +import { calcQQLevel } from '@/common/utils/helper'; const SchemaData = { type: 'object', properties: { diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index 7f98013a..cf5350a1 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -32,7 +32,7 @@ import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent'; import { OB11GroupBanEvent } from '../event/notice/OB11GroupBanEvent'; import { OB11GroupUploadNoticeEvent } from '../event/notice/OB11GroupUploadNoticeEvent'; import { OB11GroupNoticeEvent } from '../event/notice/OB11GroupNoticeEvent'; -import { calcQQLevel } from '@/common/utils/qqlevel'; +import { calcQQLevel } from '@/common/utils/helper'; import { sleep, UUIDConverter } from '@/common/utils/helper'; import { OB11GroupTitleEvent } from '../event/notice/OB11GroupTitleEvent'; import { OB11GroupCardEvent } from '../event/notice/OB11GroupCardEvent';