mioku-plugin-impact 2.0.0 → 2.0.2

package/handlers/open-module.ts

@@ -1,5 +1,3 @@
-import { isOwner } from "mioku";
-import { isGroupAdmin } from "../utils";
 import type { HandlerContext } from "./types";
 
 export async function handleOpenModule(
@@ -7,13 +5,6 @@ export async function handleOpenModule(
   enable: boolean,
 ): Promise<void> {
   const { ctx, db, event } = h;
-  if (!isOwner(event) && !isGroupAdmin(event)) {
-    await event.reply(
-      [ctx.segment.text("权限不足喵, 仅管理员/群主/主人可以开关淫趴")],
-      false,
-    );
-    return;
-  }
   await db.setGroupAllow(Number(event.group_id), enable);
   await event.reply(
     [ctx.segment.text(enable ? "功能已开启喵" : "功能已禁用喵")],

package/handlers/yinpa.ts

@@ -1,4 +1,4 @@
-import { isOwner } from "mioku";
+import type { MiokuContext } from "mioku";
 import { checkCooldown, clearCooldown, markCooldown } from "../state";
 import {
   getAtUserId,
@@ -27,12 +27,13 @@ export async function handleYinpa(
   subject: "owner" | "admin" | "member",
 ): Promise<void> {
   const { ctx, db, cd, config, event } = h;
+  const miokuCtx = ctx as MiokuContext;
   const uid = Number(event.user_id);
   const uidKey = String(uid);
 
   const cdState = checkCooldown(cd.fuck, uidKey, config.fuckCd);
   // 主人不受 CD 限制
-  if (!cdState.ok && !isOwner(event)) {
+  if (!cdState.ok && !miokuCtx.isMaster?.(event)) {
     await event.reply(
       [
         ctx.segment.at(String(uid)),

package/index.ts

@@ -1,4 +1,4 @@
-import { definePlugin, type MiokuContext } from "mioku";
+import { definePlugin, type CommandDefinition, type MiokuContext } from "mioku";
 import {
   cloneConfig,
   DEFAULT_CONFIG,
@@ -16,14 +16,21 @@ import { handleRank } from "./handlers/rank";
 import { handleSuo } from "./handlers/suo";
 import { handleYinpa } from "./handlers/yinpa";
 import type { HandlerContext } from "./handlers/types";
-import { parseImpactCommand } from "./router";
 import { createCooldownState } from "./state";
 import { NOT_ALLOW_TEXT, isGroupEvent } from "./utils";
 
+type HandlerType =
+  | "pk"
+  | "dajiao"
+  | "suo"
+  | "queryjj"
+  | "rank"
+  | "yinpa"
+  | "open_module"
+  | "query_injection";
+
 const impactPlugin = definePlugin({
   name: "impact",
-  version: "1.0.0",
-  description: "让群友们眼前一黑的淫趴插件（牛子比拼），移植自 nonebot_plugin_impact",
 
   async setup(ctx: MiokuContext) {
     ctx.logger.info("impact 插件正在初始化...");
@@ -74,24 +81,14 @@ const impactPlugin = definePlugin({
       });
     }
 
-    ctx.handle("message", async (event: any) => {
+    const run = (type: HandlerType) => async (event: any, extra?: unknown) => {
       if (!isGroupEvent(event)) return;
-      const text = ctx.text(event);
-      if (!text) return;
-
-      const cmd = parseImpactCommand(text);
-      if (cmd.type === "none") return;
-
       const h: HandlerContext = { ctx, db, cd, config, screenshot, event };
-
       try {
-        // open_module 始终可用，不受群开关限制
-        if (cmd.type === "open_module") {
-          await handleOpenModule(h, cmd.enable);
+        if (type === "open_module") {
+          await handleOpenModule(h, extra as boolean);
           return;
         }
-
-        // 其余命令需要群开启了银趴
         if (!db.isGroupAllowed(Number(event.group_id))) {
           await event.reply(
             [ctx.segment.at(String(event.user_id)), ctx.segment.text(NOT_ALLOW_TEXT)],
@@ -99,8 +96,7 @@ const impactPlugin = definePlugin({
           );
           return;
         }
-
-        switch (cmd.type) {
+        switch (type) {
           case "pk":
             return await handlePk(h);
           case "dajiao":
@@ -112,12 +108,12 @@ const impactPlugin = definePlugin({
           case "rank":
             return await handleRank(h);
           case "yinpa":
-            return await handleYinpa(h, cmd.subject);
+            return await handleYinpa(h, extra as "owner" | "admin" | "member");
           case "query_injection":
-            return await handleQueryInjection(h, cmd.mode);
+            return await handleQueryInjection(h, extra as "today" | "history");
         }
       } catch (error) {
-        ctx.logger.error(`impact 命令 ${cmd.type} 执行失败: ${error}`);
+        ctx.logger.error(`impact 命令 ${type} 执行失败: ${error}`);
         try {
           await event.reply(
             [ctx.segment.text(`淫趴插件出错了喵: ${String(error)}`)],
@@ -127,6 +123,80 @@ const impactPlugin = definePlugin({
           // 忽略二次失败
         }
       }
+    };
+
+    const cmd = (command: CommandDefinition) =>
+      ctx.command({ ...command, prefixes: false });
+
+    cmd({
+      id: "开启淫趴",
+      name: "开启淫趴",
+      match: /^(?:开始银趴|关闭银趴|开启淫趴|禁止淫趴|开启银趴|禁止银趴)\s*$/,
+      permission: "admin",
+      description: "在本群开启或关闭淫趴功能",
+      usage: "开启淫趴 / 关闭银趴",
+      handler: ({ event, match }) =>
+        run("open_module")(event, match![0].startsWith("开启") || match![0].startsWith("开始")),
+    });
+    cmd({
+      id: "日透",
+      name: "日群友",
+      match: /^(日群友|透群友|日群主|透群主|日管理|透管理)(?:\s|$|@)/,
+      description: "随机或定向选取一位幸运儿进行注入，按命令决定身份",
+      usage: "日群友 / 透群友 @某人 / 透群主 / 透管理",
+      handler: ({ event, match }) => {
+        const word = match![1];
+        const subject = word.includes("群主") ? "owner" : word.includes("管理") ? "admin" : "member";
+        return run("yinpa")(event, subject);
+      },
+    });
+    cmd({
+      id: "pk",
+      name: "pk",
+      match: /^(?:pk|PK|对决)(?:\s|@|$)/,
+      description: "和 @ 的群友进行牛子对决，胜者抢走败者的随机长度",
+      usage: "pk @某人",
+      handler: ({ event }) => run("pk")(event),
+    });
+    cmd({
+      id: "打胶",
+      name: "打胶",
+      match: /^(?:打胶|开导)\s*$/,
+      description: "给自己的牛子增加一段随机长度",
+      handler: ({ event }) => run("dajiao")(event),
+    });
+    cmd({
+      id: "嗦牛子",
+      name: "嗦牛子",
+      match: /^嗦牛子(?:\s|@|$)/,
+      description: "嗦自己或被 @ 的群友的牛子，增加随机长度",
+      usage: "嗦牛子 / 嗦牛子 @某人",
+      handler: ({ event }) => run("suo")(event),
+    });
+    cmd({
+      id: "查询",
+      name: "查询",
+      match: /^查询(?:\s|@|$)/,
+      description: "查询自己或 @ 的群友的牛子长度",
+      usage: "查询 / 查询 @某人",
+      handler: ({ event }) => run("queryjj")(event),
+    });
+    cmd({
+      id: "注入查询",
+      name: "注入查询",
+      match: /^(?:注入查询|摄入查询|射入查询)(.*)$/,
+      description: "查询当日或全部历史被注入量，加 历史/全部 看走势图",
+      usage: "注入查询 / 注入查询 历史 / 注入查询 @某人 全部",
+      handler: ({ event, match }) =>
+        run("query_injection")(event, /历史|全部/.test(match![1] || "") ? "history" : "today"),
+    });
+    cmd({
+      id: "jj排行榜",
+      name: "jj排行榜",
+      match: /^(?:jj|JJ)(?:排行榜|排名|榜单|rank|RANK)(?:\s|$)/,
+      description: "查看牛子长度前五与倒数五名的图表",
+      usage: "jj排行榜 / jjrank",
+      handler: ({ event }) => run("rank")(event),
     });
 
     ctx.logger.info("impact 插件初始化完成");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-impact",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "让群友们眼前一黑的淫趴插件",
   "main": "index.ts",
   "type": "module",
@@ -16,102 +16,7 @@
       "screenshot",
       "help",
       "config"
-    ],
-    "accessHooks": [
-      {
-        "id": "开启淫趴",
-        "match": "/^(?:开启|禁止|开始|关闭)(?:淫趴|银趴)\\s*$/",
-        "description": "群内开启或关闭淫趴功能"
-      },
-      {
-        "id": "日透",
-        "match": "/^(?:日群友|透群友|日群主|透群主|日管理|透管理)(?:\\s|$|@)/",
-        "description": "日 / 透 系列命令"
-      },
-      {
-        "id": "打胶",
-        "match": "/^(?:打胶|开导)\\s*$/",
-        "description": "打胶 / 开导"
-      },
-      {
-        "id": "嗦牛子",
-        "match": "/^嗦牛子(?:\\s|$|@)/",
-        "description": "嗦自己或被 @ 群友的牛子"
-      },
-      {
-        "id": "pk",
-        "match": "/^(?:pk|PK|对决)(?:\\s|@|$)/",
-        "description": "牛子对决"
-      },
-      {
-        "id": "查询",
-        "match": "/^查询(?:\\s|@|$)/",
-        "description": "查询自己或被 @ 群友的牛子长度"
-      },
-      {
-        "id": "注入查询",
-        "match": "/^(?:注入查询|摄入查询|射入查询)/",
-        "description": "查询当日或历史被注入量"
-      },
-      {
-        "id": "jj排行榜",
-        "match": "/^(?:jj|JJ)(?:排行榜|排名|榜单|rank|RANK)(?:\\s|$)/",
-        "description": "牛子长度排行榜"
-      }
-    ],
-    "help": {
-      "title": "淫趴 ",
-      "description": "让群友们眼前一黑的牛子比拼插件",
-      "commands": [
-        {
-          "cmd": "开启淫趴 / 禁止淫趴",
-          "desc": "在本群开启或关闭淫趴功能（管理员/群主/主人可用）",
-          "usage": "开启淫趴 / 关闭银趴",
-          "role": "admin"
-        },
-        {
-          "cmd": "打胶 / 开导",
-          "desc": "给自己的牛子增加一段随机长度",
-          "role": "member"
-        },
-        {
-          "cmd": "嗦牛子",
-          "desc": "嗦自己或被 @ 的群友的牛子，增加随机长度",
-          "usage": "嗦牛子 / 嗦牛子 @某人",
-          "role": "member"
-        },
-        {
-          "cmd": "pk / 对决",
-          "desc": "和 @ 的群友进行牛子对决，胜者抢走败者的随机长度",
-          "usage": "pk @某人",
-          "role": "member"
-        },
-        {
-          "cmd": "查询",
-          "desc": "查询自己或 @ 的群友的牛子长度",
-          "usage": "查询 / 查询 @某人",
-          "role": "member"
-        },
-        {
-          "cmd": "jj排行榜",
-          "desc": "查看牛子长度前五与倒数五名的图表",
-          "usage": "jj排行榜 / jjrank",
-          "role": "member"
-        },
-        {
-          "cmd": "日群友 / 透群友 / 透群主 / 透管理",
-          "desc": "随机或定向选取一位幸运儿进行注入，按命令决定身份",
-          "usage": "日群友 / 透群友 @某人 / 透群主 / 透管理",
-          "role": "member"
-        },
-        {
-          "cmd": "注入查询",
-          "desc": "查询当日或全部历史被注入量，加 历史/全部 看走势图",
-          "usage": "注入查询 / 注入查询 历史 / 注入查询 @某人 全部",
-          "role": "member"
-        }
-      ]
-    }
+    ]
   },
   "peerDependencies": {
     "mioku": "^1.0.0"

package/utils.ts

@@ -54,11 +54,6 @@ export function isGroupEvent(event: any): boolean {
   return event?.message_type === "group" && event?.group_id != null;
 }
 
-export function isGroupAdmin(event: any): boolean {
-  const role = event?.sender?.role;
-  return role === "admin" || role === "owner";
-}
-
 export function getSenderName(event: any): string {
   const card = String(event?.sender?.card || "").trim();
   if (card) return card;
@@ -87,9 +82,9 @@ export function getAvatarUrl(userId: number): string {
 
 export function escapeHtml(value: string): string {
   return String(value)
-    .replace(/&/g, "&amp);")
-    .replace(/</g, "&lt);")
-    .replace(/>/g, "&gt);")
-    .replace(/"/g, "&quot);")
-    .replace(/'/g, "&#39);");
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&#39;");
 }

package/router.ts

@@ -1,94 +0,0 @@
-export type ImpactCommand =
-  | { type: "pk" }
-  | { type: "dajiao" }
-  | { type: "suo" }
-  | { type: "queryjj" }
-  | { type: "rank" }
-  | { type: "yinpa"; subject: "member" | "owner" | "admin" }
-  | { type: "open_module"; enable: boolean }
-  | { type: "query_injection"; mode: "today" | "history" }
-  | { type: "none" };
-
-const YINPA_RE =
-  /^(?:日群友|透群友|日群主|透群主|日管理|透管理)(?:\s|$|@)/u;
-
-const OPEN_MODULE_RE =
-  /^(?:开始银趴|关闭银趴|开启淫趴|禁止淫趴|开启银趴|禁止银趴)\s*$/u;
-
-const RANK_HEADS = new Set([
-  "jj排行榜",
-  "jj排名",
-  "jj榜单",
-  "jjrank",
-  "JJ排行榜",
-  "JJ排名",
-  "JJ榜单",
-  "JJrank",
-  "JJRANK",
-]);
-
-/**
- * 把消息文本解析成 impact 命令。
- * 仅看消息开头（去掉前导空白），命中失败返回 { type: "none" }。
- */
-export function parseImpactCommand(text: string): ImpactCommand {
-  const head = text.replace(/^\s+/, "");
-  if (!head) return { type: "none" };
-
-  // 银趴开关：完整匹配
-  const open = head.match(OPEN_MODULE_RE);
-  if (open) {
-    const word = open[0];
-    const enable = word.startsWith("开启") || word.startsWith("开始");
-    return { type: "open_module", enable };
-  }
-
-  // 透/日 系列
-  const yinpa = head.match(YINPA_RE);
-  if (yinpa) {
-    const word = yinpa[0];
-    const subject: "owner" | "admin" | "member" = word.includes("群主")
-      ? "owner"
-      : word.includes("管理")
-      ? "admin"
-      : "member";
-    return { type: "yinpa", subject };
-  }
-
-  // pk / 对决：要求形如 "pk @某人" 或 "pk"。具体的 at 校验放到 handler。
-  if (/^(pk|PK|对决)(\s|@|$)/.test(head)) {
-    return { type: "pk" };
-  }
-
-  // 打胶 / 开导：完整匹配
-  if (/^(打胶|开导)\s*$/.test(head)) {
-    return { type: "dajiao" };
-  }
-
-  // 嗦牛子
-  if (/^嗦牛子(\s|@|$)/.test(head)) {
-    return { type: "suo" };
-  }
-
-  // 注入查询 / 摄入查询 / 射入查询
-  const inj = head.match(/^(?:注入查询|摄入查询|射入查询)(.*)$/u);
-  if (inj) {
-    const rest = inj[1] || "";
-    const mode = /历史|全部/.test(rest) ? "history" : "today";
-    return { type: "query_injection", mode };
-  }
-
-  // 排行榜
-  for (const word of RANK_HEADS) {
-    if (head === word || head.startsWith(`${word} `) || head.startsWith(`${word}\n`)) {
-      return { type: "rank" };
-    }
-  }
-
-  // 只匹配 "查询" + 空白/at/结束，避免误吞太多文本
-  if (/^查询(\s|@|$)/.test(head)) {
-    return { type: "queryjj" };
-  }
-
-  return { type: "none" };
-}