piair/MsRewards-Reborn
2
2
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

faster overall + better discord error + better login

Browse Source
This commit is contained in:
piair 2023-04-07 23:28:48 +02:00
parent 808916ddd3
commit c9a838d368
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
V5.py
View File

@ -85,9 +85,8 @@ def log_error(error, ldriver=driver, log=FULL_LOG):
file = File("screenshot.png") file = File("screenshot.png")
embed.set_image(url="attachment://screenshot.png") embed.set_image(url="attachment://screenshot.png")
embed.set_footer(text=_mail) embed.set_footer(text=_mail)
webhookFailure.send(embed=embed, file=file) webhookFailure.send(embed=embed, username="error", file=file, avatar_url = AVATAR_URL)
webhookFailure.send(file=File("page.html")) webhookFailure.send(username="error", file=File("page.html"), avatar_url = AVATAR_URL)
# close the tab currently on and go back to the one first, or the one specified # close the tab currently on and go back to the one first, or the one specified
@ -103,7 +102,7 @@ def play_quiz2(override=10) -> None:
printf("starting play_quiz2") printf("starting play_quiz2")
for j in range(override): for j in range(override):
try: try:
rgpd_popup(driver) # rgpd_popup(driver)
custom_sleep(uniform(3, 5)) custom_sleep(uniform(3, 5))
page_html = driver.page_source page_html = driver.page_source
secret_answer = search('IG:"([^"]+)"', page_html)[1] # variable used to calculate offset secret_answer = search('IG:"([^"]+)"', page_html)[1] # variable used to calculate offset
@ -137,7 +136,7 @@ def play_quiz8():
printf(f"play_quiz8 : start, override : {override}") printf(f"play_quiz8 : start, override : {override}")
try: try:
counter = 0 counter = 0
rgpd_popup(driver) # rgpd_popup(driver)
for _ in range(override): for _ in range(override):
custom_sleep(uniform(3, 5)) custom_sleep(uniform(3, 5))
correct_answers = [] correct_answers = []
@ -184,7 +183,7 @@ def play_quiz4(override=None):
for i in range(override): for i in range(override):
custom_sleep(uniform(3, 5)) custom_sleep(uniform(3, 5))
txt = driver.page_source txt = driver.page_source
rgpd_popup(driver) # rgpd_popup(driver)
answer_option = search('correctAnswer":"([^"]+)', txt)[1] answer_option = search('correctAnswer":"([^"]+)', txt)[1]
answer_option = answer_option.replace("\\u0027", "'") # replace Unicode weird symbols answer_option = answer_option.replace("\\u0027", "'") # replace Unicode weird symbols
try: try:
@ -368,7 +367,7 @@ def try_play(nom="inconnu"):
if "bt_PollRadio" in driver.page_source: if "bt_PollRadio" in driver.page_source:
try: try:
printf("Poll detected") printf("Poll detected")
rgpd_popup(driver) #rgpd_popup(driver)
do_poll() do_poll()
printf("Poll succeeded") printf("Poll succeeded")
except Exception as e: except Exception as e:
@ -384,12 +383,12 @@ def try_play(nom="inconnu"):
elif search("([0-9]) de ([0-9]) finalisée", driver.page_source): elif search("([0-9]) de ([0-9]) finalisée", driver.page_source):
printf("fidélité") printf("fidélité")
rgpd_popup(driver) #rgpd_popup(driver)
fidelity() fidelity()
else: else:
printf(f"rien à faire sur la page {nom}") printf(f"rien à faire sur la page {nom}")
rgpd_popup(driver) # rgpd_popup(driver)
custom_sleep(uniform(3, 5)) custom_sleep(uniform(3, 5))
@ -468,13 +467,13 @@ def login(ldriver):
printf("Timeout error occurred. \"normal\"....., maybe because of mismatch date ? ") printf("Timeout error occurred. \"normal\"....., maybe because of mismatch date ? ")
log_error("Timeout error occurred. \"normal\"....., maybe because of mismatch date ?", ldriver, True) # TODO check this hypothesis log_error("Timeout error occurred. \"normal\"....., maybe because of mismatch date ?", ldriver, True) # TODO check this hypothesis
else: else:
log_error(e) log_error(e, ldriver)
custom_sleep(20) # TODO : remplacer par un wait_element wait_until_visible(By.CSS_SELECTOR, '[data-bi-id="sh-sharedshell-rewards"]', 20, ldriver)
if ("account.microsoft.com" in ldriver.current_url) : if ("account.microsoft.com" in ldriver.current_url) :
ldriver.get("https://bing.com") ldriver.get("https://bing.com")
custom_sleep(5) custom_sleep(5)
ldriver.refresh() ldriver.refresh()
rgpd_popup(ldriver) rgpd_popup(ldriver) # Ultra important
ldriver.get("https://www.bing.com/rewardsapp/flyout") ldriver.get("https://www.bing.com/rewardsapp/flyout")
if not('>Tableau de bord' in ldriver.page_source): if not('>Tableau de bord' in ldriver.page_source):
try : try :
@ -847,7 +846,7 @@ def daily_routine(custom = False):
def dev(): def dev():
pass log_error("test")
def CustomStart(Credentials): def CustomStart(Credentials):

6
modules/config.py
View File

@ -131,7 +131,11 @@ DISCORD_SUCCESS_LINK = config["DISCORD"]["successlink"]
DISCORD_ERROR_LINK = config["DISCORD"]["errorlink"] DISCORD_ERROR_LINK = config["DISCORD"]["errorlink"]
DISCORD_ENABLED_ERROR = config["DISCORD"]["DiscordErrorEnabled"] == "True" DISCORD_ENABLED_ERROR = config["DISCORD"]["DiscordErrorEnabled"] == "True"
DISCORD_ENABLED_SUCCESS = config["DISCORD"]["DiscordSuccessEnabled"]== "True" DISCORD_ENABLED_SUCCESS = config["DISCORD"]["DiscordSuccessEnabled"]== "True"
try :
AVATAR_URL = config["OTHER"]["avatar"]== "True"
except :
AVATAR_URL = "https://cdn.discordapp.com/icons/793934298977009674/d8055bccef6eca4855c349e808d0d788.webp"
if DISCORD_ENABLED_ERROR: if DISCORD_ENABLED_ERROR:
webhookFailure = Webhook.from_url(DISCORD_ERROR_LINK, adapter=RequestsWebhookAdapter()) webhookFailure = Webhook.from_url(DISCORD_ERROR_LINK, adapter=RequestsWebhookAdapter())
if DISCORD_ENABLED_SUCCESS: if DISCORD_ENABLED_SUCCESS:

2
user_data/config.default
View File

@ -31,5 +31,5 @@ usr = root
pwd = password pwd = password
[OTHER] [OTHER]
avatar = https://cdn.discordapp.com/icons/793934298977009674/d8055bccef6eca4855c349e808d0d788.webp
ipv6 = False ipv6 = False

2
version
View File

@ -1 +1 @@
v5.3.2 v5.4.0