diff --git a/site.js b/site.js index 57218a2..2e00470 100644 --- a/site.js +++ b/site.js @@ -7,7 +7,6 @@ let cache = {}; let site = process.env.site || 'darflen'; let route = process.env.route || './test.txt'; let pageLimit = process.env.pageLimit || Infinity; -let userLimit = process.env.userLimit || Infinity; let blacklist = (process.env.blacklist + '').split(',') || []; let greylist = (process.env.greylist + '').split(',') || []; let hh; @@ -87,13 +86,11 @@ async function rounder(users, data, mode) { let ul = 0; for (let u of users) { let it = 0; - if (ul > userLimit) break; - ul++; - while (p.length >= (process.env.maxRate || 15)) { p = p.filter(x => x != 'hi'); if (p.length == 0) break; let pv = await Promise.any([...p, pr]); + if (timeout) { console.warn(`Somehow, this is stuck.`); break; @@ -110,7 +107,7 @@ async function rounder(users, data, mode) { if (!data[u]) data[u] = { followers: [], following: [] }; p.push(async function (k) { await siteCollector(u, 'followers', site, mode, data); - + percent += 50 / d / users.length; console.log(`User ${u} followers is fully calculated (${percent}% total)`); @@ -138,10 +135,9 @@ async function rounder(users, data, mode) { let oldLength = endn.length; for (let h in data) { endn.push(h); - if (endn.length > oldLength * 1.25 || endn.length - oldLength > userLimit) { + if (endn.length > oldLength * 1.25 ) { endn = [...new Set(endn)]; } - if (mode && endn.length - oldLength > userLimit) break; } //let fcg = ((a, b) => ((data[a] ? -data[a].followers.length : 0) - (data[b] ? -data[b].followers.length : 0))); //endn = endn.sort(fcg);