koishi-plugin-make-a-choice 1.0.0 → 1.0.1

package/lib/index.js

@@ -8,32 +8,33 @@ exports.Config = koishi_1.Schema.object({
     wakeWords: koishi_1.Schema.array(koishi_1.Schema.string()).default(['选择', '帮选', '决定']).description('触发插件的唤醒词列表。'),
 });
 function apply(ctx, config) {
-    const wakeWords = config.wakeWords.map(word => word.trim()).filter(Boolean);
+    const wakeWords = Array.from(new Set(config.wakeWords.map(word => word.trim()).filter(Boolean)));
     if (!wakeWords.length)
         return;
-    ctx.middleware(async (session, next) => {
-        var _a;
-        const content = (_a = session.content) === null || _a === void 0 ? void 0 : _a.trim();
-        if (!content)
-            return next();
-        const hit = wakeWords.find(word => content.startsWith(word));
-        if (!hit)
-            return next();
-        const payload = content.slice(hit.length).trim();
-        if (!payload.includes('还是'))
-            return next();
-        const match = payload.match(/^(.*?)\s*还是\s*(.*)$/);
+    const handleChoice = async (payload) => {
+        const text = payload === null || payload === void 0 ? void 0 : payload.trim();
+        if (!text)
+            return '请按照“左边 还是 右边”的格式提供两个选项。';
+        if (!text.includes('还是'))
+            return '请用“左边 还是 右边”的格式，让我能拆分两个选项。';
+        const match = text.match(/^(.*?)\s*还是\s*(.*)$/);
         if (!match)
-            return next();
+            return '没有找到两个可供选择的选项。';
         const left = match[1].trim();
         const right = match[2].trim();
         if (!left || !right)
-            return next();
-        if (left === right) {
-            await session.send('我不知道是谁都选好了还在问我◖⁠⚆⁠ᴥ⁠⚆⁠◗');
-            return;
-        }
+            return '两个选项都要提供哦。';
+        if (left === right)
+            return '我不知道是谁都选好了还在问我◖⁠⚆⁠ᴥ⁠⚆⁠◗';
         const choice = Math.random() < 0.5 ? left : right;
-        await session.send(`我建议${choice}`);
-    });
+        return `我建议${choice}`;
+    };
+    for (const word of wakeWords) {
+        ctx
+            .command(`${word} <payload:text>`, '在“xx还是xx”之间随机选择')
+            .shortcut(word, { prefix: true })
+            .usage(`示例：${word} 可乐 还是 雪碧`)
+            .example(`${word} 猫 还是 狗`)
+            .action(async ({ session }, payload) => handleChoice(payload));
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-make-a-choice",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Pick between two options after a wake word.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/index.ts

@@ -11,32 +11,32 @@ export const Config: Schema<Config> = Schema.object({
 })
 
 export function apply(ctx: Context, config: Config) {
-  const wakeWords = config.wakeWords.map(word => word.trim()).filter(Boolean)
+  const wakeWords = Array.from(new Set(config.wakeWords.map(word => word.trim()).filter(Boolean)))
   if (!wakeWords.length) return
 
-  ctx.middleware(async (session, next) => {
-    const content = session.content?.trim()
-    if (!content) return next()
+  const handleChoice = async (payload: string | undefined) => {
+    const text = payload?.trim()
+    if (!text) return '请按照“左边 还是 右边”的格式提供两个选项。'
+    if (!text.includes('还是')) return '请用“左边 还是 右边”的格式，让我能拆分两个选项。'
 
-    const hit = wakeWords.find(word => content.startsWith(word))
-    if (!hit) return next()
-
-    const payload = content.slice(hit.length).trim()
-    if (!payload.includes('还是')) return next()
-
-    const match = payload.match(/^(.*?)\s*还是\s*(.*)$/)
-    if (!match) return next()
+    const match = text.match(/^(.*?)\s*还是\s*(.*)$/)
+    if (!match) return '没有找到两个可供选择的选项。'
 
     const left = match[1].trim()
     const right = match[2].trim()
-    if (!left || !right) return next()
-
-    if (left === right) {
-      await session.send('我不知道是谁都选好了还在问我◖⁠⚆⁠ᴥ⁠⚆⁠◗')
-      return
-    }
+    if (!left || !right) return '两个选项都要提供哦。'
+    if (left === right) return '我不知道是谁都选好了还在问我◖⁠⚆⁠ᴥ⁠⚆⁠◗'
 
     const choice = Math.random() < 0.5 ? left : right
-    await session.send(`我建议${choice}`)
-  })
+    return `我建议${choice}`
+  }
+
+  for (const word of wakeWords) {
+    ctx
+      .command(`${word} <payload:text>`, '在“xx还是xx”之间随机选择')
+      .shortcut(word, { prefix: true })
+      .usage(`示例：${word} 可乐 还是 雪碧`)
+      .example(`${word} 猫 还是 狗`)
+      .action(async ({ session }, payload) => handleChoice(payload))
+  }
 }