Merge branch 'main' of https://gitee.com/hyperquantum/isekai-feedbot into main

channels/isekaiwiki/admin/autoReview.yml

@@ -1,11 +1,11 @@
-name: 自动审核通过
+name: 自动审核通过
-provider: pusher
+provider: pusher
-source:
+source:
-  service: pusher
+  service: pusher
-  channel: isekaiwiki
+  channel: isekaiwiki
-  type: autoReview
+  type: autoReview
-tpl:
+tpl:
-  default: |-
+  default: |-
-    {{{author}}} 更新了新页面: {{{title}}}
+    {{{author}}} 更新了新页面: {{{title}}}
-    {{{summary}}}
+    {{{summary}}}
-    {{{result}}}
+    {{{result}}}

channels/isekaiwiki/admin/needReview.yml

@@ -1,12 +1,12 @@
-name: 待审页面
+name: 待审页面
-provider: pusher
+provider: pusher
-source:
+source:
-  service: pusher
+  service: pusher
-  channel: isekaiwiki
+  channel: isekaiwiki
-  type: needReview
+  type: needReview
-tpl:
+tpl:
-  default: |-
+  default: |-
-    Review队列中增加了新页面:
+    Review队列中增加了新页面:
-    编辑者: {{{author}}}
+    编辑者: {{{author}}}
-    标题: {{{title}}}
+    标题: {{{title}}}
-    {{{summary}}}
+    {{{summary}}}

channels/isekaiwiki/editPage.yml

@@ -1,11 +1,11 @@
-name: 修改页面
+name: 修改页面
-provider: pusher
+provider: pusher
-source:
+source:
-  service: pusher
+  service: pusher
-  channel: isekaiwiki
+  channel: isekaiwiki
-  type: edit
+  type: edit
-tpl:
+tpl:
-  default: |-
+  default: |-
-    {{{author}}} 更新了页面《{{{title}}}》:
+    {{{author}}} 更新了页面: {{{title}}}
-    {{{summary}}}
+    {{{summary}}}
-    {{{url}}}
+    {{{url}}}

channels/isekaiwiki/newPage.yml

@@ -1,12 +1,11 @@
-name: 新页面
+name: 新页面
-provider: pusher
+provider: pusher
-source:
+source:
-  service: pusher
+  service: pusher
-  channel: isekaiwiki
+  channel: isekaiwiki
-  type: new
+  type: new
-tpl:
+tpl:
-  default: |-
+  default: |-
-    {{{author}}} 创建了新页面《{{{title}}}》:
+    {{{author}}} 创建了新页面: {{{title}}}
-    {{{summary}}}
+    {{{summary}}}
-    
+    {{{url}}}
-    {{{url}}}

src/RobotManager.ts

@@ -93,7 +93,7 @@ export class RobotManager {
             }
 
             try {
-                robot.sendMessage(targets, currentMsg);
+                await robot.sendMessage(targets, currentMsg);
             } catch(err) {
                 console.error(`[${channelId}] 无法发送消息到 ${robotId} : `, err);
             }

src/Setup.ts

@@ -10,8 +10,9 @@ export class Setup {
                 let maxLength: any = parseInt(args[1]);
                 let ellipsis: any = undefined;
                 if (args.length > 3) {
-                    return Utils.excerpt(text, parseInt(maxLength), ellipsis);
+                    ellipsis = args[2];
                 }
+                return Utils.excerpt(text, parseInt(maxLength), ellipsis);
             }
             return args[0];
         });

src/robot/QQRobot.ts

@@ -45,9 +45,8 @@ export default class QQRobot implements Robot {
         }
 
         return await this.doApiRequest('send_private_msg', {
-            bot_id: this.botQQ,
             user_id: user,
-            message: message,
+            message: message
         });
     }
 
@@ -64,9 +63,8 @@ export default class QQRobot implements Robot {
         }
 
         return await this.doApiRequest('send_group_msg', {
-            bot_id: this.botQQ,
             group_id: group,
-            message: message,
+            message: message
         });
     }
 

subscribe-example.yml

@@ -1,9 +1,9 @@
 qq:
   user:
     1234567890:
-      - some_channel_group/*
+      - some_channel_group                 # 订阅频道组会订阅下一级的全部频道，但是不会订阅更深层级的频道
       - some_channel_group2/some_channel
   group:
     1234567890:
-      - some_channel_group/*
+      - some_channel_group
       - some_channel_group2/some_channel