node-karin 0.11.1 → 0.11.3

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;
@@ -337,7 +337,7 @@ class PluginLoader {
                 logger.debug(`载入插件 [${plugin}]${_path ? `${common.getRelPath(_path)}` : ''}[${file}][${Class.name}]`);
                 if (Class.rule.length) {
                     for (const val of Class.rule) {
-                        list.push(() => {
+                        const fnc = async () => {
                             const log = val.log === false
                                 ? (id, log) => logger.debug('mark', id, log)
                                 : (id, log) => logger.bot('mark', id, log);
@@ -354,12 +354,13 @@ class PluginLoader {
                                 rank: val.priority || Class.priority || 10000,
                                 reg: val.reg instanceof RegExp ? val.reg : new RegExp(val.reg),
                             }, Fn);
-                        });
+                        };
+                        list.push(fnc());
                     }
                 }
                 if (Class.task.length) {
                     for (const val of Class.task) {
-                        list.push(() => {
+                        const fnc = async () => {
                             if (!val.name)
                                 throw TypeError(`[${plugin}][${file}] 定时任务name错误`);
                             if (!val.cron)
@@ -373,13 +374,12 @@ class PluginLoader {
                                 log,
                                 cron: val.cron,
                             }, Fn);
-                        });
+                        };
+                        list.push(fnc());
                     }
                 }
                 /** init */
-                list.push(async () => {
-                    'init' in Class && typeof Class.init === 'function' && await Class.init();
-                });
+                list.push('init' in Class && typeof Class.init === 'function' ? Class.init() : Promise.resolve());
                 return true;
             });
             await Promise.all(list);
@@ -461,7 +461,7 @@ class PluginLoader {
                     perm: info.perm,
                     rank: info.rank,
                     reg: info.reg,
-                    type: 'function',
+                    type: App ? 'class' : 'function',
                 });
                 return true;
             }

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.1",
+  "version": "0.11.3",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",