release: 1.8.4

LICENSE

@@ -1,24 +1,373 @@
-BSD 2-Clause License
+Mozilla Public License Version 2.0
+==================================
 
-Copyright (c) 2024, NapNeko
+1. Definitions
+--------------
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

docs/changelogs/CHANGELOG.v1.8.4.md

@@ -1,4 +1,4 @@
-# v1.8.3
+# v1.8.4
 
 QQ Version: Windows 9.9.15-26702 / Linux 3.2.12-26702
 
@@ -6,8 +6,7 @@ QQ Version: Windows 9.9.15-26702 / Linux 3.2.12-26702
 Way03/Way05
 
 ## 新增与调整
-1. 输入状态变更事件加入
-2. Way05 支持Bat启动
+1. 支持主动临时消息
 
 
 新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.8.6",
+  "version": "1.8.4",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",

src/onebot11/action/extends/Config.ts

@@ -1,20 +0,0 @@
-import BaseAction from '../BaseAction';
-import { OB11Config, ob11Config } from '@/onebot11/config';
-import { ActionName } from '../types';
-
-
-export class GetConfigAction extends BaseAction<null, OB11Config> {
-  actionName = ActionName.GetConfig;
-
-  protected async _handle(payload: null): Promise<OB11Config> {
-    return ob11Config;
-  }
-}
-
-export class SetConfigAction extends BaseAction<OB11Config, void> {
-  actionName = ActionName.SetConfig;
-
-  protected async _handle(payload: OB11Config): Promise<void> {
-    ob11Config.save(payload, true);
-  }
-}

src/onebot11/action/group/GetGroupMemberInfoOld.ts

@@ -1,84 +0,0 @@
-import { OB11GroupMember } from '../../types';
-import { getGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data';
-import { OB11Constructor } from '../../constructor';
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/apis/user';
-import { logDebug } from '@/common/utils/log';
-import { WebApi } from '@/core/apis/webapi';
-import { NTQQGroupApi } from '@/core';
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
-
-// no_cache get时传字符串
-const SchemaData = {
-  type: 'object',
-  properties: {
-    group_id: { type: ['number', 'string'] },
-    user_id: { type: ['number', 'string'] },
-    no_cache: { type: ['boolean', 'string'] },
-  },
-  required: ['group_id', 'user_id']
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
-  actionName = ActionName.GetGroupMemberInfo;
-  PayloadSchema = SchemaData;
-  protected async _handle(payload: Payload) {
-    if (requireMinNTQQBuild('26702')) {
-      const V2Data = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), payload.user_id.toString(), payload.no_cache == true || payload.no_cache === 'true');
-      if (V2Data) {
-        return OB11Constructor.groupMember(payload.group_id.toString(), V2Data);
-      } else {
-        throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
-      }
-    }
-    const group = await getGroup(payload.group_id.toString());
-    const role = (await getGroupMember(payload.group_id, selfInfo.uin))?.role;
-    const isPrivilege = role === 3 || role === 4;
-    if (!group) {
-      throw (`群(${payload.group_id})不存在`);
-    }
-    if (payload.no_cache == true || payload.no_cache === 'true') {
-      groupMembers.set(group.groupCode, await NTQQGroupApi.getGroupMembers(payload.group_id.toString()));
-    }
-    const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString());
-    //早返回
-    if (!member) {
-      throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
-    }
-    //console.log('GetGroupMemberInfo', JSON.stringify(await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), member.uid, true), null, 4));
-    try {
-      const info = (await NTQQUserApi.getUserDetailInfo(member.uid));
-      logDebug('群成员详细信息结果', info);
-      Object.assign(member, info);
-    } catch (e) {
-      logDebug('获取群成员详细信息失败, 只能返回基础信息', e);
-    }
-    const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
-    if (isPrivilege) {
-      const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
-      for (let i = 0, len = webGroupMembers.length; i < len; i++) {
-        if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) {
-          retMember.join_time = webGroupMembers[i]?.join_time;
-          retMember.last_sent_time = webGroupMembers[i]?.last_speak_time;
-          retMember.qage = webGroupMembers[i]?.qage;
-          retMember.level = webGroupMembers[i]?.lv.level.toString();
-        }
-      }
-    } else {
-      const LastestMsgList = await NTQQGroupApi.getLastestMsg(payload.group_id.toString(), [payload.user_id.toString()]);
-      if (LastestMsgList?.msgList?.length && LastestMsgList?.msgList?.length > 0) {
-        const last_send_time = LastestMsgList.msgList[0].msgTime;
-        if (last_send_time && last_send_time != '0' && last_send_time != '') {
-          retMember.last_sent_time = parseInt(last_send_time);
-          retMember.join_time = Math.round(Date.now() / 1000);//兜底数据 防止群管乱杀
-        }
-      }
-    }
-    return retMember;
-  }
-}
-export default GetGroupMemberInfo;

