1. 剩余Key检测优化;

2. GiveeClub愿望单任务识别优化
HCLonely · Jan 9, 2022 · afe87f7 · afe87f7 · vercel · Jan 9, 2022
1 parent 418ebe2
commit afe87f7
Show file tree

Hide file tree

Showing 20 changed files with 997 additions and 165 deletions.
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.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
diff --git a/package.json b/package.json
@@ -1,10 +1,9 @@
 {
-  "name": "auto-task-new",
-  "version": "4.1.8-Beta",
+  "name": "auto-task-v4",
+  "version": "4.1.9-Beta",
   "change": [
-    "油管、推特验证机制优化",
-    "白名单、任务历史、数据同步功能移动到设置页面",
-    "其他优化"
+    "剩余Key检测优化",
+    "GiveeClub愿望单任务识别优化"
   ],
   "description": "赠Key站自动任务脚本",
   "main": "package.json",

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.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
diff --git a/page/package.json b/page/package.json
@@ -1,10 +1,9 @@
 {
-  "name": "auto-task-new",
-  "version": "4.1.8-Beta",
+  "name": "auto-task-v4",
+  "version": "4.1.9-Beta",
   "change": [
-    "油管、推特验证机制优化",
-    "白名单、任务历史、数据同步功能移动到设置页面",
-    "其他优化"
+    "剩余Key检测优化",
+    "GiveeClub愿望单任务识别优化"
   ],
   "description": "赠Key站自动任务脚本",
   "main": "package.json",

diff --git a/src/header.js b/src/header.js
@@ -73,6 +73,11 @@
 // @connect            google.com
 // @connect            www.vloot.io
 // @connect            givee.club
+// @connect            gleam.io
+// @connect            www.indiedb.com
+// @connect            key-hub.eu
+// @connect            opquests.com
+// @connect            itch.io
 // @connect            auto-task-v4.hclonely.com
 // @connect            *
 // @require            https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js

diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,7 @@
 /*
  * @Author       : HCLonely
  * @Date         : 2021-10-26 15:44:54
- * @LastEditTime : 2022-01-08 17:19:28
+ * @LastEditTime : 2022-01-09 13:20:03
  * @LastEditors  : HCLonely
  * @FilePath     : /auto-task-new/src/index.ts
  * @Description  :
@@ -11,12 +11,12 @@ import Swal from 'sweetalert2';
 import * as Cookies from 'js-cookie';
 import style from './style/auto-task.scss';
 import { Websites, WebsiteType } from './scripts/website/index';
-import whiteListOptions from './scripts/social/whiteList';
+// import whiteListOptions from './scripts/social/whiteList';
 import websiteOptions from './scripts/website/options';
 import __ from './scripts/tools/i18n';
 import { globalOptions, changeGlobalOptions } from './scripts/globalOptions';
 import keyboardJS from 'keyboardjs';
-import syncOptions from './scripts/dataSync';
+// import syncOptions from './scripts/dataSync';
 import updateChecker from './scripts/updateChecker';
 import echoLog from './scripts/echoLog';
 

diff --git a/src/locales/en-US.js b/src/locales/en-US.js
@@ -1,7 +1,7 @@
 /*
  * @Author       : HCLonely
  * @Date         : 2021-12-30 17:08:27
- * @LastEditTime : 2022-01-08 17:03:59
+ * @LastEditTime : 2022-01-09 13:19:55
  * @LastEditors  : HCLonely
  * @FilePath     : /auto-task-new/src/locales/en-US.js
  * @Description  : i18n英文
@@ -164,6 +164,11 @@ const data = {
   copySuccess: 'The error message has been copied to the clipboard. Do you want to go to the Keylol forum to give feedback?',
   copyFailed: 'Please copy the error information below and report back to the Keylol forum!',
   updateText: 'Updates in version %0:',
+  Active: 'Active',
+  Ended: 'Ended',
+  Banned: 'Banned',
+  Paused: 'Paused',
+  notStart: 'notStart',
 
   // Steam
   groups: 'Group',

diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js
@@ -1,7 +1,7 @@
 /*
  * @Author       : HCLonely
  * @Date         : 2021-11-20 19:38:41
- * @LastEditTime : 2022-01-07 10:03:36
+ * @LastEditTime : 2022-01-09 13:19:36
  * @LastEditors  : HCLonely
  * @FilePath     : /auto-task-new/src/locales/zh-CN.js
  * @Description  : i18n中文
@@ -148,6 +148,11 @@ const data = {
   copySuccess: '错误信息已复制到剪切板，是否前往其乐论坛反馈？',
   copyFailed: '请复制下方错误信息后前往Keylol论坛反馈！',
   updateText: '%0 版本更新内容：',
+  Active: '进行中',
+  Ended: '已结束',
+  Banned: '已封禁',
+  Paused: '已暂停',
+  notStart: '未开始',
 
   // Steam
   groups: '组',

diff --git a/src/scripts/website/Giveawaysu.ts b/src/scripts/website/Giveawaysu.ts
@@ -1,7 +1,7 @@
 /*
  * @Author       : HCLonely
  * @Date         : 2021-11-08 10:37:13
- * @LastEditTime : 2022-01-07 10:04:58
+ * @LastEditTime : 2022-01-09 10:37:20
  * @LastEditors  : HCLonely
  * @FilePath     : /auto-task-new/src/scripts/website/Giveawaysu.ts
  * @Description  : https://giveaway.su/
@@ -197,7 +197,7 @@ class GiveawaySu extends Website {
   async #checkLeftKey(): Promise<boolean> {
     try {
       if (!globalOptions.other.checkLeftKey) return true;
-      if ($('.giveaway-ended').length > 0) {
+      if ($('.giveaway-ended').length > 0 && $('.giveaway-key').length === 0) {
         await Swal.fire({
           icon: 'warning',
           title: __('notice'),

diff --git a/src/scripts/website/GiveeClub.ts b/src/scripts/website/GiveeClub.ts
@@ -1,7 +1,7 @@
 /*
  * @Author       : HCLonely
  * @Date         : 2021-11-14 11:46:52
- * @LastEditTime : 2022-01-02 12:44:47
+ * @LastEditTime : 2022-01-09 10:43:12
  * @LastEditors  : HCLonely
  * @FilePath     : /auto-task-new/src/scripts/website/GiveeClub.ts
  * @Description  : https://givee.club/
@@ -86,6 +86,8 @@ class GiveeClub extends GiveawaySu {
               this.undoneTasks.steam.announcementLinks.push(taskLink);
             } else if (taskIcon.includes('plus') && /^https?:\/\/store\.steampowered\.com\/app\//.test(taskLink)) { // ok
               this.undoneTasks.steam.wishlistLinks.push(taskLink);
+            } else if (taskIcon.includes('plus') && taskDes.attr('data-steam-wishlist-appid')) { // ok
+              this.undoneTasks.steam.wishlistLinks.push(`https://store.steampowered.com/app/${taskDes.attr('data-steam-wishlist-appid')}`);
             } else if (/^https?:\/\/store\.steampowered\.com\/curator\//.test(taskLink)) { // ok
               this.undoneTasks.steam.curatorLinks.push(taskLink);
             } else if (taskIcon.includes('steam') && /follow|subscribe/gim.test(taskName)) { // 未识别
@@ -162,7 +164,7 @@ class GiveeClub extends GiveawaySu {
   async #checkLeftKey(): Promise<boolean> {
     try {
       if (!globalOptions.other.checkLeftKey) return true;
-      if ($('.event-ended').length > 0) {
+      if ($('.event-ended').length > 0 && $('.event-winner').length === 0) {
         await Swal.fire({
           icon: 'warning',
           title: __('notice'),

diff --git a/src/scripts/website/Indiedb.ts b/src/scripts/website/Indiedb.ts
@@ -1,7 +1,7 @@
 /*
  * @Author       : HCLonely
  * @Date         : 2021-11-08 14:37:33
- * @LastEditTime : 2022-01-02 12:48:45
+ * @LastEditTime : 2022-01-09 13:00:52
  * @LastEditors  : HCLonely
  * @FilePath     : /auto-task-new/src/scripts/website/Indiedb.ts
  * @Description  : https://www.indiedb.com/giveaways
@@ -268,7 +268,7 @@ class Indiedb {
   async #checkLeftKey() {
     try {
       if (!globalOptions.other.checkLeftKey) return true;
-      if ($('a.buttonenter:contains("next time")').length > 0) {
+      if ($('a.buttonenter:contains("next time")，a.buttonenter:contains("Giveaway is closed")').length > 0) {
         await Swal.fire({
           icon: 'warning',
           title: __('notice'),

diff --git a/src/scripts/website/Keylol.ts b/src/scripts/website/Keylol.ts
@@ -1,7 +1,7 @@
 /*
  * @Author       : HCLonely
  * @Date         : 2021-11-15 13:58:41
- * @LastEditTime : 2022-01-08 17:07:34
+ * @LastEditTime : 2022-01-09 13:50:08
  * @LastEditors  : HCLonely
  * @FilePath     : /auto-task-new/src/scripts/website/Keylol.ts
  * @Description  : https://keylol.com/f319-1
@@ -12,6 +12,8 @@
 
 import throwError from '../tools/throwError';
 import Website from './Website';
+import leftKeyChecker from './leftKeyChecker';
+import __ from '../tools/i18n';
 
 const defaultTasks: keylolSocialTasks = {
   steam: {
@@ -162,6 +164,26 @@ class Keylol extends Website {
           this.#addBtn(ytbLink, 'youtube', 'videoLinks', link);
         }
       }
+
+      // eslint-disable-next-line max-len
+      const giveawayLinks = mainPost.find('a[href*="giveaway.su/giveaway/view/"],a[href*="givee.club/"],a[href*="gleam.io/"],a[href*="www.indiedb.com/giveaways/"],a[href*="key-hub.eu/giveaway/"],a[href*="opquests.com/quests/"],a[href*="itch.io/s/"]');
+      if (giveawayLinks.length > 0) {
+        for (const giveawayLink of giveawayLinks) {
+          const link = $(giveawayLink).attr('href');
+          if (!link) continue;
+          leftKeyChecker.classify(link).then((status) => {
+            if (!status) return;
+            if (/^Active/.test(status)) {
+              $(`a[href="${link}"]`).after(`<font class="auto-task-giveaway-status active" title="${__('Active')}">${status}</font>`);
+              return;
+            }
+            $(`a[href="${link}"]`).after(`<font class="auto-task-giveaway-status not-active" title="${__(status)}">${status}</font>`);
+          })
+            .catch((error) => {
+              throwError(error, 'keylol.after -> leftKeyChecker');
+            });
+        }
+      }
     } catch (error) {
       throwError(error as Error, 'keylol.after');
     }