node-karin 0.11.2 → 0.11.4

package/lib/adapter/onebot/11/convert.js

@@ -24,7 +24,7 @@ export function AdapterConvertKarin(data) {
                 elements.push(segment.video(i.data.url || i.data.file));
                 break;
             case 'at':
-                elements.push(segment.at(i.data.qq, i.data.qq));
+                elements.push(segment.at(i.data.qq, i.data.qq, i.data.name));
                 break;
             case 'poke':
                 elements.push(segment.poke(Number(i.data.id), Number(i.data.type)));
@@ -81,7 +81,7 @@ export function KarinConvertAdapter(data, bot) {
                 elements.push({ type, data: { id: i.id } });
                 break;
             case "at" /* OB11SegmentType.At */:
-                elements.push({ type, data: { qq: String(i.uid || i.uin) } });
+                elements.push({ type, data: { qq: String(i.uid || i.uin), name: i.name } });
                 break;
             case "reply" /* OB11SegmentType.Reply */:
                 elements.push({ type, data: { id: i.message_id } });

package/lib/core/plugin/loader.js

@@ -192,7 +192,7 @@ class PluginLoader {
         const list = [];
         const info = await common.getNpmPlugins(true);
         for (const { plugin, path: _path, file, isMain } of info) {
-            if (!isMain) {
+            if (isMain) {
                 const root = path.join(process.cwd(), 'node_modules', plugin, _path);
                 this.loadMain(root, file, true);
                 continue;

package/lib/event/handler/base.js

@@ -8,13 +8,13 @@ export class EventBaseHandler {
     /**
      * - 是否打印群消息日志
      */
-    GroupMsgPrint = true;
+    GroupMsgPrint;
     /**
      * 处理事件，加入自定义字段
      */
     constructor(e) {
         this.e = e;
-        this.GroupMsgPrint = false;
+        this.GroupMsgPrint = true;
         /** 加入e.bot */
         !this.e.bot && Object.defineProperty(this.e, 'bot', { value: listener.getBot(this.e.self_id) });
         if (this.e.group_id)

package/lib/event/handler/message.js

@@ -248,7 +248,7 @@ export class MessageHandler extends EventBaseHandler {
                         res = await info.fn.call(app, this.e);
                     }
                     this.GroupMsgPrint && info.log(this.e.self_id, `${logFnc} ${lodash.truncate(this.e.msg, { length: 80 })} 处理完成 ${logger.green(Date.now() - start + 'ms')}`);
-                    if (res !== false)
+                    if (res === false)
                         continue;
                     return;
                 }

package/lib/event/handler/notice.js

@@ -27,6 +27,7 @@ export class NoticeHandler extends EventBaseHandler {
         this.deal();
     }
     init() {
+        this.raw_message();
         /** 主人 */
         if (config.master.includes(String(this.e.user_id))) {
             this.e.isMaster = true;
@@ -55,7 +56,6 @@ export class NoticeHandler extends EventBaseHandler {
         else {
             logger.bot('info', this.e.self_id, `未知来源通知事件：${JSON.stringify(this.e)}`);
         }
-        this.raw_message();
         this.reply();
     }
     /**

package/lib/event/handler/request.js

@@ -27,6 +27,7 @@ export class RequestHandler extends EventBaseHandler {
         this.deal();
     }
     init() {
+        this.raw_message();
         /** 主人 */
         if (config.master.includes(String(this.e.user_id))) {
             this.e.isMaster = true;
@@ -50,7 +51,6 @@ export class RequestHandler extends EventBaseHandler {
         else {
             logger.bot('info', this.e.self_id, `未知来源请求事件：${JSON.stringify(this.e)}`);
         }
-        this.raw_message();
         this.reply();
     }
     /**

package/lib/types/onebot11/segment.d.ts

@@ -95,6 +95,7 @@ export interface AtSegment extends Segment {
     type: OB11SegmentType.At;
     data: {
         qq: string | 'all';
+        name?: string;
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",