koishi-plugin-starfx-bot 0.10.1 → 0.11.0

package/lib/index.d.ts

@@ -9,7 +9,9 @@ export interface Config {
     openSold: boolean;
     bangdreamBorder: boolean;
     record: boolean;
+    saveArchive: boolean;
     roll: boolean;
+    undo: boolean;
     atNotSay: boolean;
     atNotSayProperty: number;
     atNotSayOther: boolean;
@@ -19,7 +21,6 @@ export interface Config {
     openRepeat: boolean;
     minRepeatTimes: number;
     repeatPossibility: number;
-    saveArchive: boolean;
     featureControl: string;
 }
 export declare const Config: Schema<Schemastery.ObjectS<{
@@ -31,6 +32,7 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     saveArchive: Schema<boolean, boolean>;
 }> | Schemastery.ObjectS<{
     roll: Schema<boolean, boolean>;
+    undo: Schema<boolean, boolean>;
 }> | Schemastery.ObjectS<{
     atNotSay: Schema<boolean, boolean>;
     atNotSayProperty: Schema<number, number>;
@@ -53,6 +55,7 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     saveArchive: boolean;
 } & {
     roll: boolean;
+    undo: boolean;
 } & {
     atNotSay: boolean;
     atNotSayProperty: number;

package/lib/index.js

@@ -373,23 +373,28 @@ function handleRoll(session) {
   let parts = [];
   for (const element of elements) {
     if (element?.type === "text") {
-      parts.push(...element.attrs.content.split(/(?:\s+)+/).filter(Boolean));
+      let str = element.attrs.content;
+      let placeholder = "__TEMP__";
+      while (str.includes(placeholder)) {
+        placeholder += "_X";
+      }
+      str = str.replace(/我/g, placeholder).replace(/你/g, "我").replace(new RegExp(placeholder, "g"), "你");
+      parts.push(...str.split(/(?:\s+)+/).filter(Boolean));
     } else {
       parts.push(element);
     }
   }
-  const commandLength = parts[0].length;
   console.log(parts);
   parts.shift();
   if (!parts) return session.text(".noParam");
   const last = session.elements[session.elements.length - 1];
-  if (last?.type === "text" && last?.attrs?.content?.endsWith("的概率") && last?.attrs?.content?.length > 3) {
+  if (last?.type === "text" && last?.attrs?.content?.endsWith("概率") && last?.attrs?.content?.length > 3) {
     return session.text(".possibility", {
       param: parts,
       possibility: Math.floor(Math.random() * 1e4 + 1) / 100
     });
   }
-  const items = parts.join(" ").split("r");
+  const items = parts.join(" ").split("r").filter(Boolean);
   if (items.length === 2) {
     const [num, noodles] = items.map(Number);
     return getPoints(session, num, noodles);
@@ -421,6 +426,12 @@ function getPoints(session, num, noodles) {
   });
 }
 __name(getPoints, "getPoints");
+async function undo(cfg, session) {
+  if (session?.quote?.id && session.quote.user.id === session.selfId && Date.now() - session.quote.timestamp < 2 * 60 * 1e3 - 5 * 1e3) {
+    await session.bot.deleteMessage(session.channelId || session.guildId, session.quote.id);
+  }
+}
+__name(undo, "undo");
 
 // src/index.ts
 var name = "starfx-bot";
@@ -439,7 +450,8 @@ var Config2 = import_koishi2.Schema.intersect([
     saveArchive: import_koishi2.Schema.boolean().default(false).description("开启入典功能").hidden()
   }).description("语录记录功能"),
   import_koishi2.Schema.object({
-    roll: import_koishi2.Schema.boolean().default(true).description("开启roll随机数功能")
+    roll: import_koishi2.Schema.boolean().default(true).description("开启roll随机数功能"),
+    undo: import_koishi2.Schema.boolean().default(true).description("机器人撤回消息功能")
   }).description("指令小功能"),
   import_koishi2.Schema.object({
     atNotSay: import_koishi2.Schema.boolean().default(true).description("开启‘艾特我又不说话’功能"),
@@ -532,6 +544,12 @@ function apply(ctx, cfg) {
       if (!session.quote) return "请引用合并转发聊天记录进行入典";
     });
   }
+  if (cfg.undo) {
+    ctx.command("undo").alias("撤回").action(async ({ session }) => {
+      if (detectControl(controlJson, session.guildId, "undo"))
+        await undo(cfg, session);
+    });
+  }
   ctx.middleware(async (session, next) => {
     const elements = session.elements;
     if (cfg.openRepeat && detectControl(controlJson, session.guildId, "repeat")) {

package/lib/utils.d.ts

@@ -129,5 +129,10 @@ export declare function drawBanGDream(avatar: string, inputOptions?: {
 export declare function parseJsonControl(text: string): FeatureControl | null;
 export declare function detectControl(controlJson: FeatureControl, guildId: string, funName: string): boolean;
 export declare function handleRoll(session: Session): string;
-export declare function saveArchive(quoteElements: h[], gid: string, session: Session): void;
+/**
+ * qq撤回功能（其他平台不知道w
+ * @param cfg config
+ * @param session session
+ */
+export declare function undo(cfg: Config, session: Session): Promise<void>;
 export {};

package/package.json

@@ -4,7 +4,7 @@
   "contributors": [
     "StarFreedomX <starfreedomx@outlook.com>"
   ],
-  "version": "0.10.1",
+  "version": "0.11.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -50,6 +50,7 @@ StarFreedomX机器人的小功能，自用
 | `iLoveYou` | “我也喜欢你”系列功能                            |
 | `bdbd`     | BanG Dream! 边框功能（对应 `bangdreamBorder`） |
 | `roll`     | 随机数功能                                  |
+| `undo`     | 撤回功能                                   |
 
 ---
 
@@ -83,3 +84,5 @@ StarFreedomX机器人的小功能，自用
 | `0.9.0`  | 添加白名单/黑名单模式，对每个功能做过滤          |
 | `0.10.0` | 添加随机数功能                       |
 | `0.10.1` | 修复随机数骰子功能输入负数报错的bug           |
+| `0.10.2` | 增加roll功能的人称变化                 |
+| `0.11.0` | 增加适配于onebot（主要是qq）的撤回功能       |