koishi-plugin-starfx-bot 0.1.2 → 0.1.3

package/lib/index.d.ts

@@ -1,6 +1,7 @@
-import { Context, h, Schema, Session, Universal } from 'koishi';
+import { Context, h, Schema, Session } from 'koishi';
 export declare const name = "starfx-bot";
 export declare let baseDir: string;
+export declare let assetsDir: string;
 export interface Config {
     openLock: boolean;
     openSold: boolean;
@@ -8,7 +9,6 @@ export interface Config {
 export declare const Config: Schema<Config>;
 export declare const usage = "StarFreedomX\u7684\u81EA\u7528\u63D2\u4EF6 \u653E\u4E86\u4E00\u4E9B\u5C0F\u529F\u80FD";
 export declare function apply(ctx: Context, cfg: Config): void;
-export declare function getImageSrc(session: Session, param: string): Promise<string>;
-export declare function drawLock(baseImage: string): Promise<"输入无效。" | h>;
-export declare function drawSold(baseImage: string): Promise<"输入无效。" | h>;
-export declare function getMemberInfo(member: Universal.GuildMember, id: string): string[];
+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 | "输入无效。" | "发生错误。">;

package/lib/index.js

@@ -32,11 +32,11 @@ var src_exports = {};
 __export(src_exports, {
   Config: () => Config,
   apply: () => apply,
+  assetsDir: () => assetsDir,
   baseDir: () => baseDir,
   drawLock: () => drawLock,
   drawSold: () => drawSold,
   getImageSrc: () => getImageSrc,
-  getMemberInfo: () => getMemberInfo,
   name: () => name,
   usage: () => usage
 });
@@ -46,6 +46,7 @@ var import_jimp = require("jimp");
 var fs = __toESM(require("fs"));
 var name = "starfx-bot";
 var baseDir;
+var assetsDir;
 var Config = import_koishi.Schema.object({
   openLock: import_koishi.Schema.boolean().default(true).description("开启明日方舟封印功能"),
   openSold: import_koishi.Schema.boolean().default(true).description('开启闲鱼"卖掉了"功能')
@@ -53,16 +54,9 @@ var Config = import_koishi.Schema.object({
 var usage = "StarFreedomX的自用插件 放了一些小功能";
 function apply(ctx, cfg) {
   baseDir = ctx.baseDir;
-  if (fs.existsSync(`${__dirname}/../assets/lock.png`)) {
-    fs.mkdirSync(`${ctx.baseDir}/data/starfx-bot/assets/`, { recursive: true });
-    fs.copyFileSync(`${__dirname}/../assets/lock.png`, `${ctx.baseDir}/data/starfx-bot/assets/lock.png`);
-    fs.rmSync(`${__dirname}/../assets/lock.png`);
-  }
-  if (fs.existsSync(`${__dirname}/../assets/sold.png`)) {
-    fs.mkdirSync(`${ctx.baseDir}/data/starfx-bot/assets/`, { recursive: true });
-    fs.copyFileSync(`${__dirname}/../assets/sold.png`, `${ctx.baseDir}/data/starfx-bot/assets/sold.png`);
-    fs.rmSync(`${__dirname}/../assets/sold.png`);
-  }
+  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));
@@ -70,63 +64,64 @@ function apply(ctx, cfg) {
   }
   if (cfg.openSold) {
     ctx.command("卖掉了 [param]").action(async ({ session }, param) => {
+      console.log("elements");
+      console.log(session.elements);
+      console.log("quote");
+      console.log(session.quote);
+      console.log("param");
+      console.log(param);
       return await drawSold(await getImageSrc(session, param));
     });
   }
 }
 __name(apply, "apply");
 async function getImageSrc(session, param) {
-  const { gid } = session;
-  let userid = "";
-  let imageSrc = "";
-  console.log(param);
-  if (!param) {
-    console.log("no");
-    userid = session.userId;
-  } else if (param.startsWith("<at id=")) {
-    console.log("at");
-    userid = param.match(/<at\s+id="(\d+)"\s*\/?>/i)?.[1] ?? null;
-  } else if (param.startsWith("<img src=")) {
-    console.log("img");
-    return param.match(/<img[^>]*\s+src="([^"]+)"/i)?.[1] ?? null;
-  } else {
-    console.log("other");
-    const index = param.indexOf("<");
-    param = param.slice(index);
-    if (param?.length) {
-      return getImageSrc(session, param);
-    } else {
-      return "";
+  if (param?.length && param?.length === String(Number(param))?.length) {
+    return `https://q1.qlogo.cn/g?b=qq&nk=${param}&s=640`;
+  } else if (!param?.length) {
+    return `https://q1.qlogo.cn/g?b=qq&nk=${session.userId}&s=640`;
+  }
+  const elementArray = session.elements;
+  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) {
+      return `https://q1.qlogo.cn/g?b=qq&nk=${element.attrs.id}&s=640`;
     }
   }
-  if (userid) {
-    const memberList = await getMemberList(session, gid);
-    const selected = memberList.find((u) => u.user.id == userid);
-    return getMemberInfo(selected, selected.user.id)[1];
+  const quoteElementArray = session?.quote?.elements;
+  if (quoteElementArray?.length) {
+    for (const element of quoteElementArray) {
+      if (element?.type === "img") {
+        return element?.attrs?.src;
+      } else if (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`;
+      }
+    }
   }
-  return imageSrc;
+  return "";
 }
 __name(getImageSrc, "getImageSrc");
-async function getMemberList(session, gid) {
-  let result = [];
-  try {
-    const { data, next } = await session.bot.getGuildMemberList(session.guildId);
-    result = data;
-    if (next) {
-      const { data: data2 } = await session.bot.getGuildMemberList(session.guildId, next);
-      result.push(...data2);
-    }
-  } catch {
+function initAssets(fileName) {
+  if (fs.existsSync(`${__dirname}/../assets/${fileName}`)) {
+    fs.mkdirSync(`${assetsDir}/`, { recursive: true });
+    fs.copyFileSync(`${__dirname}/../assets/${fileName}`, `${assetsDir}/${fileName}`);
+    fs.rmSync(`${__dirname}/../assets/${fileName}`);
   }
-  return result;
 }
-__name(getMemberList, "getMemberList");
+__name(initAssets, "initAssets");
 async function drawLock(baseImage) {
   if (!baseImage) {
     return "输入无效。";
   }
   const lockUrl = `${baseDir}/data/starfx-bot/assets/lock.png`;
-  const image = await import_jimp.Jimp.read(baseImage);
+  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);
@@ -139,9 +134,15 @@ async function drawSold(baseImage) {
   if (!baseImage) {
     return "输入无效。";
   }
-  const soldUrl = `${baseDir}/data/starfx-bot/assets/sold.png`;
-  const image = await import_jimp.Jimp.read(baseImage);
-  const size1 = image.width > image.height ? image.height : image.width;
+  const soldUrl = `${assetsDir}/sold.png`;
+  let image;
+  try {
+    image = await import_jimp.Jimp.read(baseImage);
+  } catch (err) {
+    console.error(err);
+    return "发生错误。";
+  }
+  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);
@@ -152,21 +153,15 @@ async function drawSold(baseImage) {
   return import_koishi.h.image(await image.getBuffer("image/jpeg"), "image/jpeg");
 }
 __name(drawSold, "drawSold");
-function getMemberInfo(member, id) {
-  const name2 = member?.nick || member?.user?.nick || member?.user?.name || id;
-  const avatar = member?.avatar || member?.user?.avatar;
-  return [name2, avatar];
-}
-__name(getMemberInfo, "getMemberInfo");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,
   apply,
+  assetsDir,
   baseDir,
   drawLock,
   drawSold,
   getImageSrc,
-  getMemberInfo,
   name,
   usage
 });

package/package.json

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