@karinjs/plugin-basic 1.4.9 → 1.4.11

package/dist/apps/logger.js

@@ -1,6 +1,6 @@
 import {
   render
-} from "../chunk-P2HUKRYC.js";
+} from "../chunk-JKALEULG.js";
 
 // src/apps/logger.ts
 import fs from "fs";

package/dist/apps/login.js

@@ -1,8 +1,8 @@
 import {
   cfg
-} from "../chunk-BSCD2CTL.js";
+} from "../chunk-5LTHGJIJ.js";
 import "../chunk-7IEYT4QX.js";
-import "../chunk-P2HUKRYC.js";
+import "../chunk-JKALEULG.js";
 
 // src/apps/login.ts
 import karin, { common, contactFriend, logger, segment } from "node-karin";

package/dist/apps/master.js

@@ -4,29 +4,32 @@ import { karin, logger, config, segment } from "node-karin";
 var CAPTCHA = /* @__PURE__ */ new Map();
 var Master = karin.command(/^#设置主人$/, async (e) => {
   if (e.isMaster) {
-    await e.reply(`
-[${e.userId}] \u5DF2\u7ECF\u662F\u4E3B\u4EBA`, { at: true });
+    await e.reply(`[${e.userId}] \u5DF2\u7ECF\u662F\u4E3B\u4EBA`, { at: true });
     return true;
   }
   const sign = crypto.randomUUID();
   logger.mark(`\u8BBE\u7F6E\u4E3B\u4EBA\u9A8C\u8BC1\u7801\uFF1A${logger.green(sign)}`);
   CAPTCHA.set(e.userId, sign);
-  await e.reply("\n\u8BF7\u8F93\u5165\u63A7\u5236\u53F0\u9A8C\u8BC1\u7801", { at: true });
-  const event = await karin.ctx(e);
-  if (event === null) {
-    await e.reply("\u7B49\u5F85\u8D85\u65F6\uFF0C\u5DF2\u53D6\u6D88", { at: true });
-    return true;
-  }
-  if (sign !== event.msg.trim()) {
-    await e.reply("\u9A8C\u8BC1\u7801\u9519\u8BEF", { at: true });
+  try {
+    await e.reply("\u8BF7\u8F93\u5165\u63A7\u5236\u53F0\u9A8C\u8BC1\u7801", { at: true });
+    const event = await karin.ctx(e);
+    if (event === null) {
+      await e.reply("\u7B49\u5F85\u8D85\u65F6\uFF0C\u5DF2\u53D6\u6D88", { at: true });
+      return true;
+    }
+    if (sign !== event.msg.trim()) {
+      await e.reply("\u9A8C\u8BC1\u7801\u9519\u8BEF", { at: true });
+      return true;
+    }
+    const name = "config";
+    const data = config.getYaml(name, "user");
+    data.master.push(e.userId);
+    config.setYaml(name, data);
+    await e.reply("\u8BBE\u7F6E\u4E3B\u4EBA\u6210\u529F", { at: true });
     return true;
+  } finally {
+    CAPTCHA.delete(e.userId);
   }
-  const name = "config";
-  const data = config.getYaml(name, "user");
-  data.master.push(e.userId);
-  config.setYaml(name, data);
-  await e.reply("\n\u8BBE\u7F6E\u4E3B\u4EBA\u6210\u529F", { at: true });
-  return true;
 }, { name: "\u8BBE\u7F6E\u4E3B\u4EBA", priority: -1 });
 var addMaster = karin.command(/^#新增主人/, async (e) => {
   const userId = e.at[0] || e.msg.replace(/^#新增主人/, "").trim();
@@ -43,44 +46,41 @@ var addMaster = karin.command(/^#新增主人/, async (e) => {
   const data = config.getYaml(name, "user");
   data.master.push(userId);
   config.setYaml(name, data);
-  await e.reply(`
-\u65B0\u589E\u4E3B\u4EBA: ${userId}`, { at: true });
+  await e.reply(`\u65B0\u589E\u4E3B\u4EBA: ${userId}`, { at: true });
   return true;
 }, { name: "\u65B0\u589E\u4E3B\u4EBA", priority: -1, permission: "master" });
 var delMaster = karin.command(/^#删除主人/, async (e) => {
   const userId = e.at[0] || e.msg.replace(/^#删除主人/, "").trim() || e.userId;
   if (userId === e.userId) {
     if (e.isMaster) {
-      await e.reply(`
-[${e.userId}] \u4E0D\u53EF\u4EE5\u5220\u9664\u81EA\u5DF1`, { at: true });
+      await e.reply(`[${e.userId}] \u4E0D\u53EF\u4EE5\u5220\u9664\u81EA\u5DF1`, { at: true });
       return true;
     }
   } else if (!config.master().includes(userId)) {
-    await e.reply(`
-[${userId}] \u4E0D\u662F\u4E3B\u4EBA`, { at: true });
+    await e.reply(`[${userId}] \u4E0D\u662F\u4E3B\u4EBA`, { at: true });
     return true;
   }
   const name = "config";
   const data = config.getYaml(name, "user");
   data.master = data.master.filter((v) => v !== userId);
   config.setYaml(name, data);
-  await e.reply(`
-\u5220\u9664\u4E3B\u4EBA: ${userId}`, { at: true });
+  await e.reply(`\u5220\u9664\u4E3B\u4EBA: ${userId}`, { at: true });
   return true;
 }, { name: "\u5220\u9664\u4E3B\u4EBA", priority: -1, permission: "master" });
 var listMaster = karin.command(/^#主人列表$/, async (e) => {
   const masters = config.master();
   await e.reply(`\u4E3B\u4EBA\u5217\u8868:
-${masters.map((v) => `- ${v}`).join("\n")}`, { reply: true });
+${masters.map((v) => `- ${v}`).join("\n")}`, { at: true });
   return true;
 }, { name: "\u4E3B\u4EBA\u5217\u8868", priority: -1, permission: "master" });
 var setMasterCaptcha = karin.command(/^#设置主人验证码$/, async (e) => {
   const msg = [];
   CAPTCHA.forEach((v, k) => {
-    msg.push(segment.text(`- \u7528\u6237: ${k} \u9A8C\u8BC1\u7801: ${v}`));
+    msg.push(segment.text(`
+- ${k} \u9A8C\u8BC1\u7801: ${v}`));
   });
-  if (msg.length === 0) return e.reply("\u6682\u65E0\u9A8C\u8BC1\u7801", { reply: true });
-  await e.reply(["\u4E3B\u4EBA\u9A8C\u8BC1\u7801\u5217\u8868:\n", ...msg], { reply: true });
+  if (msg.length === 0) return e.reply("\u6682\u65E0\u9A8C\u8BC1\u7801", { at: true });
+  await e.reply(["\u4E3B\u4EBA\u9A8C\u8BC1\u7801\u5217\u8868:", ...msg], { at: true });
 }, { name: "\u8BBE\u7F6E\u4E3B\u4EBA\u9A8C\u8BC1\u7801", priority: -1, permission: "master" });
 export {
   Master,

package/dist/apps/restart.js

@@ -1,10 +1,10 @@
 import {
   cfg
-} from "../chunk-BSCD2CTL.js";
+} from "../chunk-5LTHGJIJ.js";
 import "../chunk-7IEYT4QX.js";
 import {
   plugin
-} from "../chunk-P2HUKRYC.js";
+} from "../chunk-JKALEULG.js";
 
 // src/apps/restart.ts
 import { common, karin, logger, restart, restartDirect } from "node-karin";

package/dist/apps/status.js

@@ -7,9 +7,9 @@ import {
 } from "../chunk-ODFXVVIE.js";
 import {
   cfg
-} from "../chunk-BSCD2CTL.js";
+} from "../chunk-5LTHGJIJ.js";
 import "../chunk-7IEYT4QX.js";
-import "../chunk-P2HUKRYC.js";
+import "../chunk-JKALEULG.js";
 
 // src/apps/status.ts
 import { karin } from "node-karin";

package/dist/apps/update.js

@@ -1,12 +1,12 @@
 import {
   cfg
-} from "../chunk-BSCD2CTL.js";
+} from "../chunk-5LTHGJIJ.js";
 import {
   sendToFirstAdmin
 } from "../chunk-7IEYT4QX.js";
 import {
   render
-} from "../chunk-P2HUKRYC.js";
+} from "../chunk-JKALEULG.js";
 
 // src/apps/update.ts
 import fs from "fs";

package/dist/{chunk-BSCD2CTL.js → chunk-5LTHGJIJ.js}

@@ -1,6 +1,6 @@
 import {
   plugin
-} from "./chunk-P2HUKRYC.js";
+} from "./chunk-JKALEULG.js";
 
 // src/config/config.ts
 import fs from "fs";

package/dist/{chunk-P2HUKRYC.js → chunk-JKALEULG.js}

@@ -7,7 +7,7 @@ import { karinPathBase } from "node-karin";
 // package.json
 var package_default = {
   name: "@karinjs/plugin-basic",
-  version: "1.4.9",
+  version: "1.4.11",
   description: "Karin\u7684\u57FA\u7840\u63D2\u4EF6,\u63D0\u4F9B\u6700\u57FA\u7840\u7684\u529F\u80FD",
   homepage: "https://github.com/KarinJS/karin-plugin-basic",
   bugs: {

package/dist/index.js

@@ -10,7 +10,7 @@ import {
 import "./chunk-7IEYT4QX.js";
 import {
   plugin
-} from "./chunk-P2HUKRYC.js";
+} from "./chunk-JKALEULG.js";
 
 // src/index.ts
 import { logger } from "node-karin";

package/dist/web.config.js

@@ -1,10 +1,10 @@
 import {
   cfg
-} from "./chunk-BSCD2CTL.js";
+} from "./chunk-5LTHGJIJ.js";
 import "./chunk-7IEYT4QX.js";
 import {
   plugin
-} from "./chunk-P2HUKRYC.js";
+} from "./chunk-JKALEULG.js";
 
 // src/web.config.ts
 import { components, defineConfig } from "node-karin";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karinjs/plugin-basic",
-  "version": "1.4.9",
+  "version": "1.4.11",
   "description": "Karin的基础插件,提供最基础的功能",
   "homepage": "https://github.com/KarinJS/karin-plugin-basic",
   "bugs": {