修复: Opquests验证任务报错(#35)

HCLonely · Nov 30, 2024 · 482af9e · 482af9e
1 parent 4469bdc
commit 482af9e
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 53 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -21,12 +21,9 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           prerelease: false
-          tag_name: v4.5.2
-          name: 4.5.2
-          body: |-
-            - 修复: 弹窗关闭后无法返回原标签页
-            - 修复: 关注/取关Steam限区游戏时动作错误
-            - 优化: Steam社区凭证更新逻辑
+          tag_name: v4.5.3
+          name: 4.5.3
+          body: '- 修复: Opquests验证任务报错(#35)'
           files: |-
             dist/auto-task-v4-for-giveawaysu.user.js
             dist/auto-task-v4.compatibility.user.js

diff --git a/dist/auto-task-v4-for-giveawaysu.all.user.js b/dist/auto-task-v4-for-giveawaysu.all.user.js
diff --git a/dist/auto-task-v4-for-giveawaysu.user.js b/dist/auto-task-v4-for-giveawaysu.user.js
diff --git a/dist/auto-task-v4.all.user.js b/dist/auto-task-v4.all.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name               auto-task-v4
 // @namespace          auto-task-v4
-// @version            4.5.2
+// @version            4.5.3
 // @description        自动完成 Freeanywhere，Giveawaysu，GiveeClub，Givekey，Gleam，Indiedb，keyhub，OpiumPulses，Opquests，SweepWidget 等网站的任务。
 // @description:en     Automatically complete the tasks of FreeAnyWhere, GiveawaySu, GiveeClub, Givekey, Gleam, Indiedb, keyhub, OpiumPulses, Opquests, SweepWidget websites.
 // @author             HCLonely
@@ -9032,12 +9032,15 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
           if (opquestsVerifyTasks.length > 0) {
             const taskId = opquestsVerifyTasks.pop();
             GM_setValue('opquestsVerifyTasks', opquestsVerifyTasks);
-            $(`#task_id[value="${taskId}"]`).parent().children('button[type="submit"]')[0].click();
-          } else {
-            if (GM_getValue('opquestsVerifyTasks')) {
-              GM_deleteValue('opquestsVerifyTasks');
+            const [ verifyBtn ] = $(`#task_id[value="${taskId}"]`).parent().children('button[type="submit"]');
+            if (verifyBtn) {
+              verifyBtn.click();
+              return;
             }
           }
+          if (GM_getValue('opquestsVerifyTasks')) {
+            GM_deleteValue('opquestsVerifyTasks');
+          }
         } catch (error) {
           throwError(error, 'Opquests.before');
         }

diff --git a/dist/auto-task-v4.compatibility.all.user.js b/dist/auto-task-v4.compatibility.all.user.js
diff --git a/dist/auto-task-v4.compatibility.user.js b/dist/auto-task-v4.compatibility.user.js
diff --git a/dist/auto-task-v4.user.js b/dist/auto-task-v4.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name               auto-task-v4
 // @namespace          auto-task-v4
-// @version            4.5.2
+// @version            4.5.3
 // @description        自动完成 Freeanywhere，Giveawaysu，GiveeClub，Givekey，Gleam，Indiedb，keyhub，OpiumPulses，Opquests，SweepWidget 等网站的任务。
 // @description:en     Automatically complete the tasks of FreeAnyWhere, GiveawaySu, GiveeClub, Givekey, Gleam, Indiedb, keyhub, OpiumPulses, Opquests, SweepWidget websites.
 // @author             HCLonely
@@ -9013,12 +9013,15 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
           if (opquestsVerifyTasks.length > 0) {
             const taskId = opquestsVerifyTasks.pop();
             GM_setValue('opquestsVerifyTasks', opquestsVerifyTasks);
-            $(`#task_id[value="${taskId}"]`).parent().children('button[type="submit"]')[0].click();
-          } else {
-            if (GM_getValue('opquestsVerifyTasks')) {
-              GM_deleteValue('opquestsVerifyTasks');
+            const [ verifyBtn ] = $(`#task_id[value="${taskId}"]`).parent().children('button[type="submit"]');
+            if (verifyBtn) {
+              verifyBtn.click();
+              return;
             }
           }
+          if (GM_getValue('opquestsVerifyTasks')) {
+            GM_deleteValue('opquestsVerifyTasks');
+          }
         } catch (error) {
           throwError(error, 'Opquests.before');
         }

diff --git a/doc/docs/logs/README.md b/doc/docs/logs/README.md
@@ -5,6 +5,12 @@ lang: zh-CN
 
 ## V4.5
 
+### V4.5.3
+
+[Release](https://github.com/HCLonely/auto-task-v4/releases/tag/v4.5.3)
+
+- 修复: Opquests验证任务报错([#35](https://github.com/HCLonely/auto-task-v4/issues/35))
+
 ### V4.5.2
 
 [Release](https://github.com/HCLonely/auto-task-v4/releases/tag/v4.5.2)

diff --git a/package.json b/package.json
@@ -1,10 +1,8 @@
 {
   "name": "auto-task-v4",
-  "version": "4.5.2",
+  "version": "4.5.3",
   "change": [
-    "修复: 弹窗关闭后无法返回原标签页",
-    "修复: 关注/取关Steam限区游戏时动作错误",
-    "优化: Steam社区凭证更新逻辑"
+    "修复: Opquests验证任务报错(#35)"
   ],
   "description": "赠Key站自动任务脚本",
   "engines": {

diff --git a/page/dist/auto-task-v4-for-giveawaysu.all.user.js b/page/dist/auto-task-v4-for-giveawaysu.all.user.js
diff --git a/page/dist/auto-task-v4-for-giveawaysu.user.js b/page/dist/auto-task-v4-for-giveawaysu.user.js
diff --git a/page/dist/auto-task-v4.all.user.js b/page/dist/auto-task-v4.all.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name               auto-task-v4
 // @namespace          auto-task-v4
-// @version            4.5.2
+// @version            4.5.3
 // @description        自动完成 Freeanywhere，Giveawaysu，GiveeClub，Givekey，Gleam，Indiedb，keyhub，OpiumPulses，Opquests，SweepWidget 等网站的任务。
 // @description:en     Automatically complete the tasks of FreeAnyWhere, GiveawaySu, GiveeClub, Givekey, Gleam, Indiedb, keyhub, OpiumPulses, Opquests, SweepWidget websites.
 // @author             HCLonely
@@ -9032,12 +9032,15 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
           if (opquestsVerifyTasks.length > 0) {
             const taskId = opquestsVerifyTasks.pop();
             GM_setValue('opquestsVerifyTasks', opquestsVerifyTasks);
-            $(`#task_id[value="${taskId}"]`).parent().children('button[type="submit"]')[0].click();
-          } else {
-            if (GM_getValue('opquestsVerifyTasks')) {
-              GM_deleteValue('opquestsVerifyTasks');
+            const [ verifyBtn ] = $(`#task_id[value="${taskId}"]`).parent().children('button[type="submit"]');
+            if (verifyBtn) {
+              verifyBtn.click();
+              return;
             }
           }
+          if (GM_getValue('opquestsVerifyTasks')) {
+            GM_deleteValue('opquestsVerifyTasks');
+          }
         } catch (error) {
           throwError(error, 'Opquests.before');
         }

diff --git a/page/dist/auto-task-v4.compatibility.all.user.js b/page/dist/auto-task-v4.compatibility.all.user.js
diff --git a/page/dist/auto-task-v4.compatibility.user.js b/page/dist/auto-task-v4.compatibility.user.js
diff --git a/page/dist/auto-task-v4.user.js b/page/dist/auto-task-v4.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name               auto-task-v4
 // @namespace          auto-task-v4
-// @version            4.5.2
+// @version            4.5.3
 // @description        自动完成 Freeanywhere，Giveawaysu，GiveeClub，Givekey，Gleam，Indiedb，keyhub，OpiumPulses，Opquests，SweepWidget 等网站的任务。
 // @description:en     Automatically complete the tasks of FreeAnyWhere, GiveawaySu, GiveeClub, Givekey, Gleam, Indiedb, keyhub, OpiumPulses, Opquests, SweepWidget websites.
 // @author             HCLonely
@@ -9013,12 +9013,15 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
           if (opquestsVerifyTasks.length > 0) {
             const taskId = opquestsVerifyTasks.pop();
             GM_setValue('opquestsVerifyTasks', opquestsVerifyTasks);
-            $(`#task_id[value="${taskId}"]`).parent().children('button[type="submit"]')[0].click();
-          } else {
-            if (GM_getValue('opquestsVerifyTasks')) {
-              GM_deleteValue('opquestsVerifyTasks');
+            const [ verifyBtn ] = $(`#task_id[value="${taskId}"]`).parent().children('button[type="submit"]');
+            if (verifyBtn) {
+              verifyBtn.click();
+              return;
             }
           }
+          if (GM_getValue('opquestsVerifyTasks')) {
+            GM_deleteValue('opquestsVerifyTasks');
+          }
         } catch (error) {
           throwError(error, 'Opquests.before');
         }

diff --git a/page/package.json b/page/package.json
@@ -1,10 +1,8 @@
 {
   "name": "auto-task-v4",
-  "version": "4.5.2",
+  "version": "4.5.3",
   "change": [
-    "修复: 弹窗关闭后无法返回原标签页",
-    "修复: 关注/取关Steam限区游戏时动作错误",
-    "优化: Steam社区凭证更新逻辑"
+    "修复: Opquests验证任务报错(#35)"
   ],
   "description": "赠Key站自动任务脚本",
   "engines": {

diff --git a/src/scripts/website/Opquests.ts b/src/scripts/website/Opquests.ts
@@ -125,20 +125,23 @@ class Opquests extends Website {
       if (opquestsVerifyTasks.length > 0) {
         const taskId = opquestsVerifyTasks.pop();
         GM_setValue('opquestsVerifyTasks', opquestsVerifyTasks);
-        $(`#task_id[value="${taskId}"]`).parent()
-          .children('button[type="submit"]')[0].click();
-      } else {
-        if (GM_getValue<Array<string>>('opquestsVerifyTasks')) {
-          GM_deleteValue('opquestsVerifyTasks');
-          /*
+        const [verifyBtn] = $(`#task_id[value="${taskId}"]`).parent()
+          .children('button[type="submit"]');
+        if (verifyBtn) {
+          verifyBtn.click();
+          return;
+        }
+      }
+      if (GM_getValue<Array<string>>('opquestsVerifyTasks')) {
+        GM_deleteValue('opquestsVerifyTasks');
+        /*
             echoLog({}).success(__('allTasksComplete'));
             if (await this.getKey()) {
               return;
             }
             window.location.reload();
             return;
             */
-        }
       }
     } catch (error) {
       throwError(error as Error, 'Opquests.before');