src/onebot11/action/group/SetGroupBan.ts

@@ -3,7 +3,6 @@ import { getGroupMember } from '@/core/data';
 import { ActionName } from '../types';
 import { NTQQGroupApi } from '@/core/apis/group';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { NTQQUserApi } from '@/core';
 
 const SchemaData = {
   type: 'object',
@@ -21,8 +20,12 @@ export default class SetGroupBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupBan;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
+    const member = await getGroupMember(payload.group_id, payload.user_id);
+    if (!member) {
+      throw `群成员${payload.user_id}不存在`;
+    }
     await NTQQGroupApi.banMember(payload.group_id.toString(),
-      [{ uid: (await NTQQUserApi.getUidByUin(payload.user_id.toString()))!, timeStamp: parseInt(payload.duration.toString()) }]);
+      [{ uid: member.uid, timeStamp: parseInt(payload.duration.toString()) }]);
     return null;
   }
 }

src/onebot11/action/group/SetGroupKick.ts

@@ -3,7 +3,6 @@ import { getGroupMember } from '@/core/data';
 import { ActionName } from '../types';
 import { NTQQGroupApi } from '@/core/apis/group';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { NTQQUserApi } from '@/core';
 
 
 const SchemaData = {
@@ -22,8 +21,12 @@ export default class SetGroupKick extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupKick;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
+    const member = await getGroupMember(payload.group_id, payload.user_id);
+    if (!member) {
+      throw `群成员${payload.user_id}不存在`;
+    }
     const rejectReq = payload.reject_add_request?.toString() == 'true';
-    await NTQQGroupApi.kickMember(payload.group_id.toString(), [(await NTQQUserApi.getUidByUin(payload.user_id.toString()))!], rejectReq);
+    await NTQQGroupApi.kickMember(payload.group_id.toString(), [member.uid], rejectReq);
     return null;
   }
 }

src/onebot11/action/system/CleanCache.ts

