koishi-plugin-cocoyyy-console 1.0.1 → 1.0.2

package/lib/index.js

@@ -225,68 +225,118 @@ function getImgsModel() {
 }
 __name(getImgsModel, "getImgsModel");
 
-// src/utils/common.ts
-function is_at_bot(session) {
-  const elements = Array.isArray(session?.elements) ? session.elements : [];
-  const atElement = elements.find((element) => element?.type === "at");
-  const atId = atElement?.attrs?.id;
-  const selfId = session?.bot?.selfId ?? session?.selfId;
-  if (atId == null || selfId == null) return false;
-  return String(atId) === String(selfId);
-}
-__name(is_at_bot, "is_at_bot");
-
 // src/services/tag_service.ts
 var import_sequelize4 = require("sequelize");
-var import_fs = require("fs");
+var import_fs2 = require("fs");
+var import_path2 = require("path");
+
+// src/services/img_service.ts
+var import_koishi2 = require("koishi");
 var import_path = require("path");
-async function findTagByName(name2) {
+var import_fs = require("fs");
+async function saveImg(tag_name, img, savePath2) {
+  try {
+    const Img = getImgsModel();
+    logger.info("[saveImg Info]: " + img);
+    let tag = await getTag(tag_name);
+    if (tag == null) {
+      throw new Error(`not found tag '${tag_name}'!`);
+    }
+    if (tag.get("status") !== 0) {
+      logger.info(`[saveImg Info]:tag '${tag_name}' is deleted`);
+      throw new Error(`tag '${tag_name}' is deleted!`);
+    }
+    if (savePath2 == null) {
+      throw new Error("saving path config wrong!");
+    }
+    let dir = (0, import_path.join)(savePath2, String(tag.get("id")));
+    const now = new Date(Date.now() + 8 * 60 * 60 * 1e3);
+    const filetag_name = now.getFullYear().toString() + String(now.getMonth() + 1).padStart(2, "0") + String(now.getDate()).padStart(2, "0") + String(now.getHours()).padStart(2, "0") + String(now.getMinutes()).padStart(2, "0") + String(now.getSeconds()).padStart(2, "0") + ".txt";
+    let filePath = (0, import_path.join)(dir, filetag_name);
+    await import_fs.promises.writeFile(filePath, img);
+    const saveImg2 = await Img.create({ tag_id: tag.get("id"), img_url: filePath, createtime: now });
+    logger.info("[saveImg Info]: save image to '" + tag_name + "' success");
+    return { result: true, error: null };
+  } catch (e) {
+    logger.error("[saveImg Error]: " + e?.message || String(e));
+    return { result: false, error: e?.message || String(e) };
+  }
+}
+__name(saveImg, "saveImg");
+async function randomImgByTag(tag_name) {
+  try {
+    const Img = getImgsModel();
+    const existed = await getTag(tag_name);
+    if (!existed) {
+      throw new Error(`not found tag '${tag_name}'!`);
+    }
+    if (existed.status == 0) {
+      throw new Error(`not found tag '${tag_name}'!`);
+    }
+    let ImgList = await Img.findAll({
+      where: {
+        status: 0,
+        tag_id: existed.get("id")
+      }
+    });
+    if (ImgList.length <= 0) {
+      throw new Error("Don't have image!");
+    }
+    const random = new import_koishi2.Random(() => Math.random());
+    let result = ImgList[random.int(0, ImgList.length)];
+    const filePath = result.get("img_url");
+    const fileContent = await import_fs.promises.readFile(filePath, { encoding: "utf-8" });
+    return fileContent;
+  } catch (e) {
+    logger.error("[randomImgByTag Error]: " + e?.message || String(e));
+    return null;
+  }
+}
+__name(randomImgByTag, "randomImgByTag");
+async function getImgCountByTag(tag_id) {
+  const Img = getImgsModel();
+  let count = await Img.count({
+    where: { status: 0, tag_id }
+  });
+  return count;
+}
+__name(getImgCountByTag, "getImgCountByTag");
+
+// src/services/tag_service.ts
+async function findTagByName(tag_name) {
   const Tag = getTagsModel();
   return await Tag.findOne({
     where: {
       status: 0,
       [import_sequelize4.Op.or]: [
-        { tags: name2 },
-        { alias: { [import_sequelize4.Op.like]: `%${name2}%` } }
+        { tags: tag_name },
+        { alias: { [import_sequelize4.Op.like]: `%${tag_name}%` } }
       ]
     }
   });
 }
 __name(findTagByName, "findTagByName");
-async function findDeletedTagByName(name2) {
+async function findDeletedTagByName(tag_name) {
   const Tag = getTagsModel();
   return await Tag.findOne({
     where: {
       status: 1,
       [import_sequelize4.Op.or]: [
-        { tags: name2 },
-        { alias: { [import_sequelize4.Op.like]: `%${name2}%` } }
+        { tags: tag_name },
+        { alias: { [import_sequelize4.Op.like]: `%${tag_name}%` } }
       ]
     }
   });
 }
 __name(findDeletedTagByName, "findDeletedTagByName");
-async function createorUpdateTag(name2, alias, savePath2) {
+async function createorUpdateTag(tag_name, savePath2) {
   try {
     const Tag = getTagsModel();
-    let existed = await findTagByName(name2);
+    let existed = await findTagByName(tag_name);
     if (existed) {
-      if (alias == null) {
-        throw new Error("already existed!");
-      }
-      let now_alias = existed.get("alias");
-      if (now_alias != null) {
-        const list = now_alias.split(";");
-        if (!list.includes(alias)) list.push(alias);
-        now_alias = list.join(";");
-      } else {
-        now_alias = alias;
-      }
-      existed.alias = now_alias;
-      await existed.save();
-      return { result: true, error: null };
+      throw new Error("already existed!");
     }
-    existed = await findDeletedTagByName(name2);
+    existed = await findDeletedTagByName(tag_name);
     if (existed) {
       if (existed.get("status") != 0) {
         existed.set("status", 0);
@@ -299,9 +349,9 @@ async function createorUpdateTag(name2, alias, savePath2) {
       throw new Error("saving path config wrong!");
     }
     const now = new Date(Date.now() + 8 * 60 * 60 * 1e3);
-    const tag = await Tag.create({ tags: name2, alias: alias ?? null, createtime: now });
-    const dir = (0, import_path.join)(savePath2, String(tag.id));
-    (0, import_fs.mkdirSync)(dir, { recursive: true });
+    const tag = await Tag.create({ tags: tag_name, alias: null, createtime: now });
+    const dir = (0, import_path2.join)(savePath2, String(tag.id));
+    (0, import_fs2.mkdirSync)(dir, { recursive: true });
     return { result: true, error: null };
   } catch (e) {
     logger.error("[createorUpdateTag Error]: " + e?.message || String(e));
@@ -309,9 +359,9 @@ async function createorUpdateTag(name2, alias, savePath2) {
   }
 }
 __name(createorUpdateTag, "createorUpdateTag");
-async function getTag(name2) {
+async function getTag(tag_name) {
   try {
-    let tag = await findTagByName(name2);
+    let tag = await findTagByName(tag_name);
     return tag;
   } catch (e) {
     logger.error("[getTag Error]: " + e?.message || String(e));
@@ -319,70 +369,81 @@ async function getTag(name2) {
   }
 }
 __name(getTag, "getTag");
-
-// src/services/img_service.ts
-var import_koishi2 = require("koishi");
-var import_path2 = require("path");
-var import_fs2 = require("fs");
-async function saveImg(name2, img, savePath2) {
+async function bindAlias(tag_name, alias) {
   try {
-    const Img = getImgsModel();
-    logger.info("[saveImg Info]: " + img);
-    let tag = await getTag(name2);
-    if (tag == null) {
-      throw new Error(`not found tag '${name2}'!`);
-    }
-    if (tag.get("status") !== 0) {
-      logger.info(`[saveImg Info]:tag '${name2}' is deleted`);
-      throw new Error(`tag '${name2}' is deleted!`);
+    return await checkAlias(tag_name, alias, false);
+  } catch (e) {
+    logger.error("[bindAlias Error]: " + e?.message || String(e));
+    return { result: false, error: e?.message || String(e) };
+  }
+}
+__name(bindAlias, "bindAlias");
+async function unbindAlias(tag_name, alias) {
+  try {
+    return await checkAlias(tag_name, alias, true);
+  } catch (e) {
+    logger.error("[unbindAlias Error]: " + e?.message || String(e));
+    return { result: false, error: e?.message || String(e) };
+  }
+}
+__name(unbindAlias, "unbindAlias");
+async function checkAlias(tag_name, alias, isDelete = false) {
+  try {
+    let existed = await findTagByName(tag_name);
+    if (existed == null) {
+      throw new Error(`not found tag '${tag_name}'`);
     }
-    if (savePath2 == null) {
-      throw new Error("saving path config wrong!");
+    let now_alias = existed.get("alias");
+    let new_list;
+    if (!isDelete) {
+      if (now_alias != null) {
+        const list = now_alias.split(";");
+        if (!list.includes(alias)) list.push(alias);
+        now_alias = list.join(";");
+      } else {
+        now_alias = alias;
+      }
+    } else {
+      if (now_alias != null) {
+        const list = now_alias.split(";");
+        if (list.includes(alias))
+          new_list = list.filter((tar) => tar !== alias);
+        now_alias = new_list.join(";");
+      } else {
+        throw new Error(`not found alia '${alias}'`);
+      }
     }
-    let dir = (0, import_path2.join)(savePath2, String(tag.get("id")));
-    const now = new Date(Date.now() + 8 * 60 * 60 * 1e3);
-    const filename = now.getFullYear().toString() + String(now.getMonth() + 1).padStart(2, "0") + String(now.getDate()).padStart(2, "0") + String(now.getHours()).padStart(2, "0") + String(now.getMinutes()).padStart(2, "0") + String(now.getSeconds()).padStart(2, "0") + ".txt";
-    let filePath = (0, import_path2.join)(dir, filename);
-    await import_fs2.promises.writeFile(filePath, img);
-    const saveImg2 = await Img.create({ tag_id: tag.get("id"), img_url: filePath, createtime: now });
-    logger.info("[saveImg Info]: save image to '" + name2 + "' success");
+    existed.set("alias", now_alias);
+    await existed.save();
     return { result: true, error: null };
   } catch (e) {
-    logger.error("[saveImg Error]: " + e?.message || String(e));
+    logger.error("[checkAlias Error]: " + e?.message || String(e));
     return { result: false, error: e?.message || String(e) };
   }
 }
-__name(saveImg, "saveImg");
-async function randomImgByTag(name2, savePath2) {
+__name(checkAlias, "checkAlias");
+async function getTagList() {
   try {
-    const Img = getImgsModel();
-    const existed = await getTag(name2);
-    if (!existed) {
-      throw new Error(`not found tag '${name2}'!`);
-    }
-    if (existed.status == 0) {
-      throw new Error(`not found tag '${name2}'!`);
-    }
-    let ImgList = await Img.findAll({
-      where: {
-        status: 0,
-        tag_id: existed.get("id")
-      }
+    const Tag = getTagsModel();
+    let resultList = await Tag.findAll({
+      where: { status: 0 }
     });
-    if (ImgList.length <= 0) {
-      throw new Error("Don't have image!");
-    }
-    const random = new import_koishi2.Random(() => Math.random());
-    let result = ImgList[random.int(0, ImgList.length)];
-    const filePath = result.get("img_url");
-    const fileContent = await import_fs2.promises.readFile(filePath, { encoding: "utf-8" });
-    return fileContent;
+    let tagList = [];
+    resultList.forEach(async (element) => {
+      let count = await getImgCountByTag(element.get("id"));
+      tagList.push({
+        tag: element.get("tags"),
+        alias: element.get("alias"),
+        count
+      });
+    });
+    return tagList;
   } catch (e) {
-    logger.error("[randomImgByTag Error]: " + e?.message || String(e));
+    logger.error("[getTagList Error]: " + e?.message || String(e));
     return null;
   }
 }
-__name(randomImgByTag, "randomImgByTag");
+__name(getTagList, "getTagList");
 
 // src/index.ts
 var name = "cocoyyy-console";
@@ -405,6 +466,21 @@ var menuList = [
     name: "get",
     description: "给标签添加图片",
     command: "get [标签]"
+  },
+  {
+    name: "bind",
+    description: "标签绑定别名",
+    command: "bind [标签] [别名]"
+  },
+  {
+    name: "unbind",
+    description: "标签取消别名",
+    command: "unbind [标签] [别名]"
+  },
+  {
+    name: "taglist",
+    description: "获取标签列表",
+    command: "taglist"
   }
 ];
 var logger = new import_koishi3.Logger(name);
@@ -418,28 +494,19 @@ async function apply(ctx, config) {
     await getImgsModel().sync();
   }
   savePath = resolveTagBaseDir(config?.save);
-  ctx.command("fullhelp", "帮助菜单").check(({ session }) => {
-    if (!connected) return;
-    if (!is_at_bot(session)) return;
-  }).action(async ({ session }) => {
+  ctx.command("fullhelp", "帮助菜单").action(async ({ session }) => {
     return `帮助菜单[所有命令都需要@bot]:
 	${menuList.map((item) => item.command + ": " + item.description).join("\n	")}`;
   });
-  ctx.command("maketag <参数>", "创建一个标签").check(({ session }) => {
-    if (!connected) return;
-    if (!is_at_bot(session)) return;
-  }).action(async ({ session }, ...args) => {
+  ctx.command("maketag <参数>", "创建一个标签").action(async ({ session }, ...args) => {
     const tag = args?.[0];
     if (!tag) return "请提供正确格式，如：@bot maketag [标签]";
-    let exec = await createorUpdateTag(tag, null, savePath);
+    let exec = await createorUpdateTag(tag, savePath);
     if (!exec.result)
       return `创建标签失败：${exec.error}`;
     return `已创建标签：${tag}`;
   });
-  ctx.command("add <参数>", "给标签添加图片").check(({ session }) => {
-    if (!connected) return;
-    if (!is_at_bot(session)) return;
-  }).action(async ({ session }, ...args) => {
+  ctx.command("add <参数>", "给标签添加图片").action(async ({ session }, ...args) => {
     const tag = args?.[0];
     const img = args?.[1];
     if (!tag || !img) return "请提供正确格式，如：@bot add [标签] [图片]";
@@ -448,17 +515,40 @@ async function apply(ctx, config) {
       return `保存图片失败：${exec.error}`;
     return "保存图片成功";
   });
-  ctx.command("get <参数>", "获取标签对应图片").check(({ session }) => {
-    if (!connected) return;
-    if (!is_at_bot(session)) return;
-  }).action(async ({ session }, ...args) => {
+  ctx.command("get <参数>", "获取标签对应图片").action(async ({ session }, ...args) => {
     const tag = args?.[0];
     if (!tag) return "请提供正确格式，如：@bot get [标签]";
-    let exec = await randomImgByTag(tag, savePath);
+    let exec = await randomImgByTag(tag);
     if (!exec)
       return `获取图片失败`;
     return exec;
   });
+  ctx.command("bind <参数>", "标签绑定别名").action(async ({ session }, ...args) => {
+    const tag = args?.[0];
+    const alia = args?.[1];
+    if (!tag || !alia) return "请提供正确格式，如：@bot bind [标签] [别名]";
+    let exec = await bindAlias(tag, alia);
+    if (!exec.result)
+      return `绑定别名失败：${exec.error}`;
+    return `绑定别名成功`;
+  });
+  ctx.command("unbind <参数>", "标签取消别名").action(async ({ session }, ...args) => {
+    const tag = args?.[0];
+    const alia = args?.[1];
+    if (!tag || !alia) return "请提供正确格式，如：@bot unbind [标签] [别名]";
+    let exec = await unbindAlias(tag, alia);
+    if (!exec.result)
+      return `取消绑定失败：${exec.error}`;
+    return `取消绑定成功`;
+  });
+  ctx.command("taglist", "获取标签列表").action(async ({ session }, ...args) => {
+    let exec = await getTagList();
+    if (exec == null)
+      return `查询失败`;
+    return `查询成功!
+
+      ${exec.map((item) => "标签:" + item.tag + "	黑历史数:" + item.count + "\n别名:" + item.alias).join("\n")}`;
+  });
 }
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node:

package/lib/services/img_service.d.ts

@@ -1,6 +1,7 @@
-declare function saveImg(name: string, img: string, savePath: string): Promise<{
+declare function saveImg(tag_name: string, img: string, savePath: string): Promise<{
     result: boolean;
     error: string | null;
 }>;
-declare function randomImgByTag(name: string, savePath: string): Promise<string | null>;
-export { saveImg, randomImgByTag };
+declare function randomImgByTag(tag_name: string): Promise<string | null>;
+declare function getImgCountByTag(tag_id: number): Promise<number>;
+export { saveImg, randomImgByTag, getImgCountByTag };

package/lib/services/tag_service.d.ts

@@ -1,7 +1,20 @@
 import { TagsModel } from '../models/tags';
-declare function createorUpdateTag(name: string, alias?: string | null, savePath?: string | null): Promise<{
+declare function createorUpdateTag(tag_name: string, savePath?: string | null): Promise<{
     result: boolean;
     error: string | null;
 }>;
-declare function getTag(name: string): Promise<TagsModel | null>;
-export { createorUpdateTag, getTag };
+declare function getTag(tag_name: string): Promise<TagsModel | null>;
+declare function bindAlias(tag_name: string, alias: string): Promise<{
+    result: boolean;
+    error: string | null;
+}>;
+declare function unbindAlias(tag_name: string, alias: string): Promise<{
+    result: boolean;
+    error: string | null;
+}>;
+declare function getTagList(): Promise<{
+    tag: string;
+    alias: string;
+    count: number;
+}[]>;
+export { createorUpdateTag, getTag, bindAlias, unbindAlias, getTagList };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cocoyyy-console",
   "description": "for self using, function console",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [