修复:opquests任务无法验证(#17)

.github/workflows/Release.yml

@@ -21,11 +21,9 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           prerelease: false
-          tag_name: v4.4.2
-          name: 4.4.2
-          body: |-
-            - 修复:Tampermonkey更新导致Steam凭证刷新失败(#16)
-            - 修复:推特转推功能失效
+          tag_name: v4.4.3
+          name: 4.4.3
+          body: '- 修复:opquests任务无法验证(#17)'
           files: |-
             dist/auto-task-v4-for-giveawaysu.user.js
             dist/auto-task-v4.compatibility.user.js

doc/docs/logs/README.md

@@ -5,6 +5,12 @@ lang: zh-CN
 
 ## V4.4
 
+### V4.4.3
+
+[Release](https://github.com/HCLonely/auto-task-v4/releases/tag/v4.4.3)
+
+- 修复:opquests任务无法验证([#17](https://github.com/HCLonely/auto-task-v4/issues/17))
+
 ### V4.4.2
 
 [Release](https://github.com/HCLonely/auto-task-v4/releases/tag/v4.4.2)

package.json

@@ -1,9 +1,8 @@
 {
   "name": "auto-task-v4",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "change": [
-    "修复:Tampermonkey更新导致Steam凭证刷新失败(#16)",
-    "修复:推特转推功能失效"
+    "修复:opquests任务无法验证(#17)"
   ],
   "description": "赠Key站自动任务脚本",
   "main": "package.json",

page/package.json

@@ -1,9 +1,8 @@
 {
   "name": "auto-task-v4",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "change": [
-    "修复:Tampermonkey更新导致Steam凭证刷新失败(#16)",
-    "修复:推特转推功能失效"
+    "修复:opquests任务无法验证(#17)"
   ],
   "description": "赠Key站自动任务脚本",
   "main": "package.json",

src/scripts/website/Opquests.ts

@@ -14,7 +14,7 @@ import Website from './Website';
 import throwError from '../tools/throwError';
 import echoLog from '../echoLog';
 import __ from '../tools/i18n';
-import { delay } from '../tools/tools';
+// import { delay } from '../tools/tools';
 import { globalOptions } from '../globalOptions';
 import httpRequest from '../tools/httpRequest';
 
@@ -32,12 +32,32 @@ class Opquests extends Website {
   undoneTasks: oqSocialTasks = { ...defaultTasks };
   buttons: Array<string> = [
     'doTask',
+    'verifyTask',
     'getKey'
   ];
 
   static test(): boolean {
     return window.location.host === 'opquests.com';
   }
+  async before(): Promise<void> {
+    const opquestsVerifyTasks = GM_getValue<Array<string>>('opquestsVerifyTasks') || [];
+    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');
+        echoLog({}).success(__('allTasksComplete'));
+        if (await this.getKey()) {
+          return;
+        }
+        window.location.reload();
+        return;
+      }
+    }
+  }
   async after(): Promise<void> {
     try {
       if (!this.#checkLogin()) {
@@ -115,27 +135,15 @@ class Opquests extends Website {
       if (!this.initialized) {
         this.init();
       }
-      const tasks: Array<qpqTaskInfo> = $.makeArray($('div.w-full').find('.items-center')
-        .has('button.submit-loader')).map((ele) => ({
-        token: $(ele).find('input[name="_token"]')
-          .val() as string,
-        taskId: $(ele).find('input[name="task_id"]')
-          .val() as string,
-        title: $(ele).find('span.text-sm')
-          .text()
-          .trim() as string
-      }));
+      const tasks: Array<string> = $.makeArray($('div.w-full').find('.items-center')
+        .has('button.submit-loader')).map((ele) => $(ele).find('input[name="task_id"]')
+          .val() as string);
       await this.#confirm();
-      for (const task of tasks) {
-        await this.#verify(task);
-        await delay(1000);
-      }
-      echoLog({}).success(__('allTasksComplete'));
-      if (await this.getKey()) {
-        return true;
-      }
-      window.location.reload();
-      return false;
+      const taskId = tasks.pop();
+      GM_setValue('opquestsVerifyTasks', tasks);
+      $(`#task_id[value="${taskId}"]`).parent()
+        .children('button[type="submit"]')[0].click();
+      return true;
     } catch (error) {
       throwError(error as Error, 'Opquests.verifyTask');
       return false;
@@ -169,6 +177,7 @@ class Opquests extends Website {
       return false;
     }
   }
+  /*
   async #verify(task: qpqTaskInfo): Promise<boolean> {
     try {
       const logStatus = echoLog({ html: `<li>${__('verifyingTask')}${task.title.trim()}...<font></font></li>` });
@@ -209,6 +218,7 @@ class Opquests extends Website {
       return false;
     }
   }
+  */
   async getKey(isButton?: boolean): Promise<boolean> {
     try {
       const logStatus = echoLog({ text: __('gettingKey') });