koishi-plugin-starfx-bot 0.13.1 → 0.13.3

package/lib/index.js

@@ -72,25 +72,22 @@ async function getRecord(cfg, gid, tag) {
   if (!import_fs.default.existsSync(recordDir)) return null;
   const files = import_fs.default.readdirSync(recordDir).filter((file) => /\.(png|jpe?g|webp|gif)$/i.test(file));
   if (!files.length) return null;
-  let weightedFiles = [];
-  if (tag && import_fs.default.existsSync(tagConfigPath)) {
-    const tagConfigJson = JSON.parse(import_fs.default.readFileSync(tagConfigPath, "utf8") || "{}");
-    files.forEach((file) => {
-      const name2 = import_node_path.default.parse(file).name;
-      const tags = tagConfigJson[name2] || [];
-      if (tags.includes(tag)) {
-        for (let i = 0; i < cfg.tagWeight; i++) {
-          weightedFiles.push(file);
-        }
-      } else {
-        weightedFiles.push(file);
-      }
-    });
-  } else {
-    weightedFiles = files;
+  const tagConfigJson = import_fs.default.existsSync(tagConfigPath) ? JSON.parse(import_fs.default.readFileSync(tagConfigPath, "utf8") || "{}") : {};
+  const weighted = files.map((file) => {
+    const name2 = import_node_path.default.parse(file).name;
+    const tags = tagConfigJson[name2] || [];
+    const weight = tag && tags.includes(tag) ? cfg.tagWeight : 1;
+    return { file, weight };
+  });
+  const totalWeight = weighted.reduce((acc, cur) => acc + cur.weight, 0);
+  let rand = Math.random() * totalWeight;
+  for (const item of weighted) {
+    rand -= item.weight;
+    if (rand <= 0) {
+      return import_node_path.default.join(recordDir, item.file);
+    }
   }
-  const selected = import_koishi.Random.pick(weightedFiles);
-  return selected ? import_node_path.default.join(recordDir, selected) : null;
+  return null;
 }
 __name(getRecord, "getRecord");
 function getTodayPrefix() {
@@ -505,13 +502,13 @@ function apply(ctx, cfg) {
   if (cfg.openLock) {
     ctx.command("封印 [param]").action(async ({ session }, param) => {
       if (detectControl(controlJson, session.guildId, "lock"))
-        return await drawLock(ctx, await getImageSrc(session, param));
+        await session.send(await drawLock(ctx, await getImageSrc(session, param)));
     });
   }
   if (cfg.openSold) {
     ctx.command("卖掉了 [param]").action(async ({ session }, param) => {
       if (detectControl(controlJson, session.guildId, "sold"))
-        return await drawSold(ctx, await getImageSrc(session, param));
+        await session.send(await drawSold(ctx, await getImageSrc(session, param)));
     });
   }
   if (cfg.roll) {

package/package.json

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

package/readme.md

@@ -99,3 +99,5 @@ StarFreedomX机器人的小功能，自用
 | `0.12.0` | 加入echo功能                      |
 | `0.13.0` | 语录支持tag以及调整权重                 |
 | `0.13.1` | 修复pure类型绘图名称错误                |
+| `0.13.2` | 优化了tag在权重很大情况下的筛选效率           |
+| `0.13.3` | 不再return图片对象，防止$()可能导致的参数溢出   |