chore: update some plugins

kotorijs · Jul 29, 2024 · 85b58ea · 85b58ea
1 parent d2d5071
commit 85b58ea
Show file tree

Hide file tree

Showing 58 changed files with 1,034 additions and 903 deletions.
diff --git a/modules/access/package.json b/modules/access/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kotori-bot/kotori-plugin-access",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "access plugin",
   "main": "lib/index.js",
   "keywords": ["kotori", "chatbot", "kotori-plugin"],

diff --git a/modules/access/src/index.ts b/modules/access/src/index.ts
@@ -1,4 +1,4 @@
-import { UserAccess, type Context, MessageScope, EventsList } from 'kotori-bot'
+import { UserAccess, type Context, MessageScope } from 'kotori-bot'
 
 export const lang = [__dirname, '../locales']
 
@@ -10,54 +10,54 @@ export function main(ctx: Context) {
   const load = (bot: string) => ctx.file.load<Data>(`${bot}.json`, 'json', {})
   const save = (bot: string, data: Data) => ctx.file.save(`${bot}.json`, data)
 
-  ctx.on('before_parse', (d) => {
+  ctx.on('before_command', (d) => {
     if (d.session.type !== MessageScope.GROUP || !d.session.groupId) return
     const list = load(d.session.api.adapter.identity)
-    if (!(String(d.session.groupId) in list)) return
-    if (!list[String(d.session.groupId)].includes(String(d.session.userId))) return
+    if (!(d.session.groupId in list)) return
+    if (!list[d.session.groupId].includes(d.session.userId)) return
     if (d.session.type === MessageScope.GROUP) d.session.sender.role = 'admin'
   })
 
   ctx
     .command('access query - access.descr.access.query')
+    .scope(MessageScope.GROUP)
+    .access(UserAccess.ADMIN)
     .action((_, session) => {
-      const list = (load(session.api.adapter.identity)[String(session.groupId)] ?? [])
+      const list = (load(session.api.adapter.identity)[session.groupId] ?? [])
         .map((el) => session.format('access.msg.access.list', [el]))
         .join('')
-      return ['access.msg.access.query', [list]]
+      return session.format('access.msg.access.query', [list])
     })
-    .scope(MessageScope.GROUP)
-    .access(UserAccess.ADMIN)
 
   ctx
     .command('access add <userId> - access.descr.access.add')
+    .scope(MessageScope.GROUP)
+    .access(UserAccess.ADMIN)
     .action((data, session) => {
       const list = load(session.api.adapter.identity)
-      const index = String(session.groupId)
-      list[index] = list[index] ?? []
-      if (list[index].includes(data.args[0] as string)) {
-        return session.error('exists', { target: data.args[0] as string })
+      const { groupId } = session
+      list[groupId] = list[groupId] ?? []
+      if (list[groupId].includes(data.args[0] as string)) {
+        throw session.error('exists', { target: data.args[0] as string })
       }
-      list[index].push(data.args[0] as string)
+      list[groupId].push(data.args[0] as string)
       save(session.api.adapter.identity, list)
-      return ['access.msg.access.add', [data.args[0]]]
+      return session.format('access.msg.access.add', [data.args[0]])
     })
-    .scope(MessageScope.GROUP)
-    .access(UserAccess.ADMIN)
 
   ctx
     .command('access del <userId> - access.descr.access.del')
+    .scope(MessageScope.GROUP)
+    .access(UserAccess.ADMIN)
     .action((data, session) => {
       const list = load(session.api.adapter.identity)
-      const index = String(session.groupId)
-      list[index] = list[index] ?? []
-      if (!list[index].includes(data.args[0] as string)) {
-        return session.error('no_exists', { target: data.args[0] as string })
+      const { groupId } = session
+      list[groupId] = list[groupId] ?? []
+      if (!list[groupId].includes(data.args[0] as string)) {
+        throw session.error('no_exists', { target: data.args[0] as string })
       }
-      list[index] = list[index].filter((el) => el !== data.args[0])
+      list[groupId] = list[groupId].filter((el) => el !== data.args[0])
       save(session.api.adapter.identity, list)
-      return ['access.msg.access.del', [data.args[0]]]
+      return session.format('access.msg.access.del', [data.args[0]])
     })
-    .scope(MessageScope.GROUP)
-    .access(UserAccess.ADMIN)
 }
diff --git a/modules/alias/package.json b/modules/alias/package.json
@@ -1,33 +1,19 @@
 {
   "name": "@kotori-bot/kotori-plugin-alias",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "alias plugin",
   "main": "lib/index.js",
-  "keywords": [
-    "kotori",
-    "chatbot",
-    "kotori-plugin"
-  ],
+  "keywords": ["kotori", "chatbot", "kotori-plugin"],
   "license": "GPL-3.0",
-  "files": [
-    "lib",
-    "locales",
-    "LICENSE",
-    "README.md"
-  ],
+  "files": ["lib", "locales", "LICENSE", "README.md"],
   "author": "Himeno <[email protected]>",
   "peerDependencies": {
     "kotori-bot": "workspace:^"
   },
   "kotori": {
     "enforce": "pre",
     "meta": {
-      "language": [
-        "en_US",
-        "ja_JP",
-        "zh_TW",
-        "zh_CN"
-      ]
+      "language": ["en_US", "ja_JP", "zh_TW", "zh_CN"]
     }
   }
 }
diff --git a/modules/alias/src/index.ts b/modules/alias/src/index.ts
@@ -3,53 +3,52 @@
  * @Blog: https://hotaru.icu
  * @Date: 2023-07-11 14:18:27
  * @LastEditors: Hotaru [email protected]
- * @LastEditTime: 2024-06-07 21:19:44
+ * @LastEditTime: 2024-07-29 18:03:20
  */
-import { Context, Symbols } from 'kotori-bot';
+import { type Context, Symbols } from 'kotori-bot'
 
-export const lang = [__dirname, '../locales'];
+export const lang = [__dirname, '../locales']
 
-export const inject = ['file'];
+export const inject = ['file']
 
-type Data = Record<string, string>;
+type Data = Record<string, string>
 
 export function main(ctx: Context) {
-  const load = (bot: string) => ctx.file.load<Data>(`${bot}.json`, 'json', {});
-  const save = (bot: string, data: Data) => ctx.file.save(`${bot}.json`, data);
+  const load = (bot: string) => ctx.file.load<Data>(`${bot}.json`, 'json', {})
+  const save = (bot: string, data: Data) => ctx.file.save(`${bot}.json`, data)
 
   ctx.midware((next, session) => {
-    const s = session;
-    const list = load(s.api.adapter.identity);
-    if (list[s.message] || s.message.trim() in list) s.message = list[s.message];
-    next();
-  }, 90);
+    const list = load(session.api.adapter.identity)
+    const msg = session.message.toString()
+    if (list[msg] || session.message.trim() in list) session.message = list[msg]
+    next()
+  }, 90)
 
   ctx.command('alias query - alias.descr.alias.query').action((_, session) => {
     const list = Object.entries(load(session.api.adapter.identity) ?? {})
       .map((el) => session.format('alias.msg.alias.list', [...el]))
-      .join('');
-    return ['alias.msg.alias.query', [list]];
-  });
+      .join('')
+    return session.format('alias.msg.alias.query', [list])
+  })
 
   ctx.command('alias add <alias> <...command> - alias.descr.alias.add').action((data, session) => {
-    const list = load(session.api.adapter.identity);
-    if ((data.args[0] as string) in list) return 'alias.msg.alias.fail';
-    let useful = false;
-    ctx[Symbols.command].forEach((command) => {
-      if (useful) return;
-      if (command.meta.root === data.args[1] || command.meta.alias.includes(data.args[1] as string)) useful = true;
-    });
-    if (!useful) return 'alias.msg.alias.fail.2';
-    list[data.args[0] as string] = data.args.slice(1).join(' ');
-    save(session.api.adapter.identity, list);
-    return ['alias.msg.alias.add', [data.args[0]]];
-  });
+    const list = load(session.api.adapter.identity)
+    if ((data.args[0] as string) in list) return 'alias.msg.alias.fail'
+
+    const useful = Array.from(ctx[Symbols.command].values()).some(
+      (command) => command.meta.root === data.args[1] || command.meta.alias.includes(data.args[1] as string)
+    )
+    if (!useful) return 'alias.msg.alias.fail.2'
+    list[data.args[0] as string] = data.args.slice(1).join(' ')
+    save(session.api.adapter.identity, list)
+    return session.format('alias.msg.alias.add', [data.args[0]])
+  })
 
   ctx.command('alias del <alias> - alias.descr.alias.del').action((data, session) => {
-    const list = load(session.api.adapter.identity);
-    if (!((data.args[0] as string) in list)) return session.error('no_exists', { target: data.args[0] as string });
-    delete list[data.args[0] as string];
-    save(session.api.adapter.identity, list);
-    return ['alias.msg.alias.del', [data.args[0]]];
-  });
+    const list = load(session.api.adapter.identity)
+    if (!((data.args[0] as string) in list)) throw session.error('no_exists', { target: data.args[0] as string })
+    delete list[data.args[0] as string]
+    save(session.api.adapter.identity, list)
+    return session.format('alias.msg.alias.del', [data.args[0]])
+  })
 }
