From dfb31b78d9702360cb38d1064bf639e58f587845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Fri, 9 Aug 2024 17:01:29 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=89=80=E6=9C=89=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=B0=B1=E7=BB=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/core.ts | 3 ++- src/core/wrapper/context.ts | 3 ++- src/onebot/action/extends/FetchEmojioLike.ts | 1 - src/onebot/action/extends/OCRImage.ts | 3 ++- src/onebot/action/extends/SetGroupHeader.ts | 4 ++-- src/onebot/action/extends/SetQQAvatar.ts | 5 +---- src/onebot/action/extends/SetSelfProfile.ts | 1 - src/onebot/action/extends/TranslateEnWordToZn.ts | 2 +- src/onebot/action/extends/sharePeer.ts | 1 - 9 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/core/core.ts b/src/core/core.ts index 7e0fca87..b0ea6bd6 100644 --- a/src/core/core.ts +++ b/src/core/core.ts @@ -8,7 +8,7 @@ import { MsgListener, ProfileListener } from "./listeners"; import { sleep } from "@/common/utils/helper"; import { SelfInfo, LineDevice, SelfStatusInfo } from "./entities"; import { LegacyNTEventWrapper } from "@/common/framework/event-legacy"; -import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQUserApi, NTQQWebApi } from "./apis"; +import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQSystemApi, NTQQUserApi, NTQQWebApi } from "./apis"; import os from "node:os"; import { NTQQCollectionApi } from "./apis/collection"; export enum NapCatCoreWorkingEnv { @@ -43,6 +43,7 @@ export class NapCatCore { this.eventWrapper = new LegacyNTEventWrapper(context.wrapper, context.session); this.initNapCatCoreListeners().then().catch(console.error); this.ApiContext = { + SystemApi:new NTQQSystemApi(this.context, this), CollectionApi:new NTQQCollectionApi(this.context, this), WebApi: new NTQQWebApi(this.context, this), FriendApi: new NTQQFriendApi(this.context, this), diff --git a/src/core/wrapper/context.ts b/src/core/wrapper/context.ts index 114f668b..4f27ab31 100644 --- a/src/core/wrapper/context.ts +++ b/src/core/wrapper/context.ts @@ -4,7 +4,7 @@ import { NapCatCoreWorkingEnv } from "@/core"; import { SelfInfo } from "../entities"; import { NodeIKernelLoginService } from "../services"; import { WrapperNodeApi, NodeIQQNTWrapperSession } from "@/core"; -import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQUserApi, NTQQWebApi } from "../apis"; +import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQSystemApi, NTQQUserApi, NTQQWebApi } from "../apis"; import { NTQQCollectionApi } from "../apis/collection"; export interface InstanceContext { @@ -16,6 +16,7 @@ export interface InstanceContext { readonly basicInfoWrapper: QQBasicInfoWrapper; } export interface NTApiContext { + SystemApi: NTQQSystemApi, CollectionApi: NTQQCollectionApi, WebApi: NTQQWebApi, FriendApi: NTQQFriendApi, diff --git a/src/onebot/action/extends/FetchEmojioLike.ts b/src/onebot/action/extends/FetchEmojioLike.ts index 6002118c..29f54527 100644 --- a/src/onebot/action/extends/FetchEmojioLike.ts +++ b/src/onebot/action/extends/FetchEmojioLike.ts @@ -2,7 +2,6 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; -import { NTQQMsgApi } from '@/core/apis'; import { MessageUnique } from '@/common/utils/MessageUnique'; const SchemaData = { type: 'object', diff --git a/src/onebot/action/extends/OCRImage.ts b/src/onebot/action/extends/OCRImage.ts index d01fd2cc..cc388e05 100644 --- a/src/onebot/action/extends/OCRImage.ts +++ b/src/onebot/action/extends/OCRImage.ts @@ -18,7 +18,8 @@ export class OCRImage extends BaseAction { actionName = ActionName.OCRImage; PayloadSchema = SchemaData; protected async _handle(payload: Payload) { - const { path, isLocal, errMsg,success } = (await uri2local(payload.image)); + const NTQQSystemApi = this.CoreContext.getApiContext().SystemApi; + const { path, isLocal, errMsg,success } = (await uri2local(this.CoreContext.NapCatTempPath,payload.image)); if (!success) { throw `OCR ${payload.image}失败,image字段可能格式不正确`; } diff --git a/src/onebot/action/extends/SetGroupHeader.ts b/src/onebot/action/extends/SetGroupHeader.ts index 4f1cfe9d..3f6c34ad 100644 --- a/src/onebot/action/extends/SetGroupHeader.ts +++ b/src/onebot/action/extends/SetGroupHeader.ts @@ -26,13 +26,13 @@ export default class SetGroupHeader extends BaseAction { } protected async _handle(payload: Payload): Promise { const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; - const { path, isLocal, errMsg,success } = (await uri2local(payload.file)); + const { path, isLocal, errMsg, success } = (await uri2local(this.CoreContext.NapCatTempPath, payload.file)); if (!success) { throw `头像${payload.file}设置失败,file字段可能格式不正确`; } if (path) { await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断 - const ret = await NTQQGroupApi.setGroupAvatar(payload.groupCode,path); + const ret = await NTQQGroupApi.setGroupAvatar(payload.groupCode, path); if (!isLocal) { fs.unlink(path, () => { }); } diff --git a/src/onebot/action/extends/SetQQAvatar.ts b/src/onebot/action/extends/SetQQAvatar.ts index abcf9652..45ca8fd7 100644 --- a/src/onebot/action/extends/SetQQAvatar.ts +++ b/src/onebot/action/extends/SetQQAvatar.ts @@ -1,10 +1,7 @@ import BaseAction from '../BaseAction'; import { ActionName, BaseCheckResult } from '../types'; import * as fs from 'node:fs'; -import { NTQQUserApi } from '@/core/apis/user'; import { checkFileReceived, uri2local } from '@/common/utils/file'; -// import { log } from "../../../common/utils"; - interface Payload { file: string } @@ -25,7 +22,7 @@ export default class SetAvatar extends BaseAction { } protected async _handle(payload: Payload): Promise { const NTQQUserApi = this.CoreContext.getApiContext().UserApi; - const { path, isLocal, errMsg,success } = (await uri2local(payload.file)); + const { path, isLocal, errMsg, success } = (await uri2local(this.CoreContext.NapCatTempPath, payload.file)); if (!success) { throw `头像${payload.file}设置失败,file字段可能格式不正确`; } diff --git a/src/onebot/action/extends/SetSelfProfile.ts b/src/onebot/action/extends/SetSelfProfile.ts index 4a9ada91..1f333e30 100644 --- a/src/onebot/action/extends/SetSelfProfile.ts +++ b/src/onebot/action/extends/SetSelfProfile.ts @@ -1,7 +1,6 @@ import BaseAction from '../BaseAction'; import { ActionName } from '../types'; -import { NTQQUserApi } from '@/core/apis'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; const SchemaData = { diff --git a/src/onebot/action/extends/TranslateEnWordToZn.ts b/src/onebot/action/extends/TranslateEnWordToZn.ts index 4c3a5f94..2197f07d 100644 --- a/src/onebot/action/extends/TranslateEnWordToZn.ts +++ b/src/onebot/action/extends/TranslateEnWordToZn.ts @@ -20,7 +20,7 @@ export class TranslateEnWordToZn extends BaseAction | null> actionName = ActionName.TranslateEnWordToZn; PayloadSchema = SchemaData; protected async _handle(payload: Payload) { - + const NTQQSystemApi = this.CoreContext.getApiContext().SystemApi; const ret = await NTQQSystemApi.translateEnWordToZn(payload.words); if (ret.result !== 0) { throw new Error('翻译失败'); diff --git a/src/onebot/action/extends/sharePeer.ts b/src/onebot/action/extends/sharePeer.ts index e98cddd1..9bb4d925 100644 --- a/src/onebot/action/extends/sharePeer.ts +++ b/src/onebot/action/extends/sharePeer.ts @@ -40,7 +40,6 @@ export class shareGroupEx extends BaseAction { actionName = ActionName.ShareGroupEx; PayloadSchema = SchemaDataGroupEx; protected async _handle(payload: PayloadGroupEx) { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; return await NTQQGroupApi.getArkJsonGroupShare(payload.group_id); }