fix：修复面板图问题

修复删除所有面板图后无法使用默认面板图，以及能够上传不存在角色面板图的问题
erzaozi · Nov 3, 2024 · 61d4008 · 61d4008
1 parent 9b2e1b7
commit 61d4008
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/apps/Character.js b/apps/Character.js
@@ -113,8 +113,12 @@ export class Character extends plugin {
                 return;
             }
 
-            const rolePicUrl = fs.existsSync(rolePicDir)
-                ? `file://${rolePicDir}/${fs.readdirSync(rolePicDir).filter(file => path.extname(file).toLowerCase() === '.webp')[Math.floor(Math.random() * fs.readdirSync(rolePicDir).length)]}`
+            const webpFiles = fs.existsSync(rolePicDir)
+                ? fs.readdirSync(rolePicDir).filter(file => path.extname(file).toLowerCase() === '.webp')
+                : [];
+
+            const rolePicUrl = webpFiles.length > 0
+                ? `file://${rolePicDir}/${webpFiles[Math.floor(Math.random() * webpFiles.length)]}`
                 : roleDetail.data.role.rolePicUrl;
 
             imgList.push(rolePicUrl);

diff --git a/apps/imgUpload.js b/apps/imgUpload.js
@@ -50,10 +50,9 @@ export class ImgUploader extends plugin {
         const wiki = new Wiki();
         character = await wiki.getAlias(character);
 
-        const wikiData = await wiki.getPage('1105');
-        if (!wikiData.status) { return e.reply('获取Wiki列表失败, 请稍后重试.'); }
-        else {
-            if (!wikiData?.results?.records?.some(item => item.name === character)) { return e.reply(`${char} 是谁啊... 俺找遍了索拉里斯都没找到这人~`); }
+        const entryData = await wiki.getEntry(character, '1105');
+        if (!entryData.status) {
+            return await e.reply(`当前没有共鸣者 ${character}`);
         }
 
         const images = [...(e.img || [])];
@@ -173,14 +172,7 @@ export class ImgUploader extends plugin {
             return true;
         }
 
-        const wiki = new Wiki();
-        character = await wiki.getAlias(character);
-
-        const wikiData = await wiki.getPage('1105');
-        if (!wikiData.status) { return e.reply('获取Wiki列表失败, 请稍后重试.'); }
-        else {
-            if (!wikiData?.results?.records?.some(item => item.name === character)) { return e.reply(`${char} 是谁啊... 俺找遍了索拉里斯都没找到这人~`); }
-        }
+        character = await new Wiki().getAlias(character);
 
         const imageDir = path.join(pluginResources, 'rolePic', character);
         const images = fs.existsSync(imageDir) && fs.readdirSync(imageDir);
@@ -216,14 +208,7 @@ export class ImgUploader extends plugin {
         let [, character, index] = e.msg.match(this.rule[3].reg);
         if (!character) return e.reply('请输入正确的命令格式，如：[~删除今汐面板图1]');
 
-        const wiki = new Wiki();
-        character = await wiki.getAlias(character);
-
-        const wikiData = await wiki.getPage('1105');
-        if (!wikiData.status) { return e.reply('获取Wiki列表失败, 请稍后重试.'); }
-        else {
-            if (!wikiData?.results?.records?.some(item => item.name === character)) { return e.reply(`${char} 是谁啊... 俺找遍了索拉里斯都没找到这人~`); }
-        }
+        character = await new Wiki().getAlias(character);
 
         const imageDir = path.join(pluginResources, 'rolePic', character);
         const imageList = fs.existsSync(imageDir) ? fs.readdirSync(imageDir) : [];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "waves-plugin",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "基于 Yunzai 的鸣潮游戏数据查询插件",
   "main": "index.js",
   "scripts": {