diff --git a/modules/bangumi/locales/en_US.json b/modules/bangumi/locales/en_US.json
@@ -1,10 +1,10 @@
 {
-    "bangumi.descr.bgm": "Search anime/games schedules",
-    "bangumi.descr.bgmc": "Get today's schedules",
-    "bangumi.msg.bgm": "Original name: {0}\nChinese name: {1}\nIntroduction: {2}\nTags: {3}\nDetails: {4}\n{5}",
-    "bangumi.msg.bgm.list": "{0}.{1}{2}\n",
-    "bangumi.msg.bgm.fail": "No relevant items found: {0}",
-    "bangumi.option.bangumi.order": "Order number",
-    "bangumi.msg.bgmc": "Date: {0}~{1}",
-    "bangumi.msg.bgmc.list": "\nOriginal name: {0}\nChinese name: {1}\nBroadcast time: {2}\n{3}"
-}
+  "bangumi.descr.bgm": "Search anime/games schedules",
+  "bangumi.descr.bgmc": "Get today's schedules",
+  "bangumi.msg.bgm": "Original name: {0}\nChinese name: {1}\nIntroduction: {2}\nTags: {3}\nDetails: {4}",
+  "bangumi.msg.bgm.list": "{0}.{1}{2}\n",
+  "bangumi.msg.bgm.fail": "No relevant items found: {0}",
+  "bangumi.option.bangumi.order": "Order number",
+  "bangumi.msg.bgmc": "Date: {0}~{1}",
+  "bangumi.msg.bgmc.list": "\nOriginal name: {0}\nChinese name: {1}\nBroadcast time: {2}\n{3}"
+}
diff --git a/modules/bangumi/locales/ja_JP.json b/modules/bangumi/locales/ja_JP.json
@@ -1,10 +1,10 @@
 {
-    "bangumi.descr.bgm": "アニメ/ゲームの番組検索",
-    "bangumi.descr.bgmc": "今日放送の番組を取得",
-    "bangumi.msg.bgm": "原題:{0}\n中国語名:{1}\n紹介:{2}\nタグ:{3}\n詳細:{4}\n{5}",
-    "bangumi.msg.bgm.list": "{0}.{1}{2}\n",
-    "bangumi.option.bangumi.order": "番号",
-    "bangumi.msg.bgm.fail": "関連項目が見つかりませんでした:{0}",
-    "bangumi.msg.bgmc": "日付:{0}~{1}",
-    "bangumi.msg.bgmc.list": "\n原題:{0}\n中国語名:{1}\n放送開始時間:{2}\n{3}"
-}
+  "bangumi.descr.bgm": "アニメ/ゲームの番組検索",
+  "bangumi.descr.bgmc": "今日放送の番組を取得",
+  "bangumi.msg.bgm": "原題:{0}\n中国語名:{1}\n紹介:{2}\nタグ:{3}\n詳細:{4}",
+  "bangumi.msg.bgm.list": "{0}.{1}{2}\n",
+  "bangumi.option.bangumi.order": "番号",
+  "bangumi.msg.bgm.fail": "関連項目が見つかりませんでした:{0}",
+  "bangumi.msg.bgmc": "日付:{0}~{1}",
+  "bangumi.msg.bgmc.list": "\n原題:{0}\n中国語名:{1}\n放送開始時間:{2}\n{3}"
+}
diff --git a/modules/bangumi/locales/zh_CN.json b/modules/bangumi/locales/zh_CN.json
@@ -1,10 +1,10 @@
 {
   "bangumi.descr.bgm": "番组计划搜索游戏/动漫",
   "bangumi.descr.bgmc": "获取番组计划今日放送",
-  "bangumi.msg.bgm": "原名：{0}\n中文名：{1}\n介绍：{2}\n标签：{3}\n详情：{4}\n{5}",
+  "bangumi.msg.bgm": "原名：{0}\n中文名：{1}\n介绍：{2}\n标签：{3}\n详情：{4}",
   "bangumi.msg.bgm.list": "{0}.{1}{2}\n",
   "bangumi.option.bangumi.order": "序号",
   "bangumi.msg.bgm.fail": "未找到相关条目：{0}",
   "bangumi.msg.bgmc": "日期：{0}~{1}",
   "bangumi.msg.bgmc.list": "\n原名：{0}\n中文名：{1}\n开播时间：{2}\n{3}"
-}
+}
diff --git a/modules/bangumi/locales/zh_TW.json b/modules/bangumi/locales/zh_TW.json
@@ -1,10 +1,10 @@
 {
   "bangumi.descr.bgm": "番組計劃搜索遊戲/動漫",
   "bangumi.descr.bgmc": "獲取番組計劃今日放送",
-  "bangumi.msg.bgm": "原名：{0}\n中文名：{1}\n介紹：{2}\n標簽：{3}\n詳情：{4}\n{5}",
+  "bangumi.msg.bgm": "原名：{0}\n中文名：{1}\n介紹：{2}\n標簽：{3}\n詳情：{4}",
   "bangumi.msg.bgm.list": "{0}.{1}{2}\n",
   "bangumi.msg.bgm.fail": "未找到相關條目：{0}",
   "bangumi.option.bangumi.order": "番号",
   "bangumi.msg.bgmc": "日期：{0}~{1}",
   "bangumi.msg.bgmc.list": "\n原名：{0}\n中文名：{1}\n開播時間：{2}\n{3}"
-}
+}
diff --git a/modules/bangumi/package.json b/modules/bangumi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kotori-plugin-bangumi",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "bangumi plugin",
   "main": "lib/index.js",
   "keywords": ["kotori", "chatbot", "kotori-plugin"],