koishi-plugin-starfx-bot 0.3.5 → 0.4.1

package/lib/index.d.ts

@@ -7,6 +7,8 @@ export interface Config {
     openSold: boolean;
     atNotSay: boolean;
     atNotSayOther: boolean;
+    atNotSayProperty: number;
+    atNotSayOtherProperty: number;
     replyBot: string;
     iLoveYou: boolean;
 }
@@ -14,19 +16,28 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     openLock: Schema<boolean, boolean>;
     openSold: Schema<boolean, boolean>;
     atNotSay: Schema<boolean, boolean>;
+    atNotSayProperty: Schema<number, number>;
     atNotSayOther: Schema<boolean, boolean>;
+    atNotSayOtherProperty: Schema<number, number>;
     iLoveYou: Schema<boolean, boolean>;
     replyBot: Schema<"关闭" | "无需at" | "必须at", "关闭" | "无需at" | "必须at">;
 }>, {
     openLock: boolean;
     openSold: boolean;
     atNotSay: boolean;
+    atNotSayProperty: number;
     atNotSayOther: boolean;
+    atNotSayOtherProperty: number;
     iLoveYou: boolean;
     replyBot: "关闭" | "无需at" | "必须at";
 } & import("cosmokit").Dict>;
 export declare const usage = "<h5>StarFreedomX\u7684\u81EA\u7528\u63D2\u4EF6 \u653E\u4E86\u4E00\u4E9B\u5C0F\u529F\u80FD</h5>\n  ";
 export declare function apply(ctx: Context, cfg: Config): void;
 export declare function getImageSrc(session: Session, param: string): Promise<any>;
-export declare function drawLock(baseImage: string): Promise<h | "输入无效。" | "发生错误。">;
-export declare function drawSold(baseImage: string): Promise<h | "输入无效。" | "发生错误。">;
+export declare function drawLock(ctx: Context, baseImage: string): Promise<h | "发生错误" | "输入无效">;
+/**
+ * "卖掉了"绘图函数
+ * @param ctx
+ * @param baseImage
+ */
+export declare function drawSold(ctx: Context, baseImage: string): Promise<h | "发生错误" | "输入无效">;

package/lib/index.js

