well, SadPanda is still here ;(

README.md

@@ -3,7 +3,7 @@
 
 A Microsoft reward automator, designed to work headless on any server.  
 Using a discord webhook or SQL to log points everyday.  
-Using Selenium and geckodriver.
+Using Selenium and Geckodriver.
 
 ## If you're using docker (way easier)  
 to use docker, run 
@@ -12,14 +12,14 @@ sudo docker build .
 #copy the build id
 sudo docker run -ti --name MsRewards [build id]
 ```
-Then, fill the config and start the programm everydays with 
+Then, fill the config and start the program everyday with 
 ```
 sudo docker start MsRewards
 ```
 
 ## Other configuration
 
-To use the database, I recommand MySql, Create a database with the name you want and create a table `daily`, like the one from the image : 
+To use the database, I recommend MySql, Create a database with the name you want and create a table `daily`, like the one from the image : 
 ![B96F2F6D-7257-4F12-BFA7-0BEC3FB72993](https://user-images.githubusercontent.com/74496300/172872979-05396b6b-b682-471a-b71b-41602d816504.jpeg)
 
 You have to use the default world list (`sudo apt install wfrench`). The language is french by default, but you can change it if you want.  

V5.py

@@ -15,9 +15,8 @@ def printf(e):
     printf2(str(e), _mail)
 
 # TODO
-# handle "panda"'s error: error while logging in preventing some task to be done
+# handle "panda"'s error: error while logging in preventing some task to be done SadPanda.svg
 # check that each card worked (lot of misses lately) -- test that -- don't crash at least
-# Fix l'affichage du compteur de custom_sleep
 
 
 # create a webdriver 
@@ -85,9 +84,8 @@ def log_error(error, ldriver=driver, log=FULL_LOG):
         file = File("screenshot.png")
         embed.set_image(url="attachment://screenshot.png")
         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
@@ -103,7 +101,7 @@ def play_quiz2(override=10) -> None:
     printf("starting play_quiz2")
     for j in range(override):
         try:
-            rgpd_popup(driver)
+            # rgpd_popup(driver)
             custom_sleep(uniform(3, 5))
             page_html = driver.page_source
             secret_answer = search('IG:"([^"]+)"', page_html)[1]                      # variable used to calculate offset
@@ -137,7 +135,7 @@ def play_quiz8():
     printf(f"play_quiz8 : start, override : {override}")
     try:
         counter = 0
-        rgpd_popup(driver)
+        # rgpd_popup(driver)
         for _ in range(override):  
             custom_sleep(uniform(3, 5))
             correct_answers = []
@@ -184,7 +182,7 @@ def play_quiz4(override=None):
         for i in range(override):
             custom_sleep(uniform(3, 5))
             txt = driver.page_source
-            rgpd_popup(driver)
+            # rgpd_popup(driver)
             answer_option = search('correctAnswer":"([^"]+)', txt)[1]
             answer_option = answer_option.replace("\\u0027", "'")    # replace Unicode weird symbols
             try:
@@ -234,7 +232,7 @@ def all_cards(): # return to the main page and closes all other tabs
                 driver.get("https://www.bing.com/rewardsapp/flyout")
             reset(part2)
 
-    def daily_cards(): # cartes de la premiere partie (renouvelées chaque jours).
+    def daily_cards(): # cartes de la premiere partie (renouvelée chaque jour).
         try:
             # make sure that the daily area is expanded
             row_element = driver.find_elements(By.CSS_SELECTOR, f'[class="i-h rw-sh fp_row"]')[0]
@@ -308,7 +306,7 @@ def all_cards(): # return to the main page and closes all other tabs
     
     try :
         #top_cards()
-        print("top card not working really well right now. Disableing them")
+        print("top card not working really well right now. They are currently disabled")
     except Exception as e:
         log_error(e)
 
@@ -368,7 +366,7 @@ def try_play(nom="inconnu"):
         if "bt_PollRadio" in driver.page_source:
             try:
                 printf("Poll detected")
-                rgpd_popup(driver)
+                #rgpd_popup(driver)
                 do_poll()
                 printf("Poll succeeded")
             except Exception as e:
@@ -384,12 +382,12 @@ def try_play(nom="inconnu"):
 
         elif search("([0-9]) de ([0-9]) finalisée", driver.page_source):
             printf("fidélité")
-            rgpd_popup(driver)
+            #rgpd_popup(driver)
             fidelity()
 
         else:
             printf(f"rien à faire sur la page {nom}")
-            rgpd_popup(driver)
+            # rgpd_popup(driver)
             custom_sleep(uniform(3, 5))
 
 
@@ -468,14 +466,18 @@ def login(ldriver):
                 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
             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) :
             ldriver.get("https://bing.com")
             custom_sleep(5)
             ldriver.refresh()
-            rgpd_popup(ldriver)
+            rgpd_popup(ldriver) # Ultra important
             ldriver.get("https://www.bing.com/rewardsapp/flyout")
+            #if "SadPanda.svg" in ldriver.page_source :
+            #    log_error('test SadPanda before', ldriver)
+            #    driver.execute_script("location.reload(true);")
+            #    log_error('test SadPanda after', ldriver)
             if not('>Tableau de bord' in ldriver.page_source):
                 try : 
                     ldriver.find_element(By.CSS_SELECTOR, "[h='ID=RewardsFlyout,2.1']").click()
@@ -847,7 +849,7 @@ def daily_routine(custom = False):
 
 
 def dev():
-    pass
+    log_error("test")
 
 
 def CustomStart(Credentials):

modules/config.py

@@ -82,7 +82,7 @@ parser.add_argument(
 )
 
 parser.add_argument( 
-    "--updated",
+    "--version",
     help="display a message on discord to tell that the bot have been updated",
     dest="update_version",
     default="None"
@@ -131,6 +131,10 @@ DISCORD_SUCCESS_LINK = config["DISCORD"]["successlink"]
 DISCORD_ERROR_LINK = config["DISCORD"]["errorlink"]
 DISCORD_ENABLED_ERROR = config["DISCORD"]["DiscordErrorEnabled"] == "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:
     webhookFailure = Webhook.from_url(DISCORD_ERROR_LINK, adapter=RequestsWebhookAdapter())

user_data/config.default

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

version

@@ -1 +1 @@
-v5.3.2
+v5.5.2