koishi-plugin-oni-wiki-qq 0.0.7 → 0.0.9

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 import { Context, Schema } from "koishi";
 export declare const name = "oni-wiki-qq";
 export declare const inject: string[];
-export declare const usage = "\n  - 0.0.7 \u5BF9\u7F51\u5740\u8FDB\u884C\u7F16\u7801\u4EE5\u786E\u4FDD\u4E0D\u4F1A\u51FA\u73B0\u5947\u5947\u602A\u602A\u7684\u95EE\u9898\n  - 0.0.6 \u7A7A\u7F51\u5740\u9519\u8BEF\u5904\u7406\n  - 0.0.5 \u592A\u4E45\u6CA1\u5199\u5FD8\u8BB0build\u4E86...\n  - 0.0.4 \u715E\u7B14\u817E\u8BAF\u4E0D\u7ED9\u53D1md\u4E86\u8279\n  - 0.0.3 \u5C06\u94FE\u63A5\u6539\u4E3Amd\u53D1\u9001\u4EE5\u7ED5\u8FC7\u6C9F\u817E\u8BAF\u7684\u94FE\u63A5\u62E6\u622A\n  - 0.0.2 \u57FA\u672C\u529F\u80FD\u5B8C\u6210\n  - 0.0.1 \u521D\u59CB\u5316\uFF0C\u660E\u5929\u518D\u6162\u6162\u5199\u4E86\uFF08\n";
+export declare const usage = "\n  - 0.0.9 \u5C1D\u8BD5\u79FB\u9664\u5BFC\u822A\u6846,\u66F4\u65B0koishi\u4F9D\u8D56\n  - 0.0.8 \u5BF9\u9009\u62E9\u7684\u5176\u4ED6\u9879\u8FDB\u884C\u5F31\u667A\u4E00\u6837\u7684\u5904\u7406,\u514D\u5F97 errlog \u90FD\u5FEB 13M \u4E86\n  - 0.0.7 \u5BF9\u7F51\u5740\u8FDB\u884C\u7F16\u7801\u4EE5\u786E\u4FDD\u4E0D\u4F1A\u51FA\u73B0\u5947\u5947\u602A\u602A\u7684\u95EE\u9898\n  - 0.0.6 \u7A7A\u7F51\u5740\u9519\u8BEF\u5904\u7406\n  - 0.0.5 \u592A\u4E45\u6CA1\u5199\u5FD8\u8BB0build\u4E86...\n  - 0.0.4 \u715E\u7B14\u817E\u8BAF\u4E0D\u7ED9\u53D1md\u4E86\u8279\n  - 0.0.3 \u5C06\u94FE\u63A5\u6539\u4E3Amd\u53D1\u9001\u4EE5\u7ED5\u8FC7\u6C9F\u817E\u8BAF\u7684\u94FE\u63A5\u62E6\u622A\n  - 0.0.2 \u57FA\u672C\u529F\u80FD\u5B8C\u6210\n  - 0.0.1 \u521D\u59CB\u5316\uFF0C\u660E\u5929\u518D\u6162\u6162\u5199\u4E86\uFF08\n";
 export interface Config {
     api: string;
     imgPath: string;

package/lib/index.js

@@ -43,6 +43,8 @@ var import_node_os = __toESM(require("node:os"));
 var name = "oni-wiki-qq";
 var inject = ["puppeteer"];
 var usage = `
+  - 0.0.9 尝试移除导航框,更新koishi依赖
+  - 0.0.8 对选择的其他项进行弱智一样的处理,免得 errlog 都快 13M 了
   - 0.0.7 对网址进行编码以确保不会出现奇奇怪怪的问题
   - 0.0.6 空网址错误处理
   - 0.0.5 太久没写忘记build了...
@@ -59,7 +61,6 @@ var Config = import_koishi.Schema.object({
 function apply(ctx, config) {
   const logger = ctx.logger;
   ctx.command("x <itemName>", "查询缺氧中文wiki").alias("/查wiki").option("delete", "-d 删除本地缓存", { authority: 2 }).action(async ({ session, options }, itemName = "电解器") => {
-    logger.info(session.guildId);
     const filePath = config.imgPath + itemName.replace(/\//g, "-").replace(/:/g, "-").replace(/'/g, "-") + ".jpeg";
     const urlPath = config.urlPath + itemName.replace(/\//g, "-").replace(/:/g, "-").replace(/'/g, "-") + ".jpeg";
     if (options.delete) {
@@ -75,7 +76,7 @@ function apply(ctx, config) {
       return (0, import_koishi.h)("img", { src: `${encodeURI(urlPath)}` });
     }
     session.send(`您查询的「${itemName}」进行中,请稍等...`);
-    await (0, import_koishi.sleep)(2e3);
+    await (0, import_koishi.sleep)(500);
     const res = await getWiki(config.api);
     if (res.length == 0) {
       return `在Wiki里没找到或API查询超时或....`;
@@ -101,14 +102,29 @@ function apply(ctx, config) {
       const awlist = [1, 2, 3];
       const awser = +(await session.prompt(50 * 1e3))?.replace(/\s+/g, "")?.slice(-1) || NaN;
       if (awlist.includes(awser)) {
-        let res2 = await screenShot(itemUrl[awser - 1]);
-        if (res2) {
-          return (0, import_koishi.h)("img", { src: `${encodeURI(urlPath)}` });
-        } else {
-          return `截图发生错误.请稍后重试..`;
+        switch (awlist.includes(awser)) {
+          case (one == "萌新的骨头汤" && awser == 1):
+            return (0, import_koishi.h)("img", {
+              src: `${encodeURI(config.urlPath + one)}.jpeg`
+            });
+          case (two == "" && awser == 2):
+            return (0, import_koishi.h)("img", {
+              src: `${encodeURI(config.urlPath + two)}.jpeg`
+            });
+          case (three == "" && awser == 3):
+            return (0, import_koishi.h)("img", {
+              src: `${encodeURI(config.urlPath + three)}.jpeg`
+            });
+          default:
+            let res2 = await screenShot(itemUrl[awser - 1]);
+            if (res2) {
+              return (0, import_koishi.h)("img", { src: `${encodeURI(urlPath)}` });
+            } else {
+              return `截图发生错误.请稍后重试..`;
+            }
         }
       } else if (Number.isNaN(awser)) {
-        return `您输入的选项有误，已完结本轮查询。如需，如有需要，请重新发起查询.`;
+        return `您输入的选项有误，已完结本轮查询，如有需要，请重新发起查询.`;
       }
     }
     async function getWiki(api) {
@@ -138,10 +154,15 @@ function apply(ctx, config) {
       await page.goto(url, {
         timeout: 0
       });
-      await (0, import_koishi.sleep)(3e3);
+      await (0, import_koishi.sleep)(2e3);
       await page.addStyleTag({
         content: "#mw-content-text{padding: 40px}"
       });
+      try {
+        await page.$eval(".pi-navbox", (el) => el.remove());
+      } catch (error) {
+        logger.error(error);
+      }
       const selector = await page.$("#mw-content-text");
       return await selector.screenshot({
         type: "jpeg",
@@ -149,7 +170,7 @@ function apply(ctx, config) {
         path: filePath
       }).then(() => {
         return true;
-      }).catch((err) => {
+      }).catch(async (err) => {
         logger.error(err);
         return false;
       }).finally(async () => await page.close());

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-oni-wiki-qq",
   "description": "缺氧wiki查询",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -15,6 +15,6 @@
     "plugin"
   ],
   "peerDependencies": {
-    "koishi": "^4.17.9"
+    "koishi": "^4.17.10"
   }
 }