@@ -5,6 +5,9 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all) => {
   for (var name2 in all)
     __defProp(target, name2, { get: all[name2], enumerable: true });
@@ -27,6 +30,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// src/locales/zh-CN.yml
+var require_zh_CN = __commonJS({
+  "src/locales/zh-CN.yml"(exports2, module2) {
+    module2.exports = { commands: null, middleware: { messages: { atNotReply: "艾特我又不说话", atNotReplyOther: "艾特他又不说话", notBot: "我才不是机器人！", loveMessage: "我喜欢你", iLoveU: "我也喜欢你" } } };
+  }
+});
+
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -42,7 +52,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
-var import_jimp = require("jimp");
+var import_sharp = __toESM(require("sharp"));
 var fs = __toESM(require("fs"));
 var name = "starfx-bot";
 var baseDir;
@@ -52,21 +62,30 @@ var Config = import_koishi.Schema.intersect([
     openLock: import_koishi.Schema.boolean().default(true).description("开启明日方舟封印功能"),
     openSold: import_koishi.Schema.boolean().default(true).description('开启闲鱼"卖掉了"功能'),
     atNotSay: import_koishi.Schema.boolean().default(true).description("开启‘艾特我又不说话’功能"),
+    atNotSayProperty: import_koishi.Schema.number().role("slider").min(0).max(1).step(0.01).default(0.5).description("'艾特我又不说话'回复概率"),
     atNotSayOther: import_koishi.Schema.boolean().default(true).description("开启‘艾特他又不说话’功能"),
+    atNotSayOtherProperty: import_koishi.Schema.number().role("slider").min(0).max(1).step(0.01).default(0.5).description("'艾特他又不说话'回复概率"),
     iLoveYou: import_koishi.Schema.boolean().default(true).description("开启‘我喜欢你’功能"),
-    replyBot: import_koishi.Schema.union(["关闭", "无需at", "必须at"]).default("无需at").description("回复‘我才是不是机器人！’功能")
+    replyBot: import_koishi.Schema.union(["关闭", "无需at", "必须at"]).default("无需at").description("回复‘我才不是机器人！’功能")
   })
 ]);
 var usage = `<h5>StarFreedomX的自用插件 放了一些小功能</h5>
   `;
 function apply(ctx, cfg) {
+  ctx.i18n.define("zh-CN", require_zh_CN());
   baseDir = ctx.baseDir;
   assetsDir = `${ctx.baseDir}/data/starfx-bot/assets`;
   initAssets("lock.png");
   initAssets("sold.png");
   if (cfg.openLock) {
     ctx.command("封印 [param]").action(async ({ session }, param) => {
-      return await drawLock(await getImageSrc(session, param));
+      console.log("elements");
+      console.log(session.elements);
+      console.log("quote");
+      console.log(session.quote);
+      console.log("param");
+      console.log(param);
+      return await drawLock(ctx, await getImageSrc(session, param));
     });
   }
   if (cfg.openSold) {
@@ -77,7 +96,7 @@ function apply(ctx, cfg) {
       console.log(session.quote);
       console.log("param");
       console.log(param);
-      return await drawSold(await getImageSrc(session, param));
+      return await drawSold(ctx, await getImageSrc(session, param));
     });
   }
   ctx.middleware(async (session, next) => {
@@ -86,27 +105,36 @@ function apply(ctx, cfg) {
     if (cfg.atNotSay || cfg.atNotSayOther) {
       if (elements.length === 1 && elements[0].type === "at") {
         if (elements[0].attrs.id === session.selfId) {
-          if (cfg.atNotSay)
-            await session.send("艾特我又不说话");
+          if (cfg.atNotSay) {
+            if (import_koishi.Random.bool(cfg.atNotSayProperty)) {
+              await session.send(session.text("middleware.messages.atNotReply"));
+            }
+          }
         } else {
-          if (cfg.atNotSayOther)
-            await session.send("艾特他又不说话");
+          if (cfg.atNotSayOther) {
+            if (import_koishi.Random.bool(cfg.atNotSayOtherProperty)) {
+              await session.send(session.text("middleware.messages.atNotReplyOther"));
+            }
+          }
         }
       }
     }
     if (cfg.replyBot !== "关闭") {
-      const bots = ["bot", "机器人", "Bot", "BOT", "机器人！", "机器人!"];
+      const bots = ["bot", "机器人", "Bot", "BOT", "机器人！", "机器人!", "人机"];
       const texts = elements?.filter((e) => e.type === "text").map((e) => e?.attrs?.content?.trim());
       const ats = elements?.filter((e) => e.type === "at").map((e) => e?.attrs?.id);
       const mentionedBot = texts?.some((t) => bots.includes(t));
       const atMe = ats?.includes(session.selfId);
       if (elements?.length === 1 && mentionedBot && cfg.replyBot === "无需at" || elements?.length === 2 && mentionedBot && atMe) {
-        await session.send("我才不是机器人！");
+        await session.send(session.text("middleware.messages.notBot"));
       }
     }
     if (cfg.iLoveYou) {
-      if (elements?.length === 2 && elements.some((e) => e.type === "at" && e?.attrs?.id === session.selfId) && elements.some((e) => e.type === "text" && e?.attrs?.content?.trim() === "我喜欢你")) {
-        await session.send(`${import_koishi.h.quote(session.messageId)}${import_koishi.h.at(session.userId)} 我也喜欢你`);
+      if (elements?.length === 2 && elements.some((e) => e.type === "at" && e?.attrs?.id === session.selfId) && elements.some((e) => e.type === "text" && e?.attrs?.content?.trim() === session.text("middleware.messages.loveMessage"))) {
+        await session.send(session.text("middleware.messages.iLoveU", {
+          at: import_koishi.h.at(session.userId),
+          quote: import_koishi.h.quote(session.messageId)
+        }));
       }
     }
     return next();
@@ -123,7 +151,7 @@ async function getImageSrc(session, param) {
   for (const element of elementArray) {
     if (element?.type === "img") {
       return element?.attrs?.src;
-    } else if (element?.type === "at" && element?.attrs?.id && element.attrs.id !== session.selfId) {
+    } else if (element?.type === "at" && element?.attrs?.id) {
       return `https://q1.qlogo.cn/g?b=qq&nk=${element.attrs.id}&s=640`;
     }
   }
@@ -148,49 +176,75 @@ function initAssets(fileName) {
   }
 }
 __name(initAssets, "initAssets");
-async function drawLock(baseImage) {
-  if (!baseImage) {
-    return "输入无效。";
+async function drawLock(ctx, baseImage) {
+  const image = await getImageFromUrl(ctx, baseImage);
+  if (image === -1) {
+    return "发生错误";
+  } else if (image === -2) {
+    return "输入无效";
   }
+  const imageMetadata = await image.metadata();
   const lockUrl = `${baseDir}/data/starfx-bot/assets/lock.png`;
-  let image;
-  try {
-    image = await import_jimp.Jimp.read(baseImage);
-  } catch (err) {
-    console.error(err);
-    return "发生错误。";
-  }
-  const size1 = image.width > image.height ? image.height : image.width;
-  image.cover({ w: size1, h: size1 });
-  const overlay = await import_jimp.Jimp.read(lockUrl);
-  overlay.resize({ w: image.width });
-  image.composite(overlay);
-  return import_koishi.h.image(await image.getBuffer("image/jpeg"), "image/jpeg");
+  const size1 = Math.min(imageMetadata.width, imageMetadata.height);
+  image.resize({ width: size1, height: size1, fit: "cover" });
+  const overlay = (0, import_sharp.default)(lockUrl).png();
+  overlay.resize({ width: size1 });
+  image.composite([{ input: await overlay.toBuffer() }]);
+  return import_koishi.h.image(await image.png().toBuffer(), "image/png");
 }
 __name(drawLock, "drawLock");
-async function drawSold(baseImage) {
-  if (!baseImage) {
-    return "输入无效。";
+async function drawSold(ctx, baseImage) {
+  const image = await getImageFromUrl(ctx, baseImage);
+  if (image === -1) {
+    return "发生错误";
+  } else if (image === -2) {
+    return "输入无效";
   }
+  const imageMetadata = await image.metadata();
+  const size1 = Math.min(imageMetadata.width, imageMetadata.height);
+  image.resize({ width: size1, height: size1, fit: "cover" });
+  const middle = (0, import_sharp.default)({
+    create: {
+      width: size1,
+      height: size1,
+      channels: 4,
+      background: { r: 255, g: 255, b: 255, alpha: 0.4 }
+    }
+  }).png();
   const soldUrl = `${assetsDir}/sold.png`;
+  const overlay = (0, import_sharp.default)(soldUrl).png();
+  const overlaySize = Math.round(size1 * 182 / 240);
+  overlay.resize({
+    width: overlaySize,
+    height: overlaySize
+  });
+  const topLeft = Math.round(overlaySize * 29 / 182);
+  image.composite([
+    { input: await middle.toBuffer() },
+    {
+      input: await overlay.toBuffer(),
+      top: topLeft,
+      left: topLeft
+    }
+  ]);
+  return import_koishi.h.image(await image.png().toBuffer(), "image/png");
+}
+__name(drawSold, "drawSold");
+async function getImageFromUrl(ctx, url) {
+  if (!url) return -2;
   let image;
+  const config = {
+    responseType: "arraybuffer"
+  };
   try {
-    image = await import_jimp.Jimp.read(baseImage);
+    image = (0, import_sharp.default)(await ctx.http.get(url, config)).png();
   } catch (err) {
     console.error(err);
-    return "发生错误。";
+    return -1;
   }
-  const size1 = Math.min(image.width, image.height);
-  image.cover({ w: size1, h: size1 });
-  const middle = new import_jimp.Jimp({ width: image.width, height: image.height, color: 4294967295 });
-  const overlay = await import_jimp.Jimp.read(soldUrl);
-  overlay.resize({ w: image.width * 182 / 240 });
-  middle.opacity(0.4);
-  image.composite(middle);
-  image.composite(overlay, image.width * 29 / 240, image.width * 29 / 240);
-  return import_koishi.h.image(await image.getBuffer("image/jpeg"), "image/jpeg");
+  return image;
 }
-__name(drawSold, "drawSold");
+__name(getImageFromUrl, "getImageFromUrl");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,

package/package.json

@@ -4,7 +4,7 @@
   "contributors": [
     "StarFreedomX <starfreedomx@outlook.com>"
   ],
-  "version": "0.3.5",
+  "version": "0.4.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -36,6 +36,6 @@
     "koishi": "^4.18.7"
   },
   "dependencies": {
-    "jimp": "^1.6.0"
+    "sharp": "^0.34.1"
   }
 }

package/readme.md

@@ -22,3 +22,6 @@ StarFreedomX机器人的小功能，自用
 | `0.3.3` | 修订添加"我才不是机器人"是否需要at      |
 | `0.3.4` | 分离"艾特我/他又不说话"的两个选项为单独的开关 |
 | `0.3.5` | 修复丢失的assets              |
+| `0.3.6` | 添加"艾特我/他又不说话"的概率配置       |
+| `0.4.0` | 更改处理库为sharp              |
+| `0.4.1` | 修复sharp处理w>h的图报错的bug     |