@@ -1,93 +0,0 @@
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import fs from 'fs';
-import Path from 'path';
-import {
-  ChatType,
-  ChatCacheListItemBasic,
-  CacheFileType
-} from '@/core/entities';
-import { NTQQFileApi, NTQQFileCacheApi } from '@/core/apis/file';
-import { logError } from '@/common/utils/log';
-
-export default class CleanCache extends BaseAction<void, void> {
-  actionName = ActionName.CleanCache;
-
-  protected _handle(): Promise<void> {
-    return new Promise<void>(async (res, rej) => {
-      try {
-        // dbUtil.clearCache();
-        const cacheFilePaths: string[] = [];
-
-        await NTQQFileCacheApi.setCacheSilentScan(false);
-
-        cacheFilePaths.push((await NTQQFileCacheApi.getHotUpdateCachePath()));
-        cacheFilePaths.push((await NTQQFileCacheApi.getDesktopTmpPath()));
-        (await NTQQFileCacheApi.getCacheSessionPathList()).forEach((e: { value: string; }) => cacheFilePaths.push(e.value));
-
-        // await NTQQApi.addCacheScannedPaths(); // XXX: 调用就崩溃，原因目前还未知
-        const cacheScanResult = await NTQQFileCacheApi.scanCache();
-        const cacheSize = parseInt(cacheScanResult.size[6]);
-
-        if (cacheScanResult.result !== 0) {
-          throw('Something went wrong while scanning cache. Code: ' + cacheScanResult.result);
-        }
-
-        await NTQQFileCacheApi.setCacheSilentScan(true);
-        if (cacheSize > 0 && cacheFilePaths.length > 2) { // 存在缓存文件且大小不为 0 时执行清理动作
-          // await NTQQApi.clearCache([ 'tmp', 'hotUpdate', ...cacheScanResult ]) // XXX: 也是调用就崩溃，调用 fs 删除得了
-          deleteCachePath(cacheFilePaths);
-        }
-
-        // 获取聊天记录列表
-        // NOTE: 以防有人不需要删除聊天记录，暂时先注释掉，日后加个开关
-        // const privateChatCache = await getCacheList(ChatType.friend); // 私聊消息
-        // const groupChatCache = await getCacheList(ChatType.group); // 群聊消息
-        // const chatCacheList = [ ...privateChatCache, ...groupChatCache ];
-        const chatCacheList: ChatCacheListItemBasic[] = [];
-
-        // 获取聊天缓存文件列表
-        const cacheFileList: string[] = [];
-                
-        for (const name in CacheFileType) {
-          if (!isNaN(parseInt(name))) continue;
-
-          const fileTypeAny: any = CacheFileType[name];
-          const fileType: CacheFileType = fileTypeAny;
-
-          cacheFileList.push(...(await NTQQFileCacheApi.getFileCacheInfo(fileType)).infos.map((file: { fileKey: any; }) => file.fileKey));
-        }
-
-        // 一并清除
-        await NTQQFileCacheApi.clearChatCache(chatCacheList, cacheFileList);
-        res();
-      } catch(e) {
-        logError('清理缓存时发生了错误');
-        rej(e);
-      }
-    });
-  }
-}
-
-function deleteCachePath(pathList: string[]) {
-  const emptyPath = (path: string) => {
-    if (!fs.existsSync(path)) return;
-    const files = fs.readdirSync(path);
-    files.forEach(file => {
-      const filePath = Path.resolve(path, file);
-      const stats = fs.statSync(filePath);
-      if (stats.isDirectory()) emptyPath(filePath);
-      else fs.unlinkSync(filePath);
-    });
-    fs.rmdirSync(path);
-  };
-
-  for (const path of pathList) {
-    emptyPath(path);
-  }
-}
-
-function getCacheList(type: ChatType) { // NOTE: 做这个方法主要是因为目前还不支持针对频道消息的清理
-  return new Promise<Array<ChatCacheListItemBasic>>((res, rej) => {
-  });
-}

src/onebot11/constructor.ts

@@ -228,18 +228,16 @@ export class OB11Constructor {
         const videoElement: VideoElement = element.videoElement;
         //读取视频链接并兜底
         let videoUrl;//Array
-        let peer:Peer = {
-          chatType: msg.chatType,
-          peerUid: msg.peerUid,
-          guildId: '0'
-        };
-        if (msg.peerUin == '284840486') {
-          peer = msg.parentMsgPeer;
+        if (msg.peerUin = '284840486') {
           //合并消息内部 应该进行特殊处理 可能需要重写peer 待测试与研究 Mlikiowa Taged TODO
         }
         try {
 
-          videoUrl = await NTQQFileApi.getVideoUrl(peer, msg.msgId, element.elementId);
+          videoUrl = await NTQQFileApi.getVideoUrl({
+            chatType: msg.chatType,
+            peerUid: msg.peerUid,
+            guildId: '0'
+          }, msg.msgId, element.elementId);
         } catch (error) {
           videoUrl = undefined;
         }

src/onebot11/event/notice/OB11InputStatusEvent.ts

@@ -4,12 +4,12 @@ export class OB11InputStatusEvent extends OB11BaseNoticeEvent {
   notice_type = 'notify';
   sub_type = 'input_status';
   status_text = '对方正在输入...';
-  event_type = 1;
+  eventType = 1;
   user_id = 0;
   constructor(user_id: number, eventType: number, status_text: string) {
     super();
     this.user_id = user_id;
-    this.event_type = eventType;
+    this.eventType = eventType;
     this.status_text = status_text;
   }
 }

src/onebot11/version.ts

@@ -1 +1 @@
-export const version = '1.8.6';
+export const version = '1.8.4';

src/webui/ui/NapCat.ts

@@ -29,7 +29,7 @@ async function onSettingWindowCreated(view: Element) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           undefined,
-          SettingButton('V1.8.6', 'napcat-update-button', 'secondary')
+          SettingButton('V1.8.4', 'napcat-update-button', 'secondary')
         ),
       ]),
       SettingList([

static/assets/renderer.js

@@ -163,7 +163,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V1.8.6", "napcat-update-button", "secondary")
+          SettingButton("V1.8.4", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([