Givee任务识别优化;Givee可识别任务增加

HCLonely · Jul 3, 2022 · d61da84 · d61da84 · vercel · Jul 3, 2022
1 parent aa81c53
commit d61da84
Show file tree

Hide file tree

Showing 18 changed files with 124 additions and 93 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -20,9 +20,11 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           prerelease: false
-          tag_name: v4.2.15
-          name: 4.2.15
-          body: '- Gleam可识别任务增加(Follow *** on TikTok!)'
+          tag_name: v4.2.16
+          name: 4.2.16
+          body: |-
+            - Givee任务识别优化
+            - Givee可识别任务增加(关注Steam游戏)
           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.2.15
+// @version            4.2.16
 // @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
@@ -8451,24 +8451,28 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
           const tasks = $('.event-actions tr');
           for (const task of tasks) {
             pro.push(new Promise(resolve => {
+              var _$$find;
               const taskDes = $(task).find('.event-action-label a');
               const taskIcon = $(task).find('.event-action-icon i').attr('class') || '';
               const taskName = taskDes.text().trim();
+              const taskType = (_$$find = $(task).find('button[data-type]')) === null || _$$find === void 0 ? void 0 : _$$find.attr('data-type');
               if (taskIcon.includes('ban') || /AdBlock/i.test(taskName) || taskIcon.includes('envelope')) {
                 return resolve(true);
               }
               getRedirectLink(taskDes.attr('href')).then(taskLink => {
                 if (!taskLink) {
                   return resolve(false);
                 }
-                if (/^https?:\/\/steamcommunity\.com\/groups/.test(taskLink)) {
+                if (taskType === 'steam.group.join' && /'^https?:\/\/steamcommunity\.com\/groups'/.test(taskLink)) {
                   this.undoneTasks.steam.groupLinks.push(taskLink);
                 } else if (/like.*announcement/gi.test(taskName)) {
                   this.undoneTasks.steam.announcementLinks.push(taskLink);
-                } else if (taskIcon.includes('plus') && /^https?:\/\/store\.steampowered\.com\/app\//.test(taskLink)) {
+                } else if (taskType === 'steam.game.wishlist' && /^https?:\/\/store\.steampowered\.com\/app\//.test(taskLink)) {
                   this.undoneTasks.steam.wishlistLinks.push(taskLink);
-                } else if (taskIcon.includes('plus') && taskDes.attr('data-steam-wishlist-appid')) {
+                } else if (taskType === 'steam.game.wishlist' && taskDes.attr('data-steam-wishlist-appid')) {
                   this.undoneTasks.steam.wishlistLinks.push(`https://store.steampowered.com/app/${taskDes.attr('data-steam-wishlist-appid')}`);
+                } else if (taskType === 'steam.game.follow' && /^https?:\/\/store\.steampowered\.com\/app\//.test(taskLink)) {
+                  this.undoneTasks.steam.followLinks.push(taskLink);
                 } else if (/^https?:\/\/store\.steampowered\.com\/curator\//.test(taskLink)) {
                   this.undoneTasks.steam.curatorLinks.push(taskLink);
                 } else if (taskIcon.includes('steam') && /follow|subscribe/gim.test(taskName)) {

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.2.15
+// @version            4.2.16
 // @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
@@ -8432,24 +8432,28 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
           const tasks = $('.event-actions tr');
           for (const task of tasks) {
             pro.push(new Promise(resolve => {
+              var _$$find;
               const taskDes = $(task).find('.event-action-label a');
               const taskIcon = $(task).find('.event-action-icon i').attr('class') || '';
               const taskName = taskDes.text().trim();
+              const taskType = (_$$find = $(task).find('button[data-type]')) === null || _$$find === void 0 ? void 0 : _$$find.attr('data-type');
               if (taskIcon.includes('ban') || /AdBlock/i.test(taskName) || taskIcon.includes('envelope')) {
                 return resolve(true);
               }
               getRedirectLink(taskDes.attr('href')).then(taskLink => {
                 if (!taskLink) {
                   return resolve(false);
                 }
-                if (/^https?:\/\/steamcommunity\.com\/groups/.test(taskLink)) {
+                if (taskType === 'steam.group.join' && /'^https?:\/\/steamcommunity\.com\/groups'/.test(taskLink)) {
                   this.undoneTasks.steam.groupLinks.push(taskLink);
                 } else if (/like.*announcement/gi.test(taskName)) {
                   this.undoneTasks.steam.announcementLinks.push(taskLink);
-                } else if (taskIcon.includes('plus') && /^https?:\/\/store\.steampowered\.com\/app\//.test(taskLink)) {
+                } else if (taskType === 'steam.game.wishlist' && /^https?:\/\/store\.steampowered\.com\/app\//.test(taskLink)) {
                   this.undoneTasks.steam.wishlistLinks.push(taskLink);
-                } else if (taskIcon.includes('plus') && taskDes.attr('data-steam-wishlist-appid')) {
+                } else if (taskType === 'steam.game.wishlist' && taskDes.attr('data-steam-wishlist-appid')) {
                   this.undoneTasks.steam.wishlistLinks.push(`https://store.steampowered.com/app/${taskDes.attr('data-steam-wishlist-appid')}`);
+                } else if (taskType === 'steam.game.follow' && /^https?:\/\/store\.steampowered\.com\/app\//.test(taskLink)) {
+                  this.undoneTasks.steam.followLinks.push(taskLink);
                 } else if (/^https?:\/\/store\.steampowered\.com\/curator\//.test(taskLink)) {
                   this.undoneTasks.steam.curatorLinks.push(taskLink);
                 } else if (taskIcon.includes('steam') && /follow|subscribe/gim.test(taskName)) {