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

package/lib/index.js

@@ -8,32 +8,30 @@ 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*(.*)$/);
-        if (!match)
-            return next();
-        const left = match[1].trim();
-        const right = match[2].trim();
-        if (!left || !right)
-            return next();
-        if (left === right) {
-            await session.send('我不知道是谁都选好了还在问我◖⁠⚆⁠ᴥ⁠⚆⁠◗');
-            return;
-        }
-        const choice = Math.random() < 0.5 ? left : right;
-        await session.send(`我建议${choice}`);
-    });
+    const handleChoice = async (payload) => {
+        const text = payload === null || payload === void 0 ? void 0 : payload.trim();
+        if (!text)
+            return '请按照“A 还是 B 还是 C”的格式提供多个选项。';
+        if (!text.includes('还是'))
+            return '请用“A 还是 B”的格式，让我能拆分多个选项。';
+        const options = text.split(/\s*还是\s*/).map(opt => opt.trim()).filter(Boolean);
+        if (options.length < 2)
+            return '请提供至少两个有效的选项。';
+        const uniqueOptions = new Set(options);
+        if (uniqueOptions.size === 1)
+            return '我不知道是谁都选好了还在问我◖⁠⚆⁠ᴥ⁠⚆⁠◗';
+        const choice = options[Math.floor(Math.random() * options.length)];
+        return `我建议${choice}`;
+    };
+    for (const word of wakeWords) {
+        ctx
+            .command(`${word} <payload:text>`, '在多个选项之间随机选择')
+            .shortcut(word, { prefix: true })
+            .usage(`示例：${word} 选项A 还是 选项B 还是 选项C`)
+            .example(`${word} 猫 还是 狗 还是 狐狸`)
+            .action(async ({ session }, payload) => handleChoice(payload));
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-make-a-choice",
-  "version": "1.0.0",
-  "description": "Pick between two options after a wake word.",
+  "version": "1.0.2",
+  "description": "Pick between multiple options after a wake word.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "type": "commonjs",
@@ -31,8 +31,8 @@
   ],
   "koishi": {
     "description": {
-      "en": "Pick between two options after a wake word",
-      "zh-CN": "设定唤醒词后，在“xx还是xx”之间随机选择"
+      "en": "Pick between multiple options after a wake word",
+      "zh-CN": "设定唤醒词后，在“xx还是xx还是xx......”之间随机选择"
     }
   },
   "peerDependencies": {

package/src/index.ts

@@ -11,32 +11,30 @@ 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 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 left = match[1].trim()
-    const right = match[2].trim()
-    if (!left || !right) return next()
-
-    if (left === right) {
-      await session.send('我不知道是谁都选好了还在问我◖⁠⚆⁠ᴥ⁠⚆⁠◗')
-      return
-    }
-
-    const choice = Math.random() < 0.5 ? left : right
-    await session.send(`我建议${choice}`)
-  })
+  const handleChoice = async (payload: string | undefined) => {
+    const text = payload?.trim()
+    if (!text) return '请按照“A 还是 B 还是 C”的格式提供多个选项。'
+    if (!text.includes('还是')) return '请用“A 还是 B”的格式，让我能拆分多个选项。'
+
+    const options = text.split(/\s*还是\s*/).map(opt => opt.trim()).filter(Boolean)
+    if (options.length < 2) return '请提供至少两个有效的选项。'
+
+    const uniqueOptions = new Set(options)
+    if (uniqueOptions.size === 1) return '我不知道是谁都选好了还在问我◖⁠⚆⁠ᴥ⁠⚆⁠◗'
+
+    const choice = options[Math.floor(Math.random() * options.length)]
+    return `我建议${choice}`
+  }
+
+  for (const word of wakeWords) {
+    ctx
+      .command(`${word} <payload:text>`, '在多个选项之间随机选择')
+      .shortcut(word, { prefix: true })
+      .usage(`示例：${word} 选项A 还是 选项B 还是 选项C`)
+      .example(`${word} 猫 还是 狗 还是 狐狸`)
+      .action(async ({ session }, payload) => handleChoice(payload))
+  }
 }