分离小冰与 BabyQ

Author: mrhso

plugins/qqbabyq.js

@@ -0,0 +1,46 @@
+/*
+* BabyQ
+*
+* command: '!bbq'
+* types: [
+*     'qq/123456'
+* ]
+*/
+
+'use strict';
+
+const BridgeMsg = require('./transport/BridgeMsg.js');
+
+module.exports = (pluginManager, options) => {
+    const bridge = pluginManager.plugins.transport;
+
+    if (!bridge || !pluginManager.handlers.has('QQ')) {
+        return;
+    }
+
+    let qqHandler = pluginManager.handlers.get('QQ');
+    let command = options.command || '!bbq';
+    let types = [];
+
+    for (let t of (options.types || [])) {
+        let client = BridgeMsg.parseUID(t);
+        if (client.uid) {
+            types.push(client.uid);
+        }
+    }
+
+    bridge.addCommand(command, (context) => {
+        if (!context.isPrivate) {
+            for (let c of context.extra.mapto) {
+                let client = BridgeMsg.parseUID(c);
+                if (client.client === 'QQ') {
+                    if (types.indexOf(client.uid) > -1) {
+                        qqHandler.say(client.id, `[CQ:at,qq=2854196300] ${qqHandler.escape(context.param)}`, {
+                            noEscape: true,
+                        });
+                    }
+                }
+            }
+        }
+    }, options);
+};

plugins/qqxiaoice.js

@@ -2,9 +2,9 @@
 * 小冰
 *
 * command: '!bing'
-* types: {
-*     'qq/123456': 'xiaoice' / 'babyq'
-* }
+* types: [
+*     'qq/123456'
+* ]
 */
 
 'use strict';
@@ -18,36 +18,24 @@ module.exports = (pluginManager, options) => {
         return;
     }
 
-    if (!options.disallowedClients) {
-        options.disallowedClients = ['QQ'];
-    } else {
-        options.disallowedClients.push('QQ');
-    }
-
     let qqHandler = pluginManager.handlers.get('QQ');
     let command = options.command || '!bing';
-    let types = {};
+    let types = [];
 
-    for (let t in (options.types || {})) {
+    for (let t of (options.types || [])) {
         let client = BridgeMsg.parseUID(t);
         if (client.uid) {
-            types[client.uid] = options.types[t].toLowerCase();
+            types.push(client.uid);
         }
     }
 
     bridge.addCommand(command, (context) => {
         if (!context.isPrivate) {
             for (let c of context.extra.mapto) {
                 let client = BridgeMsg.parseUID(c);
-                let qq = null;
                 if (client.client === 'QQ') {
-                    if (types[client.uid] === 'xiaobing' || types[client.uid] === 'xiaoice') {
-                        qq = '2854196306';
-                    } else if (types[client.uid] === 'babyq') {
-                        qq = '2854196300';
-                    }
-                    if (qq) {
-                        qqHandler.say(client.id, `[CQ:at,qq=${qq}] ${qqHandler.escape(context.param)}`, {
+                    if (types.indexOf(client.uid) > -1) {
+                        qqHandler.say(client.id, `[CQ:at,qq=2854196306] ${qqHandler.escape(context.param)}`, {
                             noEscape: true,
                         });
                     }