Merge branch 'main' into refactor/packet-2

src/onebot/api/msg.ts

@@ -185,6 +185,8 @@ export class OneBotMsgApi {
                     file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "", "." + _.key + ".jpg"),
                     path: url,
                     url: url,
+                    key: _.key,
+                    emoji_id: _.emojiId,
                     file_unique: _.key
                 },
             };

src/onebot/event/notice/BotOfflineEvent.ts

@@ -0,0 +1,16 @@
+import { OB11BaseNoticeEvent } from './OB11BaseNoticeEvent';
+import { NapCatCore } from '@/core';
+
+export class BotOfflineEvent extends OB11BaseNoticeEvent {
+    notice_type = 'bot_offline';
+    user_id: number;
+    tag: string = 'BotOfflineEvent';
+    message: string = 'BotOfflineEvent';
+
+    public constructor(core: NapCatCore, tag: string, message: string) {
+        super(core);
+        this.user_id = +core.selfInfo.uin;
+        this.tag = tag;
+        this.message = message;
+    }
+}

src/onebot/index.ts

@@ -46,6 +46,8 @@ import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecal
 import { LRUCache } from '@/common/lru-cache';
 import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener';
 import { Native } from '@/native';
+//import { decodeMessage, decodeRecallGroup } from '@/core/packet/proto/old/Message';
+import { BotOfflineEvent } from './event/notice/BotOfflineEvent';
 
 //OneBot实现类
 export class NapCatOneBot11Adapter {
@@ -343,7 +345,11 @@ export class NapCatOneBot11Adapter {
                 }
             }
         };
-
+        msgListener.onKickedOffLine = async (kick) => {
+            let event = new BotOfflineEvent(this.core, kick.tipsTitle, kick.tipsDesc);
+            this.networkManager.emitEvent(event)
+                .catch(e => this.context.logger.logError.bind(this.context.logger)('处理Bot掉线失败', e));
+        }
         this.context.session.getMsgService().addKernelMsgListener(
             proxiedListenerOf(msgListener, this.context.logger),
         );