1.3.3.6 General Drops Fix

- Added some WaitForSelectors to prevent getting data not loaded yet
- Added some more Debug lines.
- Added SkipUserDataPathQuestion option to settings. (DELETE old settings file for this to work)
- Added a Check for the case that all channels are Claimed

- Fixed twitch moving everything to General Drops breaking the bot
- Fixed 'Invalid parameters Failed to deserialize params.url' caused when only one claimed channel is being online.
- Fixed SamePercentCheck causing it to break after some tries.

- Removed unicode symbols

Author: Zaarrg

README.md

@@ -48,6 +48,7 @@
             <li><a href="#displayless">Displayless</a></li>  
             <li><a href="#checkclaimedonstart">CheckClaimedOnStart</a></li>  
             <li><a href="#skiploginpage">SkipLoginPage</a></li>  
+            <li><a href="#skipuserdatapathquestion ">SkipUserDataPathQuestion </a></li>  
             <li><a href="#progresscheckinterval">ProgressCheckInterval</a></li>  
             <li><a href="#auto-claim">AutoClaim</a></li>  
             <li><a href="#logtofile">LogToFile</a></li>  
@@ -248,6 +249,9 @@ Example CustomChannels File:
 ### SkipLoginPage
 - Option to skip the LoginPage and prevent it from always opening on start. Only use if twitch-session.jso (cookies) are provided. 
 
+### SkipUserDataPathQuestion
+- Option to skip the UserDataPathQuestion and prevent it from always opening when not providing one.
+
 ### ProgressCheckInterval
 - Option to change the Progress Interval in ms. Default is `60000` which is every `60` seconds the bot will check the progress. Can be increased for slow internet connections to prevent the bot from retrying so often.
 

TTVDropBot-linux-x64

@@ -1,6 +1,6 @@
 {
   "name": "ttvdropbot",
-  "version": "1.3.3-dev",
+  "version": "1.3.3-main",
   "description": "Twitch Drop Bot",
   "main": "src/index.js",
   "scripts": {
@@ -18,6 +18,7 @@
     "puppeteer-core": "^13.1.3",
     "puppeteer-extra": "^3.1.16",
     "puppeteer-extra-plugin-stealth": "^2.7.4",
+    "similarity": "^1.2.1",
     "wait-console-input": "^0.1.7",
     "winston": "^3.5.1"
   },

TTVDropBot.exe

@@ -0,0 +1,16 @@
+const data = require("../Data/SavedData")
+
+async function AllChannelsClaimedCheck() {
+    let chsclaimed = 0;
+
+    data.Streamers.forEach((element, index) => {
+        if (element.claimed) {
+            chsclaimed++
+        }
+    })
+    return chsclaimed === data.Streamers.length
+}
+
+module.exports = {
+    AllChannelsClaimedCheck
+}

package-lock.json

@@ -2,6 +2,7 @@ const {MapDrops} = require("../functions/MapDrops");
 const {GetRustDrops} = require("../functions/GetRustDrops");
 const data = require("../Data/SavedData");
 const {ciEquals} = require("../functions/util");
+const {Rustdrops_twitch} = require("../Data/SavedData");
 
 async function CheckProgressCurrentPage(page, dropspage, startch, campaignpage) {
 
@@ -16,14 +17,25 @@ async function CheckProgressCurrentPage(page, dropspage, startch, campaignpage)
         }
     })
 
-    for (let i = 0; i < data.dropsmap.length; i++)
-    {
-        if (data.claimed.includes(name)) {
-            return -1
-        } else if (ciEquals(data.dropsmap[i].url, startch)) {
-            return data.dropsmap[i].percentage
+    let progressarray = [];
+    async function handleprogress() {
+        for (let i = 0; i < data.dropsmap.length; i++)
+        {
+            if (data.alldropsgeneral) {
+                data.Rustdrops_twitch.forEach(e => {
+                    if (e.drop.toLowerCase() === data.dropsmap[i].name.toLowerCase()) {
+                        progressarray.push({name: data.dropsmap[i].name, percentage: data.dropsmap[i].percentage})
+                    }
+                })
+            } else if (data.claimed.includes(name)) {
+                return -1
+            } else if (ciEquals(data.dropsmap[i].url, startch)) {
+                return data.dropsmap[i].percentage
+            }
         }
+        return progressarray;
     }
+    return await handleprogress();
 }
 
 module.exports = {

package.json

@@ -9,7 +9,7 @@ async function CheckifAllClaimed() {
             alreadyclaimedandonline++
         }
     })
-    return alreadyclaimedandonline === data.choi.length
+    return (data.alldropsgeneral) ? false : alreadyclaimedandonline === data.choi.length
 }
 
 module.exports = {

src/Checks/AllChannelsClaimedCheck.js

@@ -14,7 +14,7 @@ let Rustdrops_twitch = undefined
 let choi = [];
 let offlinechs = [];
 let dropsmap = [];
-
+let alldropsgeneral = false;
 //starting ch
 let Startingchannel;
 
@@ -38,6 +38,7 @@ let headless = true;
 
 module.exports = {
     settings,
+    alldropsgeneral,
     debug,
     Rustdrops_twitch,
     headless,

src/Checks/CheckProgressCurrentPage.js

@@ -181,7 +181,7 @@ async function farmpoint(page) {
     //Inject JQuery
     await page.addScriptTag({url: 'https://code.jquery.com/jquery-3.6.0.js'})
     if (data.debug) winston.info(chalk.gray("Waiting for WatchingPage to load (WaitForSelector)"));
-    await page.waitForSelector('[data-test-selector="balance-string"]', {visible: true});
+    try {await page.waitForSelector('[data-test-selector="balance-string"]', {visible: true});} catch (e) {winston.info(chalk.yellow('WARNING: Points Balance not loaded...'))}
     return await page.evaluate(() => {
         let rawPoints = $('[data-test-selector="balance-string"]').text()
         let communitybuttons = $('[data-test-selector="community-points-summary"]').find("button")