koishi-plugin-starfx-bot 0.13.4 → 0.13.5

package/lib/index.js

@@ -131,7 +131,7 @@ function saveImage(arrayBuffer, directory, filename) {
 __name(saveImage, "saveImage");
 async function getImageSrc(session, param, option) {
   const number = option?.number ?? true, img = option?.img ?? true, at = option?.at ?? true, noParam = option?.noParam ?? true, quote = option?.quote ?? true;
-  if (number && param?.length && param?.length === String(Number(param))?.length) {
+  if (number && param?.length && /^\d+$/.test(param)) {
     return `https://q1.qlogo.cn/g?b=qq&nk=${param}&s=640`;
   } else if (noParam && !param?.length) {
     return `https://q1.qlogo.cn/g?b=qq&nk=${session.userId}&s=640`;
@@ -141,7 +141,6 @@ async function getImageSrc(session, param, option) {
     if (quoteElementArray?.length) {
       for (const element of quoteElementArray) {
         if (img && element?.type === "img") {
-          return element?.attrs?.src;
         } else if (at && element?.type === "at" && element?.attrs?.id && element.attrs.id !== session.selfId) {
           return `https://q1.qlogo.cn/g?b=qq&nk=${element?.attrs?.id}&s=640`;
         }
@@ -341,8 +340,14 @@ async function drawBanGDream(avatar, inputOptions) {
   };
   options.starType ||= options.starNum < 3 ? starTypes[0] : import_koishi.Random.pick(starTypes);
   options.border ||= `card-${starNums.includes(options.starNum) ? options.starNum : 5}${options.starNum == 1 ? `-${options.color}` : ""}`;
-  const [image, colorImage, bandImage, starImage, borderImage] = await Promise.all([
-    import_jimp.Jimp.read(avatar),
+  let image;
+  try {
+    image = await import_jimp.Jimp.read(avatar);
+  } catch (e) {
+    starfxLogger.error(e);
+    return;
+  }
+  const [colorImage, bandImage, starImage, borderImage] = await Promise.all([
     import_jimp.Jimp.read(`${assetsDir}/bangborder/${options.color}.png`),
     import_jimp.Jimp.read(`${assetsDir}/bangborder/${options.band}.png`),
     import_jimp.Jimp.read(`${assetsDir}/bangborder/${options.starType}.png`),
@@ -535,11 +540,12 @@ function apply(ctx, cfg) {
     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);
+        console.log(param.slice(0, 100));
         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;
         await session.send(import_koishi2.h.image(imageBase64));
       }
@@ -609,6 +615,7 @@ function apply(ctx, cfg) {
   });
   if (process.env.NODE_ENV === "development") {
     ctx.command("test").action(async ({ session }) => {
+      await session.send(import_koishi2.h.video("https://video.twimg.com/amplify_video/1920672748596043776/vid/avc1/1080x1920/c3BNP3qg4-sT82fR.mp4?tag=21"));
     });
   }
   function initAssets() {

package/package.json

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

package/readme.md

@@ -101,4 +101,5 @@ StarFreedomX机器人的小功能，自用
 | `0.13.1` | 修复pure类型绘图名称错误                   |
 | `0.13.2` | 优化了tag在权重很大情况下的筛选效率              |
 | `0.13.3` | 不再return图片对象，防止$()可能导致的参数溢出      |
-| `0.13.3` | Re修订:不再return图片对象，防止$()可能导致的参数溢出 |
+| `0.13.4` | Re修订:不再return图片对象，防止$()可能导致的参数溢出 |
+| `0.13.5` | Re再修订:bdbd新增检测异常机制，防止$()可能导致的问题  |