faster overall + better discord error + better login

.gitignore

@@ -11,3 +11,5 @@ data
 /user_data
 install.sh
 nohup.out
+test.py
+points.csv

V5.py

@@ -85,9 +85,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 +102,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 +136,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 +183,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:
@@ -221,9 +220,10 @@ def all_cards(): # return to the main page and closes all other tabs
         if len(driver.window_handles) == 1:
             driver.get("https://www.bing.com/rewardsapp/flyout")
             if part2:
-                driver.find_element(
+                row_element = driver.find_elements(By.CSS_SELECTOR, f'[class="i-h rw-sh fp_row"]')[1]
-                    By.XPATH, "/html/body/div/div/div[3]/div[2]/div[2]/div[2]/div[1]"
+                expanded = row_element.get_attribute("aria-expanded")
-                ).click()
+                if expanded != "true":
+                    row_element.click()
         else:
             driver.switch_to.window(driver.window_handles[1])
             printf(f"fermeture : {driver.current_url}")
@@ -236,7 +236,7 @@ def all_cards(): # return to the main page and closes all other tabs
     def daily_cards(): # cartes de la premiere partie (renouvelées chaque jours).
         try:
             # make sure that the daily area is expanded
-            row_element = driver.find_element(By.XPATH, "/html/body/div/div/div[3]/div[2]/div[1]/div[1]")
+            row_element = driver.find_elements(By.CSS_SELECTOR, f'[class="i-h rw-sh fp_row"]')[0]
             expanded = row_element.get_attribute("aria-expanded")
             if expanded != "true":
                 row_element.click()
@@ -244,9 +244,8 @@ def all_cards(): # return to the main page and closes all other tabs
                 custom_sleep(uniform(3, 5))
                 try:
                     titre = "Placeholder"
-                    driver.find_element(
+                    elm = driver.find_elements(By.CLASS_NAME, 'promo_cont')
-                        By.XPATH,f"/html/body/div/div/div[3]/div[2]/div[1]/div[2]/div/div[{i+1}]/a",
+                    elm[i].click()
-                    ).click()
                     sleep(1)
                     titre = driver.title
                     try_play(titre)
@@ -255,7 +254,7 @@ def all_cards(): # return to the main page and closes all other tabs
                     printf(f"DailyCard {titre} ok")
                 except Exception as e:
                     log_error(f"all_cards card {titre} error ({format_error(e)})")
-
+                """
                 try : # devrait renvoyer vrai si la carte i est faite ou pas, a l'aide su symbole en haut a droite de la carte
                     elm = driver.find_element(By.XPATH, f"/html/body/div/div/div[3]/div[2]/div[1]/div[2]/div/div[{i+1}]/a/div/div[2]/div[1]/div[2]/div")
                     if not ("correctCircle" in elm.get_attribute("innerHTML")):
@@ -266,23 +265,25 @@ def all_cards(): # return to the main page and closes all other tabs
                 except Exception as e : 
                     printf(format_error(e) + "probablement ok - check card")
                  # if it fail, it's probably okay -> when all three card are done, the pannel fold
-
+                """
         except Exception as e:
             log_error(e)
     
     def weekly_cards():
         # make sure that the weekly area is expanded
-        row_element = driver.find_element(By.XPATH, "/html/body/div/div/div[3]/div[2]/div[2]/div[2]")
+        row_element = driver.find_elements(By.CSS_SELECTOR, f'[class="i-h rw-sh fp_row"]')[1]
         expanded = row_element.get_attribute("aria-expanded")
         if expanded != "true":
             row_element.click()
 
         for i in range(20): # Should raise an error whene there is no card left
             printf("début de l'une des cartes")
-            driver.find_element(
+            elm = driver.find_elements(By.CLASS_NAME, 'promo_cont')
-                By.XPATH,
+            try :
-                "/html/body/div/div/div[3]/div[2]/div[2]/div[3]/div/div[1]/a/div/div[2]",
+                elm[0].click()
-            ).click()
+            except Exception as e :
+                print(f"{e} + {driver.current_url}")
+                break
             driver.switch_to.window(driver.window_handles[len(driver.window_handles) - 1])
             sleep(1)
             titre = driver.title
@@ -290,13 +291,13 @@ def all_cards(): # return to the main page and closes all other tabs
             try_play(titre)
             reset(True)
             sleep(1)
