LightZirconite/Microsoft-Rewards-Script
1
0
Fork 0
mirror of https://github.com/TheNetsky/Microsoft-Rewards-Script.git synced 2026-01-18 05:53:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.4.11 (#146)

Browse Source 
* fix misspelling

* fix: avoid skipping eligible items in "More Promotion"

* remove unnecessary output

* Fix Formatting

* replace checking variable

* decrease id length

* revert previous commit

* change condition for eligible promo

* Other fixes

---------

Co-authored-by: TheNetsky <56271887+TheNetsky@users.noreply.github.com>
This commit is contained in:
HMCDAT
2024-10-02 23:37:06 +07:00
committed by GitHub
parent 7939196e88
commit 09ddbee45a
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/functions/Workers.ts
View File

@@ -87,7 +87,7 @@ export class Workers {
morePromotions.push(data.promotionalItem as unknown as MorePromotion)
}
const activitiesUncompleted = morePromotions?.filter(x => !x.complete && x.pointProgressMax > 0 && !x.attributes.is_unlocked) ?? []
const activitiesUncompleted = morePromotions?.filter(x => !x.complete && x.pointProgressMax > 0 && x.exclusiveLockedFeatureStatus !== 'locked') ?? []
if (!activitiesUncompleted.length) {
this.bot.log('MORE-PROMOTIONS', 'All "More Promotion" items have already been completed')

17
src/functions/activities/Search.ts
View File

@@ -144,9 +144,6 @@ export class Search extends Workers {
window.scrollTo(0, 0)
})
// Set it since params get added after visiting
this.searchPageURL = searchPage.url()
await this.bot.utils.wait(500)
const searchBar = '#sb_form_q'
@@ -259,7 +256,7 @@ export class Search extends Workers {
return response.data[1] as string[]
} catch (error) {
this.bot.log('SEARCH-BING-RELTATED', 'An error occurred:' + error, 'error')
this.bot.log('SEARCH-BING-RELATED', 'An error occurred:' + error, 'error')
}
return []
}
@@ -291,13 +288,13 @@ export class Search extends Workers {
try {
await page.click('#b_results .b_algo h2', { timeout: 2000 }).catch(() => { }) // Since we don't really care if it did it or not
// Stay for 10 seconds for page to load and "visit"
await this.bot.utils.wait(10_000)
// Will get current tab if no new one is created, this will always be the visited site or the result page if it failed to click
let lastTab = await this.bot.browser.utils.getLatestTab(page)
// Stay for 10 seconds
await this.bot.utils.wait(10_000)
let lastTabURL = new URL(lastTab.url()) // Get new tab info, this is the website we've visited
let lastTabURL = new URL(lastTab.url()) // Get new tab info, this is the website we're visiting
// Check if the URL is different from the original one, don't loop more than 5 times.
let i = 0
@@ -332,10 +329,10 @@ export class Search extends Workers {
await this.bot.utils.wait(3000)
this.searchPageURL = newPage.url()
// Else reset the last tab back to the search listing
// Else reset the last tab back to the search listing or Bing.com
} else {
lastTab = await this.bot.browser.utils.getLatestTab(lastTab)
await lastTab.goto(this.searchPageURL)
await lastTab.goto(this.searchPageURL ? this.searchPageURL : this.bingHome)
}
}