koishi-plugin-echo-cave 1.10.0 → 1.10.2

package/lib/index.cjs

@@ -157,10 +157,6 @@ async function getUserName(ctx, session, userId) {
 }
 
 // src/cave-helper.ts
-var random = (arr) => arr[Math.floor(Math.random() * arr.length)];
-var replacePlaceholders = (template, data) => {
-  return template.replace(/{(\w+)}/g, (match, key) => data[key] || match);
-};
 async function sendCaveMsg(ctx, session, caveMsg) {
   const { channelId } = session;
   const content = JSON.parse(caveMsg.content);
@@ -173,34 +169,41 @@ async function sendCaveMsg(ctx, session, caveMsg) {
     originName,
     userName
   };
-  const templates = require_zh_CN()["echo-cave"].templates;
+  const TEMPLATE_COUNT = 5;
   if (caveMsg.type === "forward") {
-    const forwardTemplates = (templates.forward || []).filter(
-      (template) => template.trim() !== ""
-    );
-    if (forwardTemplates.length === 0) {
+    const availableTemplates2 = [];
+    for (let i = 0; i < TEMPLATE_COUNT; i++) {
+      const template = session.text(`echo-cave.templates.forward.${i}`, templateData);
+      if (template.trim() !== "") {
+        availableTemplates2.push(template);
+      }
+    }
+    if (availableTemplates2.length === 0) {
       await session.send(session.text("echo-cave.general.noTemplatesConfigured"));
       return;
     }
-    const chosenTemplate2 = replacePlaceholders(random(forwardTemplates), templateData);
+    const chosenTemplate2 = availableTemplates2[Math.floor(Math.random() * availableTemplates2.length)];
     await session.onebot.sendGroupMsg(channelId, [createTextMsg(chosenTemplate2)]);
     await session.onebot.sendGroupForwardMsg(channelId, content);
     return;
   }
-  const msgTemplates = (templates.msg || []).filter(
-    (template) => template && template.prefix?.trim() !== "" && template.suffix?.trim() !== ""
-  );
-  if (msgTemplates.length === 0) {
+  const availableTemplates = [];
+  for (let i = 0; i < TEMPLATE_COUNT; i++) {
+    const prefix = session.text(`echo-cave.templates.msg.${i}.prefix`, templateData);
+    const suffix = session.text(`echo-cave.templates.msg.${i}.suffix`, templateData);
+    if (prefix.trim() !== "" && suffix.trim() !== "") {
+      availableTemplates.push({ prefix, suffix });
+    }
+  }
+  if (availableTemplates.length === 0) {
     await session.send(session.text("echo-cave.general.noTemplatesConfigured"));
     return;
   }
-  const chosenTemplate = random(msgTemplates);
-  const prefix = replacePlaceholders(chosenTemplate.prefix, templateData);
-  const suffix = replacePlaceholders(chosenTemplate.suffix, templateData);
+  const chosenTemplate = availableTemplates[Math.floor(Math.random() * availableTemplates.length)];
   const last = content.at(-1);
   const needsNewline = last?.type === "text";
-  content.unshift(createTextMsg(prefix));
-  content.push(createTextMsg(`${needsNewline ? "\n\n" : ""}${suffix}`));
+  content.unshift(createTextMsg(chosenTemplate.prefix));
+  content.push(createTextMsg(`${needsNewline ? "\n\n" : ""}${chosenTemplate.suffix}`));
   await session.onebot.sendGroupMsg(channelId, content);
 }
 function formatDate(date) {
@@ -369,7 +372,7 @@ function apply(ctx, cfg) {
 }
 async function getCaveListByUser(ctx, session) {
   if (!session.guildId) {
-    return session.text("general.privateChatReminder");
+    return session.text("echo-cave.general.privateChatReminder");
   }
   const { userId, channelId } = session;
   const caves = await ctx.database.get("echo_cave", {
@@ -387,7 +390,7 @@ async function getCaveListByUser(ctx, session) {
 }
 async function getCaveListByOriginUser(ctx, session) {
   if (!session.guildId) {
-    return session.text("general.privateChatReminder");
+    return session.text("echo-cave.general.privateChatReminder");
   }
   const { userId, channelId } = session;
   const caves = await ctx.database.get("echo_cave", {
@@ -405,7 +408,7 @@ async function getCaveListByOriginUser(ctx, session) {
 }
 async function getCave(ctx, session, id) {
   if (!session.guildId) {
-    return session.text("general.privateChatReminder");
+    return session.text("echo-cave.general.privateChatReminder");
   }
   let caveMsg;
   const { channelId } = session;
@@ -423,7 +426,7 @@ async function getCave(ctx, session, id) {
       channelId
     });
     if (caves.length === 0) {
-      return session.text("general.noMsgWithId");
+      return session.text("echo-cave.general.noMsgWithId");
     }
     caveMsg = caves[0];
   }
@@ -431,14 +434,14 @@ async function getCave(ctx, session, id) {
 }
 async function deleteCave(ctx, session, cfg, id) {
   if (!session.guildId) {
-    return session.text("general.privateChatReminder");
+    return session.text("echo-cave.general.privateChatReminder");
   }
   if (!id) {
     return session.text(".noIdProvided");
   }
   const caves = await ctx.database.get("echo_cave", id);
   if (caves.length === 0) {
-    return session.text("general.noMsgWithId");
+    return session.text("echo-cave.general.noMsgWithId");
   }
   const caveMsg = caves[0];
   const currentUserId = session.userId;
@@ -470,7 +473,7 @@ async function deleteCave(ctx, session, cfg, id) {
 }
 async function addCave(ctx, session) {
   if (!session.guildId) {
-    return session.text("general.privateChatReminder");
+    return session.text("echo-cave.general.privateChatReminder");
   }
   if (!session.quote) {
     return session.text(".noMsgQuoted");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",