-            try:
+            #try:
-                findall('href="([^<]+)" title=""', driver.page_source)[3]  # return error if there is no cards left to do
+            #    findall('href="([^<]+)" title=""', driver.page_source)[3]  # return error if there is no cards left to do
-            except:
+            #except:
-                break
+            #    break
 
     def top_cards():
-        for _ in range(10):
+        for _ in range(2):
             try :
                 driver.find_element(By.XPATH, "/html/body/div/div/div[3]/div[1]/div/div[1]/div[2]").click()
                 reset()
@@ -305,17 +306,20 @@ def all_cards(): # return to the main page and closes all other tabs
                 break
     
     try :
-        top_cards()
+        #top_cards()
+        print("top card not working really well right now. Disableing them")
     except Exception as e:
         log_error(e)
 
     try:
         daily_cards()
+        print("daily card")
     except Exception as e:
         log_error(e)
 
     try :
         weekly_cards()
+        print("weekly card")
     except Exception as e:
         log_error(e)
 
@@ -363,7 +367,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:
@@ -379,12 +383,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))
 
 
@@ -463,13 +467,13 @@ 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 not('>Tableau de bord' in ldriver.page_source):
                 try : 
@@ -665,7 +669,6 @@ def fidelity():
             fidelity_link = fidelity_link_page.content.decode("UTF-8")
 
             if (fidelity_link.split(":")[0] == "https") or (fidelity_link.split(":")[0] == "http") : 
-                
                 driver.get(fidelity_link)
                 wait_until_visible(By.CSS_SELECTOR, 'div[class="pull-left spacer-48-bottom punchcard-row"]', browser=driver)
                 try : 
@@ -678,9 +681,10 @@ def fidelity():
                     answer_number = search("([0-9]) de ([0-9]) finalisé", driver.page_source)
                 if answer_number is None :
                     answer_number = search("([0-9]) licence\(s\) sur ([0-9]) disponible\(s\)", driver.page_source)
+                if answer_number is None :
+                    answer_number = search("([0-9])&nbsp;défi\(s\) terminé\(s\) sur ([0-9])", driver.page_source)
                 if answer_number is None :
                     answer_number = [0,0,0]
-
                 for _ in range(int(answer_number[2]) - int(answer_number[1])):
                     driver.refresh()
                     custom_sleep(2)
@@ -842,7 +846,7 @@ def daily_routine(custom = False):
 
 
 def dev():
-    pass
+    log_error("test")
 
 
 def CustomStart(Credentials):
@@ -925,6 +929,9 @@ elif UNBAN:
 elif POINTS_FILE != "":
     save_points_from_file(POINTS_FILE)
 else:
+    if UPDATE_VERSION != "None":
+        if DISCORD_ENABLED_ERROR:
+            webhookFailure.send(f"Updated to {UPDATE_VERSION}")
     for cred in Credentials:
         _mail = cred[0]
         _password = cred[1]

database.py

@@ -10,9 +10,16 @@ parser.add_argument(
     help="Choose a file", 
     type=argparse.FileType('r')
 )
+parser.add_argument(
+    "-m", 
+    "--manual", 
+    help="add point manually do database", 
+    dest="manual", 
+    action="store_true"
+)
 
 args = parser.parse_args()
-
+MANUAL = args.manual
 
 config_path = "./user_data/config.cfg"
 config = configparser.ConfigParser()
@@ -47,7 +54,7 @@ def ban_account(name: str, pts = 0):
 def update_pts(name: str, pts = 0):
     pass
 
-
+if not MANUAL :
     print("ajouter un compte : 1\nban un compte : 2")
     i = input()
     if i == "1":
@@ -70,3 +77,16 @@ elif i == '2':
     mydb.commit()
     mycursor.close()
     mydb.close()
+else :
+    import modules.db as datab
+    config_path = f"{path.abspath(path.dirname(path.dirname( __file__ )))}/MsRewards/user_data/config.cfg"
+    print(config_path)
+    config = configparser.ConfigParser()
+    config.read(config_path)
+    sql_usr = config["SQL"]["usr"]
+    sql_pwd = config["SQL"]["pwd"]
+    sql_host = config["SQL"]["host"]
+    sql_database = config["SQL"]["database"]
+    account_name = input("compte ? ")
+    points = int(input("points ? "))
+    datab.add_to_database(account_name, points, sql_host, sql_usr, sql_pwd, sql_database)

main.py

@@ -1,8 +1,11 @@
 #/usr/bin/python3.10
