koishi-plugin-starfx-bot 0.15.0 → 0.16.0

package/lib/index.d.ts

@@ -4,6 +4,12 @@ export declare let baseDir: string;
 export declare let assetsDir: string;
 export declare const starfxLogger: Logger;
 export declare const repeatContextMap: Map<string, [string, number]>;
+interface sendLocalImageConfigItem {
+    imgPath: string;
+}
+interface sendLocalImageConfigDict {
+    [key: string]: sendLocalImageConfigItem;
+}
 export interface Config {
     openLock: boolean;
     openSold: boolean;
@@ -14,12 +20,14 @@ export interface Config {
     roll: boolean;
     undo: boolean;
     echo: boolean;
+    echoBanner: string[];
     atNotSay: boolean;
     atNotSayProperty: number;
     atNotSayOther: boolean;
     atNotSayOtherProperty: number;
     iLoveYou: boolean;
     replyBot: string;
+    sendLocalImage: sendLocalImageConfigDict;
     openRepeat: boolean;
     minRepeatTimes: number;
     repeatPossibility: number;
@@ -31,3 +39,4 @@ export interface Config {
 export declare const Config: Schema<Schemastery.ObjectS<{}>, {} & import("cosmokit").Dict>;
 export declare const usage = "<h2>StarFreedomX\u7684\u81EA\u7528\u63D2\u4EF6 \u653E\u4E86\u4E00\u4E9B\u5C0F\u529F\u80FD</h2>\n  ";
 export declare function apply(ctx: Context, cfg: Config): void;
+export {};

package/lib/index.js

@@ -478,8 +478,7 @@ var parser = new import_rss_parser.default({
   }
 });
 async function getXNum(session) {
-  const params = session.content.trim().split(" ").slice(1).filter((item) => !isNaN(+item) && item).map((str) => Number(str) - 1);
-  return params;
+  return session.content.trim().split(" ").slice(1).filter((item) => !isNaN(+item) && item).map((str) => Number(str) - 1);
 }
 __name(getXNum, "getXNum");
 async function getXImage(rssUrl, xUrls) {
@@ -513,8 +512,12 @@ async function sendImages(session, cfg, imageUrls) {
     const messages = await Promise.all(
       group.map(async (url) => import_koishi.h.image(await getXImageBase64(url, cfg)))
     );
-    const message = messages.join("");
-    await session.send(message);
+    if (messages.length > 0) {
+      const message = messages.join("");
+      await session.send(message);
+    } else {
+      await session.send("未找到图片，请引用包含图片且处于RSS列表中的的推特链接");
+    }
   }
 }
 __name(sendImages, "sendImages");
@@ -530,6 +533,21 @@ async function getXImageBase64(url, cfg) {
   return dataUrl;
 }
 __name(getXImageBase64, "getXImageBase64");
+function safeQuote(str, useQuote) {
+  let unquoted = str.trim();
+  if (unquoted.startsWith('"')) {
+    unquoted = unquoted.slice(1);
+  }
+  if (unquoted.endsWith('"')) {
+    unquoted = unquoted.slice(0, -1);
+  }
+  if (useQuote) {
+    return `"${unquoted}"`;
+  } else {
+    return unquoted;
+  }
+}
+__name(safeQuote, "safeQuote");
 
 // src/index.ts
 var name = "starfx-bot";
@@ -550,8 +568,9 @@ var Config2 = import_koishi2.Schema.intersect([
   }).description("语录记录功能"),
   import_koishi2.Schema.object({
     roll: import_koishi2.Schema.boolean().default(true).description("开启roll随机数功能"),
-    undo: import_koishi2.Schema.boolean().default(true).description("机器人撤回消息功能"),
-    echo: import_koishi2.Schema.boolean().default(true).description("echo回声洞功能")
+    undo: import_koishi2.Schema.boolean().default(true).description("机器人撤回消息功能(只测试了qq的onebot适配器)"),
+    echo: import_koishi2.Schema.boolean().default(true).description("echo回声洞功能"),
+    echoBanner: import_koishi2.Schema.array(String).role("table").description("echo屏蔽词，对文本生效")
   }).description("指令小功能"),
   import_koishi2.Schema.object({
     atNotSay: import_koishi2.Schema.boolean().default(true).description("开启‘艾特我又不说话’功能"),
@@ -561,6 +580,13 @@ var Config2 = import_koishi2.Schema.intersect([
     iLoveYou: import_koishi2.Schema.boolean().default(true).description("开启‘我喜欢你’功能"),
     replyBot: import_koishi2.Schema.union(["关闭", "无需at", "必须at"]).default("无需at").description("回复‘我才不是机器人！’功能")
   }).description("特定回应功能"),
+  import_koishi2.Schema.object({
+    sendLocalImage: import_koishi2.Schema.dict(import_koishi2.Schema.object({
+      white: import_koishi2.Schema.string(),
+      black: import_koishi2.Schema.string(),
+      imgPath: import_koishi2.Schema.string()
+    })).role("table").description("特定指令发送本地图片功能，其中键是指令名称，black/white是黑白名单(直接输入群号用半角逗号分隔，两个都不输入默认全量)，imgPath是图片文件的绝对路径")
+  }),
   import_koishi2.Schema.object({
     openRepeat: import_koishi2.Schema.boolean().default(true).description("开启复读功能"),
     minRepeatTimes: import_koishi2.Schema.number().default(2).description("最少重复次数"),
@@ -598,7 +624,6 @@ function apply(ctx, cfg) {
   }
   if (cfg.openSold) {
     ctx.command("卖掉了 [param]").action(async ({ session }, param) => {
-      console.log("ssssss");
       if (detectControl(controlJson, session.guildId, "sold"))
         await session.send(await drawSold(ctx, await getImageSrc(session, param)));
     });
@@ -615,12 +640,13 @@ function apply(ctx, cfg) {
       if (detectControl(controlJson, session.guildId, "echo")) {
         const elements = session.elements;
         try {
-          console.log(elements);
           while (elements[0].type === "at" || elements[0].type === "text" && !elements[0].attrs?.content.trim()) elements.shift();
           elements[0].attrs.content = elements[0].attrs?.content.trim().split(" ").slice(1).join(" ");
           if (elements.length == 1 && !elements[0].attrs.content?.length) {
+            if (cfg.echoBanner?.some((banText) => session.quote?.content?.includes(banText))) return "包含屏蔽词，打断echo";
             return session.quote?.elements;
           }
+          if (cfg.echoBanner?.some((banText) => session.content?.includes(banText))) return "包含屏蔽词，打断echo";
           return elements;
         } catch (e) {
           return params;
@@ -631,14 +657,11 @@ function apply(ctx, cfg) {
   if (cfg.bangdreamBorder) {
     ctx.command("bdbd [param]").option("starNum", "-n <starNum: number>").option("color", "-c <color: string>").option("train", "-t <train: string>").option("band", "-b <band: string>").action(async ({ session, options }, param) => {
       if (detectControl(controlJson, session.guildId, "bdbd")) {
-        const p = session.send("图片处理中请稍等...");
-        console.log(param?.slice(0, 1e3));
         const drawConfig = await handleBanGDreamConfig(options);
         const imgSrc = await getImageSrc(session, param);
         if (!imgSrc?.length) return "输入无效";
         const imageBase64 = await drawBanGDream(imgSrc, drawConfig);
-        if (!imageBase64?.length) return "输入无效...";
-        await p;
+        if (!imageBase64?.length) return "输入无效";
         await session.send(import_koishi2.h.image(imageBase64));
       }
     });
@@ -672,6 +695,12 @@ function apply(ctx, cfg) {
       }
     });
   }
+  for (const key in cfg.sendLocalImage) {
+    ctx.command(key).action(async ({ session }) => {
+      if (detectControl(controlJson, session.guildId, "sendLocalImage") && detectControl(controlJson, session.guildId, key))
+        return import_koishi2.h.image(safeQuote(cfg.sendLocalImage[key].imgPath, false));
+    });
+  }
   if (cfg.saveArchive) {
     ctx.command("入典").action(async ({ session }) => {
       if (!session.quote) return "请引用合并转发聊天记录进行入典";
@@ -684,19 +713,15 @@ function apply(ctx, cfg) {
     });
   }
   if (cfg.originImg) {
-    ctx.command("获取原图 <urls>").action(async ({ session }, urls) => {
+    ctx.command("获取X原图 <urls>").alias("推特原图").action(async ({ session }, urls) => {
       if (detectControl(controlJson, session.guildId, "originImg")) {
         let [xUrls, xIndex] = await Promise.all([
-          getXUrl(session.quote.content),
+          getXUrl(session?.quote?.content),
           getXNum(session)
         ]);
         xIndex = xIndex.length ? xIndex : xUrls.map((_, i) => i);
-        console.log(`xIndex:${xIndex}`);
-        console.log(`xUrls:${xUrls}`);
         const filteredUrls = xIndex.filter((i) => i >= 0 && i < xUrls.length).map((i) => xUrls[i]);
-        console.log(filteredUrls);
         const imageUrls = await getXImage(cfg.originImgRSSUrl, filteredUrls);
-        console.log(imageUrls);
         await sendImages(session, cfg, imageUrls);
       }
     });

package/lib/utils.d.ts

@@ -142,5 +142,6 @@ export declare function getXNum(session: Session): Promise<number[]>;
 export declare function getXImage(rssUrl: string, xUrls: string | string[]): Promise<string[]>;
 export declare function chunk<T>(arr: T[], size: number): T[][];
 export declare function sendImages(session: Session, cfg: Config, imageUrls: string[]): Promise<void>;
+export declare function safeQuote(str: string, useQuote: boolean): string;
 export declare function test(url: string): Promise<void>;
 export {};

package/package.json

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

package/readme.md

@@ -44,20 +44,21 @@ StarFreedomX机器人的小功能，自用
 ### 📌 可配置功能键一览
 
 
-| 键名          | 功能说明                                  |
-|-------------|---------------------------------------|
-| `lock`      | 明日方舟封印功能（对应`openLock`）                |
-| `sold`      | 闲鱼“卖掉了”功能（对应`openSold`）               |
-| `repeat`    | 群复读功能（对应`openRepeat`）                 |
-| `record`    | 群语录功能（对应`投稿、语录`）                      |
-| `atNotSay`  | “艾特我/他又不说话”系列功能                       |
-| `replyBot`  | “我才不是机器人！”系列功能                        |
-| `iLoveYou`  | “我也喜欢你”系列功能                           |
-| `bdbd`      | BanG Dream! 边框功能（对应`bangdreamBorder`） |
-| `roll`      | 随机数功能                                 |
-| `undo`      | 撤回功能                                  |
-| `echo`      | echo功能                                |
-| `originImg` | rss获取推特原图                             |
+| 键名               | 功能说明                                  |
+|------------------|---------------------------------------|
+| `lock`           | 明日方舟封印功能（对应`openLock`）                |
+| `sold`           | 闲鱼“卖掉了”功能（对应`openSold`）               |
+| `repeat`         | 群复读功能（对应`openRepeat`）                 |
+| `record`         | 群语录功能（对应`投稿、语录`）                      |
+| `atNotSay`       | “艾特我/他又不说话”系列功能                       |
+| `replyBot`       | “我才不是机器人！”系列功能                        |
+| `iLoveYou`       | “我也喜欢你”系列功能                           |
+| `bdbd`           | BanG Dream! 边框功能（对应`bangdreamBorder`） |
+| `roll`           | 随机数功能                                 |
+| `undo`           | 撤回功能                                  |
+| `echo`           | echo功能                                |
+| `originImg`      | rss获取推特原图                             |
+| `sendLocalImage` | 自定义指令发送图片功能(自定义指令也可配置，键为自定义的指令名称)     |
 
 ---
 
@@ -109,3 +110,5 @@ StarFreedomX机器人的小功能，自用
 | `0.14.0` | echo增加对引用消息的支持，且支持有at触发          |
 | `0.14.3` | echo多at情况支持                      |
 | `0.15.0` | 自用rss获取推特原图                      |
+| `0.15.1` | 优化指令名称，防止冲突                      |
+| `0.16.0` | 新增自定义指令发送本地图片功能(其实网络图片也行)        |