From 00f8e1c0da44af2415aa7e757b42a711c322956f 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?=
 <nanaeonn@outlook.com>
Date: Sun, 1 Sep 2024 13:41:19 +0800
Subject: [PATCH] Revert "fix: fileId"

This reverts commit ae009f98c1bee7fd411488c8e6a47cc6b17280f1.
---
 src/common/helper.ts                   | 12 +++++-------
 src/onebot/action/file/DelGroupFile.ts |  5 +----
 src/onebot/entities.ts                 |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/common/helper.ts b/src/common/helper.ts
index 8b28e0b1..aa37e0cd 100644
--- a/src/common/helper.ts
+++ b/src/common/helper.ts
@@ -25,26 +25,24 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
 }
 
 export class FileNapCatOneBotUUID {
-    static encodeModelId(peer: Peer, modelId: string, fileId: string): string {
-        return `NapCatOneBot-ModelIdFile-${peer.chatType}-${peer.peerUid}-${modelId}-${fileId}`;
+    static encodeModelId(peer: Peer, modelId: string): string {
+        return `NapCatOneBot-ModelIdFile-${peer.chatType}-${peer.peerUid}-${modelId}`;
     }
 
     static decodeModelId(uuid: string): undefined | {
         peer: Peer,
-        modelId: string,
-        fileId: string
+        modelId: string
     } {
         if (!uuid.startsWith('NapCatOneBot-ModelIdFile-')) return undefined;
         const data = uuid.split('-');
-        if (data.length !== 6) return undefined;
-        const [, , chatType, peerUid, modelId, fileId] = data;
+        if (data.length !== 5) return undefined;
+        const [, , chatType, peerUid, modelId] = data;
         return {
             peer: {
                 chatType: chatType as any,
                 peerUid: peerUid,
             },
             modelId,
-            fileId
         };
     }
 
diff --git a/src/onebot/action/file/DelGroupFile.ts b/src/onebot/action/file/DelGroupFile.ts
index 17baafc4..241edb4b 100644
--- a/src/onebot/action/file/DelGroupFile.ts
+++ b/src/onebot/action/file/DelGroupFile.ts
@@ -1,7 +1,6 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { FileNapCatOneBotUUID } from '@/common/helper';
 
 const SchemaData = {
     type: 'object',
@@ -19,8 +18,6 @@ export class DelGroupFile extends BaseAction<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const file = FileNapCatOneBotUUID.decodeModelId(payload.file_id);
-        if(!file) throw new Error('file_id is invalid');
-        return await this.core.apis.GroupApi.DelGroupFile(payload.group_id.toString(), [file.fileId]);
+        return await this.core.apis.GroupApi.DelGroupFile(payload.group_id.toString(), [payload.file_id]);
     }
 }
diff --git a/src/onebot/entities.ts b/src/onebot/entities.ts
index 989236d8..a043dd0d 100644
--- a/src/onebot/entities.ts
+++ b/src/onebot/entities.ts
@@ -109,7 +109,7 @@ export class OB11Entities {
     static file(peerId: string, file: Exclude<GroupFileInfoUpdateParamType['item'][0]['fileInfo'], undefined>): OB11GroupFile {
         return {
             group_id: parseInt(peerId),
-            file_id: FileNapCatOneBotUUID.encodeModelId({ chatType: 2, peerUid: peerId }, file.fileModelId, file.fileId),
+            file_id: FileNapCatOneBotUUID.encodeModelId({ chatType: 2, peerUid: peerId }, file.fileModelId),
             file_name: file.fileName,
             busid: file.busId,
             size: parseInt(file.fileSize),