-
+from packaging.version import parse as parse_version
 import configparser
 import os 
 import shutil
+import requests
+import sys
+
 
 config = configparser.ConfigParser()
 
@@ -16,8 +19,6 @@ except :
     config.read(config_path)
 
 
-
-
 def confirm(texte, default = False):
     if default : 
         txt = '[Y/n]'
@@ -41,12 +42,12 @@ text = {"fr" : {
     "next" : "voulez vous ajouter un compte ? ",
     "finc" : "comptes en cours d'ajout ",
     "ajout" : "comptes ajouté ",
-    "fidelity" : "avez vous un lien sur lequel le lien vers la page fidelité du mois est le seul contenu de la page ? ",
+    "fidelity" : "avez vous un lien sur lequel le lien vers la page fidélité du mois est le seul contenu de la page ? ",
     "lien" : "entrez le lien ",
     "discorde" : "voulez vous envoyer les erreurs sur discord ? ",
     "w1" : "entrez le lien du WebHook pour envoyer les points ",
     "w2" : "entrez le lien du WebHook pour envoyer les erreurs ",
-    "msqle" : "voulez vous untiliser une base de donnée ",
+    "msqle" : "voulez vous utiliser une base de donnée ",
     "msqll" : "entrez le lien de la base de donnée ",
     "msqlu" : "entrez l'utilisateur de la base de donnée ",
     "msqlp" : "entrez le mot de passe de la base de donnée ",
@@ -83,8 +84,6 @@ def setup_comptes():
         f.write("\n")
     f.close()
     print(t["ajout"])
-
-    #modifie le fichier de configuration
     edit_config_txt("logpath",f'{os.getcwd()}/user_data/login.csv')
 
 
@@ -111,7 +110,7 @@ def setup_settings():
     discord()
     proxy()
     sql()
-    amazon()
+
 
 def general():
     if confirm(t["fidelity"]):
@@ -144,6 +143,7 @@ def sql() :
         pwd = input(t["msqlp"])
         edit_config_txt("pwd",pwd)
 
+
 def proxy() :
     enabled = confirm(t["proxye"], default = False)
     if enabled : 
@@ -153,13 +153,33 @@ def proxy() :
         port = input(t["proxyp"])
         edit_config_txt("port",port)
 
-def amazon():
-    enabled = confirm("claim les recompenses automatiquement sur amazon ?", default = False)
-    edit_config_txt("claim_amazon",enabled)
 
+def check_update(args):
+    try : 
+        latest = requests.get("https://api.github.com/repos/piair338/MsRewards/releases").json()[0]["tag_name"]
+        latest = parse_version(latest)
+    except Exception as e :
+        print(e) 
+        return (args)
+    f = open("./version", 'r')
+    txt = f.readlines()[0].replace("\n","")
+    f.close()
+    cur = parse_version(txt)
+    if not (cur < latest) :
+        print("Already up to date.")
+        return(args)
+    else :
+        print(f"updating to {latest}")
+        os.system("git reset --hard")
+        os.system("git pull")
+        os.system("python3 -m pip install -r requirements.txt > update.result")
+        print(f"updated to {latest}")
+        return(args + f" --version {latest}")
 
 LogPath = config["PATH"]["logpath"]
 if LogPath == "/your/path/to/loginandpass.csv" :
     setup()
 else :
-    os.system("python3 V5.py")
+    args = " ".join(sys.argv[1::])
+    args = check_update(args)
+    os.system("python3 V5.py " + args)

modules/config.py

@@ -81,6 +81,12 @@ parser.add_argument(
     default="None"
 )
 
+parser.add_argument( 
+    "--updated",
+    help="display a message on discord to tell that the bot have been updated",
+    dest="update_version",
+    default="None"
+)
 args = parser.parse_args()
 
 CUSTOM_START = args.override
@@ -93,7 +99,7 @@ if CUSTOM_START :
 VNC_ENABLED = args.vnc != "None"
 VNC_PORT = args.vnc
 POINTS_FILE = args.points_file
-
+UPDATE_VERSION = args.update_version
 # global variables used later in the code
 LINUX_HOST = platform == "linux" # if the computer running this program is Linux, it allow more things 
 START_TIME = time()
@@ -125,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())

requirements.txt

@@ -9,3 +9,4 @@ pyvirtualdisplay
 pillow
 EasyProcess
 pyotp
+packaging

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

@@ -0,0 +1 @@
+v5.4.0