better way if manually updated

ptdr not on a raspberrypi anymore

.gitignore

@@ -1,10 +1,13 @@
 /old
 geckodriver.log
-config
 .vscode/
 update.sh
 /Git
 page.html
 screenshot.png
 login.csv
-requirements.txt
+data
+**/__pycache__
+/user_data
+install.sh
+nohup.out

Dockerfile

@@ -9,38 +9,28 @@ RUN set -x \
    && apt update \
    && apt upgrade -y \
    && apt install -y \
-       firefox-esr \
        wfrench \
        git \
-   && pip install  \
-       requests \
-       selenium \
-       argparse \
-       discord \
-       configparser \
-       asyncio \
-       enquiries \
-       mysql-connector \
-   && git clone https://github.com/piair338/MsReward
-
-# Add latest FireFox
-RUN set -x \
-   && apt install -y \
        libx11-xcb1 \
        libdbus-glib-1-2 \
+       libasound2 \
+       libgtk-3-0 \
+       xvfb \
+       nano \
+       tigervnc-standalone-server \
+   && git clone https://github.com/piair338/MsRewards \
+   && pip install -r MsRewards/requirements.txt \
    && curl -sSLO https://download-installer.cdn.mozilla.net/pub/firefox/releases/91.9.1esr/linux-x86_64/en-US/firefox-91.9.1esr.tar.bz2 \
    && tar -jxf firefox-* \
    && mv firefox /opt/ \
    && chmod 755 /opt/firefox \
-   && chmod 755 /opt/firefox/firefox
-  
-# Add geckodriver
-RUN set -x \
+   && chmod 755 /opt/firefox/firefox \
+   && ln -s /opt/firefox/firefox /usr/bin/firefox \
    && curl -sSLO https://github.com/mozilla/geckodriver/releases/download/${GECKODRIVER_VER}/geckodriver-${GECKODRIVER_VER}-linux64.tar.gz \
    && tar zxf geckodriver-*.tar.gz \
    && mv geckodriver /usr/bin/
 
 
-WORKDIR /app/MsReward
+WORKDIR /app/MsRewards
 CMD python main.py
 

README.md

@@ -1,20 +1,20 @@
 #  MsReward
 
 
-A Microsoft reward automator, designed to work headless on a raspberry pi. Tested with a pi 3b+ and a pi 4 2Gb .  
-Using a discord webhook or SQL to log points everydays.  
+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.
 
 ## If you're using docker (way easier)  
 to use docker, run 
 ```
-docker build Dockerfile
+sudo docker build .
 #copy the build id
-docker run -ti --name MsRewards [build id]
+sudo docker run -ti --name MsRewards [build id]
 ```
 Then, fill the config and start the programm everydays with 
 ```
-docker start MsRewards
+sudo docker start MsRewards
 ```
 
 ## Other configuration
@@ -29,11 +29,22 @@ You can add a link to a website where content is only the link of the monthly fi
 You should limit to 6 account per IP, and DON'T USE outlook account, they are banned.
 ![image](https://user-images.githubusercontent.com/74496300/155960737-061229ca-db8c-4e66-9aef-542d9e709bb2.png)
 
-## if you're **not** using docker 
-You have to **fill the config file**.  
+## If you're **not** using docker 
 
-you have to put your credentials in the same folder as the script, in a  `.csv` file. You have to put login and password this way : 
+installation recommandation :
 ```
-email1,password1
-email2,password2
+sudo apt-get install xdg-utils libdbus-glib-1-2 bzip2 wfrench tigervnc-standalone-server -y
+
+curl -sSLO https://download-installer.cdn.mozilla.net/pub/firefox/releases/91.9.1esr/linux-x86_64/en-US/firefox-91.9.1esr.tar.bz2
+tar -xjf firefox-91.9.1esr.tar.bz2
+sudo mv firefox /opt/
+sudo ln -s /opt/firefox/firefox /usr/bin/firefox
+
+
+curl -sSLO https://github.com/mozilla/geckodriver/releases/download/v0.31.0/geckodriver-v0.31.0-linux64.tar.gz
+tar zxf geckodriver-v0.31.0-linux64.tar.gz
+sudo mv geckodriver /usr/bin/
+
+rm geckodriver-v0.31.0-linux64.tar.gz
+rm firefox-91.9.1esr.tar.bz2
 ```

V5.py

@@ -0,0 +1,954 @@
+#!/usr/bin/python3.10
+from modules.imports import *
+from modules.db import add_to_database
+from modules.config import *
+from modules.tools import *
+from modules.error import *
+from modules.driver_tools import *
+
+global driver
+driver = None
+global _mail, _password, _otp, display
+
+# TODO : replace by a better print (with logging, cf https://realpython.com/python-logging/)
+def printf(e):
+    printf2(str(e), _mail)
+
+# TODO
+# handle "panda"'s error: error while logging in preventing some task to be done
+# 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 
+def firefox_driver(mobile=False, headless=False):
+    PC_USER_AGENT = (
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
+        "AppleWebKit/537.36 (KHTML, like Gecko)"
+        "Chrome/112.0.0.0 Safari/537.36 Edg/110.0.1587.56")
+    MOBILE_USER_AGENT = (
+        "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X)"
+        "AppleWebKit/606.0.2 (KHTML, like Gecko)"
+        "CriOS/107.0.5060.64 Mobile/15E148 Safari/604.1"
+    )
+    options = Options()
+    options.set_preference('intl.accept_languages', 'fr-FR, fr')
+    if proxy_enabled :
+        setup_proxy(proxy_address,proxy_port, options)
+    options.set_preference("browser.link.open_newwindow", 3)
+    options.set_preference("dom.confirm_repost.testing.always_accept", True)
+    if FAST :
+        options.set_preference("permissions.default.image", 2) #disable image loading. You shouldn't use it except if really nessecary 
+    if headless:
+        options.add_argument("-headless")
+    if mobile :
+        options.set_preference("general.useragent.override", MOBILE_USER_AGENT)
+        driver = webdriver.Firefox(options=options)
+        driver.set_window_size(1070 + hash(_mail)%20 , 1900 + hash(_password + "salt")%10) # mobile resolution are crazy high now, right ?
+    else :
+        options.set_preference("general.useragent.override", PC_USER_AGENT)
+        driver = webdriver.Firefox(options=options)
+        driver.set_window_size(1900 + hash(_mail)%20 , 1070 + hash(_password + "salt")%10)
+    return(driver)
+
+
+def log_error(error, ldriver=driver, log=FULL_LOG):
+    global driver
+    if ldriver is None:
+        ldriver = driver
+    if type(error) != str :
+        error = format_error(error)
+    printf(f"\n\n\033[93m Erreur : {str(error)}  \033[0m\n\n")
+    if DISCORD_ENABLED_ERROR:
+        with open("page.html", "w") as f:
+            try :
+                f.write(ldriver.page_source)
+            except :
+                f.write("the driver has closed or crashed. Can't access page content")
+        try : 
+            img = display.waitgrab()
+            img.save("screenshot.png")
+        except :
+            ldriver.save_screenshot("screenshot.png")
+        if not log:
+            embed = Embed(
+                title="An Error has occured",
+                description=str(error),
+                colour=Colour.red(),
+            )
+        else:
+            embed = Embed(
+                title="Full log is enabled",
+                description=str(error),
+                colour=Colour.blue(),
+            )
+        file = File("screenshot.png")
+        embed.set_image(url="attachment://screenshot.png")
+        embed.set_footer(text=_mail)
+        webhookFailure.send(embed=embed, file=file)
+        webhookFailure.send(file=File("page.html"))
+
+
+
+# close the tab currently on and go back to the one first, or the one specified
+def close_tab(tab, SwitchTo=0) -> None:
+    driver.switch_to.window(tab)
+    driver.close()
+    driver.switch_to.window(driver.window_handles[SwitchTo])
+
+
+# play_quiz[N]([int : override]) make the quiz with N choice each time. They usually have between 4 and 10 questions. 
+# override is the number of question, by default, it's the number of question in this specific quiz. Can be useful in some case, where the program crashes before finishing the quiz
+def play_quiz2(override=10) -> None:
+    printf("starting play_quiz2")
+    for j in range(override):
+        try:
+            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
+            answers_values = search('data-option="([^"]+)"', page_html)[1]
+            offset = int(secret_answer[-2:], 16)                                      # the last two character converted to int are the offset
+            correct_answer_value = search('correctAnswer":"([0-9]+)', page_html)[1]
+            
+            somme = 0
+            for answer in answers_values:
+                somme += ord(answer)
+
+            if somme + offset == int(correct_answer_value):
+                answer_elem = driver.find_element(By.ID, "rqAnswerOption0")
+                answer_elem.click()
+                progressBar(j, 10, name="quiz 2")
+            else:
+                answer_elem = driver.find_element(By.ID, "rqAnswerOption1")
+                answer_elem.click()
+                progressBar(j, 10, name="quiz 2")
+
+        except exceptions.ElementNotInteractableException as e:
+            driver.execute_script("arguments[0].click();", answer_elem)
+        except Exception as e:
+            log_error(e)
+            break
+    printf("play_quiz2 done")
+
+
+def play_quiz8():
+    override = len(findall("<span id=\"rqQuestionState.\" class=\"emptyCircle\"></span>", driver.page_source))+1
+    printf(f"play_quiz8 : start, override : {override}")
+    try:
+        counter = 0
+        rgpd_popup(driver)
+        for _ in range(override):  
+            custom_sleep(uniform(3, 5))
+            correct_answers = []
+            for i in range(1,9):
+                try : 
+                    element = driver.find_element(By.ID, f"rqAnswerOption{i-1}")
+                    if 'iscorrectoption="True"' in element.get_attribute("outerHTML"):
+                        correct_answers.append(f'rqAnswerOption{i-1}')
+                except Exception as e :
+                    printf(f"can't find rqAnswerOption{i-1}. Probably already clicked" + str(e))
+            shuffle(correct_answers)
+            for answer_id in correct_answers:
+                wait_until_visible(By.ID, answer_id, timeout = 20, browser=driver)
+                counter += 1
+                progressBar(counter, 16, name="Quiz 8")
+                try:
+                    answer_elem = driver.find_element(By.ID, answer_id)
+                    answer_elem.click()
+                    custom_sleep(1)
+                except exceptions.NoSuchElementException :
+                    driver.refresh()
+                    custom_sleep(10)
+                    answer_elem = driver.find_element(By.ID, answer_id)
+                    answer_elem.click()
+                except ElementClickInterceptedException :
+                    rgpd_popup(driver)
+                    correct_answers.append(answer_id)
+
+    except Exception as e:
+        log_error(f"{format_error(e)} \n Good answers : {' '.join(correct_answers)}")
+    printf("play_quiz8 : fin ")
+
+
+def play_quiz4(override=None):
+    printf("play_quiz4 : start")
+    if not override:
+        try:  # fidelity quiz are much longer than usual ones
+            override = int(findall('rqQuestionState([\d]{1,2})"', driver.page_source)[-1])
+            printf(f"Override : {override}")
+        except:
+            override = 3
+
+    try:
+        for i in range(override):
+            custom_sleep(uniform(3, 5))
+            txt = driver.page_source
+            rgpd_popup(driver)
+            answer_option = search('correctAnswer":"([^"]+)', txt)[1]
+            answer_option = answer_option.replace("\\u0027", "'")    # replace Unicode weird symbols
+            try:
+                answer_element = driver.find_element(By.CSS_SELECTOR, f'[data-option="{answer_option}"]')
+                answer_element.click()
+            except exceptions.ElementNotInteractableException:
+                driver.execute_script("arguments[0].click();", answer_element)
+
+    except Exception as e:
+        log_error(e)
+        raise ValueError(e)
+    printf("play_quiz4 : end")
+
+
+# do_poll() answer a random thing to poll, on of daily activities
+def do_poll():
+    printf("do_poll : start")
+    try:
+        try:
+            answer_elem = driver.find_element(By.ID, f"btoption{choice([0,1])}")
+            answer_elem.click()
+        except exceptions.ElementNotInteractableException:
+            driver.execute_script("arguments[0].click();", answer_elem)
+        custom_sleep(uniform(2, 2.5))
+    except Exception as error:
+        log_error(error)
+        raise ValueError(error)
+    printf("do_poll : end")
+
+
+# finds all task to do, and launch them
+def all_cards(): # return to the main page and closes all other tabs
+    def reset(part2=False): 
+        if len(driver.window_handles) == 1:
+            driver.get("https://www.bing.com/rewardsapp/flyout")
+            if part2:
+                driver.find_element(
+                    By.XPATH, "/html/body/div/div/div[3]/div[2]/div[2]/div[2]/div[1]"
+                ).click()
+        else:
+            driver.switch_to.window(driver.window_handles[1])
+            printf(f"fermeture : {driver.current_url}")
+            driver.close()
+            driver.switch_to.window(driver.window_handles[0])
+            if driver.current_url != "https://www.bing.com/rewardsapp/flyout":
+                driver.get("https://www.bing.com/rewardsapp/flyout")
+            reset(part2)
+
+    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]")
+            expanded = row_element.get_attribute("aria-expanded")
+            if expanded != "true":
+                row_element.click()
+            for i in range(3):
+                custom_sleep(uniform(3, 5))
+                try:
+                    titre = "Placeholder"
+                    driver.find_element(
+                        By.XPATH,f"/html/body/div/div/div[3]/div[2]/div[1]/div[2]/div/div[{i+1}]/a",
+                    ).click()
+                    sleep(1)
+                    titre = driver.title
+                    try_play(titre)
+                    sleep(1)
+                    reset()
+                    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")):
+                        printf(f"missed card {i}")
+                        try_play(titre)
+                        sleep(3)
+                        reset()
+                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]")
+        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(
+                By.XPATH,
+                "/html/body/div/div/div[3]/div[2]/div[2]/div[3]/div/div[1]/a/div/div[2]",
+            ).click()
+            driver.switch_to.window(driver.window_handles[len(driver.window_handles) - 1])
+            sleep(1)
+            titre = driver.title
+            printf(f"carte {titre} en cours")
+            try_play(titre)
+            reset(True)
+            sleep(1)
+            try:
+                findall('href="([^<]+)" title=""', driver.page_source)[3]  # return error if there is no cards left to do
+            except:
+                break
+
+    def top_cards():
+        for _ in range(10):
+            try :
+                driver.find_element(By.XPATH, "/html/body/div/div/div[3]/div[1]/div/div[1]/div[2]").click()
+                reset()
+            except Exception as e:
+                printf(format_error(e))
+                break
+    
+    try :
+        top_cards()
+    except Exception as e:
+        log_error(e)
+
+    try:
+        daily_cards()
+    except Exception as e:
+        log_error(e)
+
+    try :
+        weekly_cards()
+    except Exception as e:
+        log_error(e)
+
+
+# Find out which type of action to do
+def try_play(nom="inconnu"):
+    rgpd_popup(driver)
+    printf("try_play en cours")
+
+    def play(number):
+        if number == 8 or number == 9:
+            try:
+                printf(f"\033[96m Quiz 8 detected on {nom} \033[0m")
+                play_quiz8()
+                printf(f"\033[92m Quiz 8 succeeded on {nom} \033[0m")
+                custom_sleep(uniform(3, 5))
+            except Exception as e:
+                printf(f"fail of PlayQuiz 8. Aborted {e} \033[0m")
+
+        elif number == 5 or number == 4:
+            try:
+                printf(f"\033[96m Quiz 4 detected on {nom} \033[0m")
+                play_quiz4()
+                printf(f"\033[92m Quiz 4 succeeded on {nom} \033[0m")
+                custom_sleep(uniform(3, 5))
+            except Exception as e:
+                printf(f"fail of PlayQuiz 4. Aborted {e} \033[0m")
+
+        elif number == 3 or number == 2:
+            try:
+                printf(f"\033[96m Quiz 2 detected on {nom}\033[0m")
+                play_quiz2()
+                printf(f"\033[92m Quiz 2 succeeded on {nom}\033[0m")
+            except Exception as e:
+                printf(f"fail of PlayQuiz 2. Aborted {e}")
+        else:
+            log_error("There is an error. rqAnswerOption present in page but no action to do. skipping.")
+
+    try:
+        driver.find_element(By.ID, "rqStartQuiz").click()  # start the quiz
+        answer_number = driver.page_source.count("rqAnswerOption")
+        play(answer_number)
+
+    except Exception as e: # if there is no start button, an error is thrown
+        if "bt_PollRadio" in driver.page_source:
+            try:
+                printf("Poll detected")
+                rgpd_popup(driver)
+                do_poll()
+                printf("Poll succeeded")
+            except Exception as e:
+                printf(f"try_play - 1 - Poll aborted {e}")
+
+        elif "rqQuestionState" in driver.page_source:
+            try:
+                number = driver.page_source.count("rqAnswerOption")
+                printf(f"recovery détecté. quiz : {number}")
+                play(number-1)
+            except Exception as e:
+                printf(f"try_play - 2 - {e}")
+
+        elif search("([0-9]) de ([0-9]) finalisée", driver.page_source):
+            printf("fidélité")
+            rgpd_popup(driver)
+            fidelity()
+
+        else:
+            printf(f"rien à faire sur la page {nom}")
+            rgpd_popup(driver)
+            custom_sleep(uniform(3, 5))
+
+
+# login() tries to login to your Microsoft account.
+# it uses global variable _mail and _password to login
+def login(ldriver):
+    def pwd_login():    
+        printf("pwd_login : start")
+        ldriver.get("https://login.live.com")
+        custom_sleep(2)
+        wait_until_visible(By.ID, "i0116", browser = ldriver)
+        mail_elem = ldriver.find_element(By.ID, "i0116")
+        send_keys_wait(mail_elem, _mail)
+        mail_elem.send_keys(Keys.ENTER)
+        custom_sleep(2)
+        wait_until_visible(By.ID, "i0118", browser = ldriver)
+        pwd_elem = ldriver.find_element(By.ID, "i0118")
+        send_keys_wait(pwd_elem, _password)
+        pwd_elem.send_keys(Keys.ENTER)
+        custom_sleep(2)
+        if "Entrez le code de sécurité" in ldriver.page_source :
+            try : 
+                a2f_elem = ldriver.find_element(By.ID, "idTxtBx_SAOTCC_OTC")
+                a2f_elem.send_keys(_otp.now())
+                a2f_elem.send_keys(Keys.ENTER)
+            except Exception as e :
+                log_error(e)
+        custom_sleep(5)
+
+        if ('Abuse' in ldriver.current_url) : 
+            log_error("account suspended")
+            raise Banned()
+        save_cookies(driver, _mail)
+        for id in ["KmsiCheckboxField","iLooksGood", "idSIButton9", "iCancel"]:
+            try:
+                ldriver.find_element(By.ID, id).click()
+                restart = True
+            except Exception as e:
+                pass
+
+        try : 
+            body_elem = ldriver.find_element(By.TAG_NAME, "body") # in case of any random popup
+            body_elem.send_keys(Keys.ENTER)
+        except :
+            pass
+        printf("login completed - going to MsRewards")
+        custom_sleep(uniform(3,5))
+        ldriver.get("https://www.bing.com/rewardsapp/flyout")
+        custom_sleep(uniform(3,5))
+        for i in [f'[title="Rejoindre maintenant"]', f'[title="Rejoindre"]', f'[title="Join now"]'] :
+            try:
+                ldriver.find_element(By.CSS_SELECTOR, i).click()  # depend of the language of the page
+            except:
+                printf(f"element {i} not found")
+        rgpd_popup(ldriver)
+        custom_sleep(uniform(3,5))
+        ldriver.get("https://www.bing.com/rewardsapp/flyout")
+        try:
+            ldriver.find_element(By.CSS_SELECTOR, '[title="Rejoindre maintenant"]').click()  # depend of the language of the page
+        except:
+            printf(f"unlock test: fail, probably normal")
+            
+        printf('on MsRewards')
+    
+    def cookie_login():
+        ldriver.get("https://login.live.com")
+        try : 
+            load_cookies(ldriver, _mail)
+        except FileNotFoundError :
+            printf("Creating cookies file")
+            return(False)
+        try : 
+            ldriver.refresh()
+        except WebDriverException as e: # This error occurs at random time. Don't really know why
+            if "Reached error page: about:neterror?e=netTimeout" in str(e):
+                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)
+        custom_sleep(20) # TODO : remplacer par un wait_element
+        if ("account.microsoft.com" in ldriver.current_url) :
+            ldriver.get("https://bing.com")
+            custom_sleep(5)
+            ldriver.refresh()
+            rgpd_popup(ldriver)
+            ldriver.get("https://www.bing.com/rewardsapp/flyout")
+            if not('>Tableau de bord' in ldriver.page_source):
+                try : 
+                    ldriver.find_element(By.CSS_SELECTOR, "[h='ID=RewardsFlyout,2.1']").click()
+                    custom_sleep(5)
+                    if "bing.com" in ldriver.current_url :
+                        rgpd_popup(ldriver)
+                        ldriver.get("https://www.bing.com/rewardsapp/flyout")
+                        if ('>Tableau de bord' in ldriver.page_source) :
+                            return(True)
+                        else :
+                            printf("error during the connection. Trying something else")
+                except Exception as e:
+                    log_error(f"not connected 5 - error {e}", ldriver)
+                if not('>Tableau de bord' in ldriver.page_source):
+                    try : 
+                        ldriver.find_element(By.XPATH, "/html/body/div/div/div/div/div[2]/a").click()
+                        custom_sleep(5)
+                    except Exception as e:
+                        log_error(f"erreur not connected 6{e}", ldriver)
+                        return(False)
+                    if "bing.com" in ldriver.current_url :
+                        rgpd_popup(ldriver)
+                        ldriver.get("https://www.bing.com/rewardsapp/flyout")
+                        if ('>Tableau de bord' in ldriver.page_source) :
+                            return(True)
+                        else :
+                            log_error("not connected 6", ldriver)
+                            return(False)
+            return(True)
+
+        if ('account.live.com' in ldriver.current_url):
+            log_error("error 1", ldriver, True)
+            ldriver.refresh()
+            log_error("error 2", ldriver, True)
+            ldriver.get("https://bing.com")
+            ldriver.refresh()
+            rgpd_popup(ldriver)
+            log_error("error 3", ldriver, True)
+            sleep(5)
+            return(True)
+            
+        printf("cookies plus valides ?")
+        return(False)
+
+    try : 
+        if cookie_login():
+            return (ldriver.current_window_handle)
+        pwd_login() #mobile login in never called. TODO : check if it's bad.
+        return(ldriver.current_window_handle)
+    except Banned:
+        raise Banned()
+    except Exception as e:
+        log_error(e)
+        ldriver.quit()
+
+
+
+
+# Makes 30 search as PC Edge
+def bing_pc_search(override=randint(35, 40)):
+    mot = choice(Liste_de_mot).replace(" ","+")
+    driver.get(f"https://www.bing.com/search?q={mot}")  # {choice(Liste_de_mot)}')
+    custom_sleep(uniform(1, 2))
+    rgpd_popup(driver)
+    send_keys_wait(
+        driver.find_element(By.ID, "sb_form_q"),
+          Keys.BACKSPACE + Keys.BACKSPACE + Keys.BACKSPACE + Keys.BACKSPACE + Keys.BACKSPACE + Keys.BACKSPACE
+    )
+
+    for _ in range(override):
+        word = choice(Liste_de_mot)
+        try:
+            send_keys_wait(driver.find_element(By.ID, "sb_form_q"), word)
+            driver.find_element(By.ID, "sb_form_q").send_keys(Keys.ENTER)
+        except Exception as e :
+            printf(e)
+            sleep(10)
+            driver.get(f'https://www.bing.com/search?q={word}')
+            sleep(3)
+            send_keys_wait(driver.find_element(By.ID, "sb_form_q"), word)
+            driver.find_element(By.ID, "sb_form_q").send_keys(Keys.ENTER)
+
+        custom_sleep(uniform(5, 20))
+
+        try:
+            driver.find_element(By.ID, "sb_form_q").clear()
+        except Exception as e:
+            printf(e)
+            try:
+                driver.get('https://www.bing.com/search?q=plans')
+                driver.find_element(By.ID, "sb_form_q").clear()
+            except Exception as e:
+                log_error(f"clear la barre de recherche - {format_error(e)}")
+
+
+
+# Unban an account, called with -u parameter. You will need a phone number
+def unban() -> None:
+    driver.find_element(By.ID, "StartAction").click()
+    custom_sleep(2)
+    txt = driver.page_source
+    uuid0 = findall('wlspispHIPCountrySelect([a-z0-9]+)', txt)[0]
+    uuid1 = findall('wlspispHIPPhoneInput([a-z0-9]+)', txt)[0]
+    uuid2 = findall('wlspispHipSendCode([a-z0-9]+)', txt)[0]
+    uuid3 = findall('wlspispSolutionElement([a-z0-9]+)', txt)[0]
+    country_code_select = Select(driver.find_element(By.ID, "wlspispHIPCountrySelect" + uuid0))
+    country_code_input = input("enter Country code (FR, ...) ")
+    country_code_select.select_by_value(country_code_input)
+    wait_until_visible(By.ID, "wlspispHIPPhoneInput" + uuid1, browser=driver)
+    phone_input = input("phone number : +33")
+    phone_elem = driver.find_element(By.ID, "wlspispHIPPhoneInput" + uuid1)
+    phone_elem.send_keys(phone_input)
+    wait_until_visible(By.ID, "wlspispHipSendCode" + uuid2, browser=driver)
+    send_sms_elem = driver.find_element(By.ID, "wlspispHipSendCode" + uuid2)
+    send_sms_elem.click()
+    wait_until_visible(By.ID, "wlspispSolutionElement" + uuid3, browser=driver)
+    sms_code_elem = driver.find_element(By.ID, "wlspispSolutionElement" + uuid3)
+    sms_code_input = input("entrez le contenu du msg : ")
+    sms_code_elem.send_keys(sms_code_input)
+    send_box = driver.find_element(By.ID, "ProofAction")
+    send_box.click()
+    wait_until_visible(By.ID, "FinishAction", browser=driver)
+    end_elem = driver.find_element(By.ID, "FinishAction")
+    end_elem.click()
+
+
+# Sends points to database, discord and whatever service you want
+def log_points(account="unknown"): 
+    def get_points():
+        driver.get("https://www.bing.com/rewardsapp/flyout")
+        regex1 = '<a href="https://rewards\.bing\.com/" title="((.{1,3}),(.{1,3})) points" target="_blank"'
+        try:
+            point = search(regex1, driver.page_source)[1].replace(",", "")
+
+        except Exception as e:
+            elem = driver.find_element(By.CSS_SELECTOR, '[title="Microsoft Rewards"]')
+            elem.click()
+            custom_sleep(5)
+            driver.switch_to.window(driver.window_handles[len(driver.window_handles) - 1])
+            custom_sleep(uniform(5,7))
+            try : 
+                point = search('availablePoints":([\d]+)', driver.page_source)[1]
+            except :
+                driver.refresh()
+                sleep(5)
+                point = search('availablePoints":([\d]+)', driver.page_source)[1]
+        return(point)
+
+    for _ in range (3):
+        try : 
+            points = get_points()
+            break
+        except Exception as e:
+            custom_sleep(300)
+            log_error(e)
+            points = None
+            
+    if not points : 
+        log_error(f"impossible d'avoir les points")
+
+    custom_sleep(uniform(3, 20))
+    account_name = account.split("@")[0]
+
+    if DISCORD_ENABLED_SUCCESS:
+        if DISCORD_EMBED:
+            embed = Embed(
+                title=f"{account_name} actuellement à {str(points)} points", colour=Colour.green()
+            )
+            embed.set_footer(text=account_name)
+            webhookSuccess.send(embed=embed)
+        else:
+            webhookSuccess.send(f"{account_name} actuellement à {str(points)} points")
+
+    if sql_enabled :
+        add_to_database(account_name, points, sql_host, sql_usr, sql_pwd, sql_database)
+
+
+def fidelity():
+    try:
+        while 1: #close all tabs
+            try:
+                close_tab(1)
+            except:
+                break
+        try : 
+            fidelity_link_page = get(FidelityLink) #get the url of fidelity page
+        except Exception as e :
+            printf(e)
+            fidelity_link_page = False
+
+        if fidelity_link_page : 
+            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 : 
+                    choix = driver.find_element(By.CSS_SELECTOR, 'div[class="pull-left spacer-48-bottom punchcard-row"]')  # pull-left spacer-48-bottom punchcard-row? USELESS ?
+                except : # tentative de fix
+                    driver.refresh()
+                    choix = driver.find_element(By.CSS_SELECTOR, 'div[class="pull-left spacer-48-bottom punchcard-row"]')
+                answer_number = search("([0-9]) of ([0-9]) completed", driver.page_source)
+                if answer_number is None:
+                    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 = [0,0,0]
+
+                for _ in range(int(answer_number[2]) - int(answer_number[1])):
+                    driver.refresh()
+                    custom_sleep(2)
+                    card_elem = driver.find_element(By.CLASS_NAME, "spacer-48-bottom")
+                    try : 
+                        button_text = search('<span class="pull-left margin-right-15">([^<^>]+)</span>',card_elem.get_attribute("innerHTML"))[1]
+                        bouton_card = driver.find_element(By.XPATH, f'//span[text()="{button_text}"]')
+                        bouton_card.click()
+                    except Exception as e1 :
+                        try : 
+                            recover_elem = driver.find_element(By.XPATH,'/html/body/div[1]/div[2]/main/div[2]/div[2]/div[7]/div[3]/div[1]/a')
+                            recover_elem.click()
+                        except Exception as e2 :
+                            log_error(f"fidélité - double erreur - e1 : {format_error(e1)} - e2 {format_error(e2)}")
+                            break
+                    custom_sleep(uniform(3, 5))
+                    driver.switch_to.window(driver.window_handles[1])
+                    try_play(driver.title)
+                    driver.get(fidelity_link) # USELESS ?
+                    custom_sleep(uniform(3, 5))
+                    try:
+                        close_tab(driver.window_handles[1])
+                    except Exception as e:
+                        printf(e)
+                printf("fidelity - done")
+            else :
+                printf("invalid fidelity link.")
+    except Exception as e:
+        log_error(e)
+
+
+def mobile_login_pwd(error):
+    try:
+        # TODO 
+        # seems fine, check if there are no issues NO
+        mot = choice(Liste_de_mot).replace(" ","+")
+        mobile_driver.get(f"https://www.bing.com/search?q={mot}")
+        rgpd_popup(mobile_driver)
+        printf("start of Mobile login")
+        try :
+            mobile_driver.find_element(By.ID, "mHamburger").click()
+        except Exception as e :
+            elm = mobile_driver.find_element(By.ID, "mHamburger") 
+            mobile_driver.execute_script("arguments[0].scrollIntoView();", elm)
+            mobile_driver.find_element(By.ID, "mHamburger").click()
+
+        wait_until_visible(By.ID, "hb_s", browser=mobile_driver)
+        mobile_driver.find_element(By.ID, "hb_s").click()
+        wait_until_visible(By.ID, "i0116", browser=mobile_driver)
+        mail_elem = mobile_driver.find_element(By.ID, "i0116")
+        send_keys_wait(mail_elem, _mail)
+        mail_elem.send_keys(Keys.ENTER)
+        wait_until_visible(By.ID, "i0118", browser=mobile_driver)
+        pwd_elem = mobile_driver.find_element(By.ID, "i0118")
+        send_keys_wait(pwd_elem, _password)
+        pwd_elem.send_keys(Keys.ENTER)
+        custom_sleep(uniform(1, 2))
+        if "Entrez le code de sécurité" in driver.page_source :
+            try : 
+                a2f_elem = mobile_driver.find_element(By.ID, "idTxtBx_SAOTCC_OTC")
+                a2f_elem.send_keys(_otp.now())
+                a2f_elem.send_keys(Keys.ENTER)
+            except Exception as e :
+                log_error(e)
+        custom_sleep(uniform(1, 2))        
+        for i in ["KmsiCheckboxField", "iLooksGood", "idSIButton9"]:
+            try:
+                mobile_driver.find_element(By.ID,i ).click()
+            except Exception as e:
+                pass
+
+        printf("end of Mobile login")
+
+    except Exception as e:
+        error += 1
+        if error <= 3:
+            printf(f"failure on mobile_login. Retrying({error}/3), {e}")
+            custom_sleep(uniform(5, 10))
+            mobile_login_pwd(error)
+        else:
+            log_error(f"login impossible 3 fois de suite. {e}", mobile_driver)
+            mobile_driver.quit()
+            return(True)
+
+
+def mobile_alert_popup():
+    try:
+        alert = mobile_driver.switch_to.alert
+        alert.dismiss()
+    except exceptions.NoAlertPresentException as e:
+        pass
+    except Exception as e:
+        log_error(e, mobile_driver)
+
+
+def bing_mobile_search(override=randint(22, 25)):
+    global mobile_driver
+    mobile_driver = firefox_driver(mobile=True)
+    try:
+        login(mobile_driver)
+        mot = choice(Liste_de_mot).replace(" ","+")
+        mobile_driver.get(f"https://www.bing.com/search?q={mot}")
+        custom_sleep(uniform(1, 2))
+        rgpd_popup(mobile_driver)
+        custom_sleep(uniform(1, 1.5))
+        for i in range(override):  # 20
+            try :
+                mot = choice(Liste_de_mot)
+                send_keys_wait(mobile_driver.find_element(By.ID, "sb_form_q"), mot)
+                mobile_driver.find_element(By.ID, "sb_form_q").send_keys(Keys.ENTER)
+                custom_sleep(uniform(5, 20))
+                mobile_alert_popup()  # check for alert (asking for position or for allowing notifications)
+                mobile_driver.find_element(By.ID, "sb_form_q").clear()
+            except Exception as e:
+                printf(e)
+                mobile_driver.refresh()
+                custom_sleep(30)
+                i -= 1
+        mobile_driver.quit()
+
+    except Exception as e:
+        log_error(e, mobile_driver)
+        mobile_driver.quit()
+
+
+def daily_routine(custom = False):
+    try : 
+        if not custom: # custom already login 
+            login(driver)
+    except Banned :
+        log_error("THIS ACCOUNT IS BANNED. FIX THIS ISSUE WITH -U")
+        return()
+
+    try:
+        all_cards()
+    except Exception as e:
+        log_error(e)
+
+    try:
+        fidelity()
+    except Exception as e:
+        log_error(e)
+
+    try:
+        bing_pc_search()
+    except Exception as e:
+        log_error(e)
+        
+    try:
+        bing_mobile_search()
+    except Exception as e:
+        log_error(e)
+
+
+    try:
+        log_points(_mail)
+    except Exception as e:
+        log_error(e)
+
+
+def dev():
+    pass
+
+
+def CustomStart(Credentials):
+    global START_TIME
+    if not LINUX_HOST :
+        raise NameError('You need to be on linux to do that, due to the utilisation of a module named enquieries, sorry.') 
+    global driver, _mail, _password, p, _otp
+
+    system("clear")  # clear from previous command to allow a clean choice
+    actions = ["tout", "daily", "pc", "mobile", "log_points","fidelity", "dev"]
+    Actions = enquiries.choose("quels Actions ?", actions, multi=True)
+    liste = select_accounts()
+    START_TIME = time() # Reset timer to the start of the actions
+
+    for cred in liste:
+        _mail = cred[0]
+        _password = cred[1]
+        if len(cred) == 3:
+            _otp = TOTP(cred[2])
+
+        driver = firefox_driver()
+        driver.implicitly_wait(3)
+
+        if login(driver) != "STOP":
+            if "tout" in Actions:
+                daily_routine(True)
+            if "daily" in Actions:
+                try:
+                    all_cards()
+                except Exception as e:
+                    log_error(e)
+            if "pc" in Actions:
+                try:
+                    bing_pc_search()
+                except Exception as e:
+                    log_error(e)
+            if "mobile" in Actions:
+                try:
+                    bing_mobile_search()
+                except Exception as e:
+                    log_error(e)
+            if "fidelity" in Actions:
+                try :
+                    fidelity()
+                except Exception as e :
+                    log_error(e)
+            if "dev" in Actions:
+                try:
+                    dev()
+                except Exception as e:
+                    printf(e)
+                    break
+            if not "tout" in Actions:
+                try:
+                    log_points(_mail)
+                except Exception as e:
+                    printf(f"CustomStart {e}")
+            driver.close()
+
+
+
+if VNC_ENABLED : 
+    display = SmartDisplay(backend="xvnc", size=(2160, 2160), rfbport=VNC_PORT, color_depth=24) 
+else :
+    display = SmartDisplay(size=(2160, 2160)) 
+display.start()
+
+
+if CUSTOM_START:
+        CustomStart(Credentials)
+elif UNBAN:
+    _mail, _password  = select_accounts(False)[0]
+    driver = firefox_driver()
+    try : 
+        login(driver)
+    except Banned:
+        unban()
+
+    driver.quit()
+elif POINTS_FILE != "":
+    save_points_from_file(POINTS_FILE)
+else:
+    for cred in Credentials:
+        _mail = cred[0]
+        _password = cred[1]
+        if len(cred) == 3:
+            _otp = TOTP(cred[2])
+        printf("\n\n")
+        printf(_mail)
+        custom_sleep(1)
+        printf("début du driver")
+        driver = firefox_driver()
+        printf("driver demarré")
+        driver.implicitly_wait(3)
+        try:
+            daily_routine()
+            driver.quit()
+            attente = uniform(1200, 3600)
+            printf(f"finis. attente de {round(attente/60)}min")
+            custom_sleep(attente)
+        except KeyboardInterrupt:
+            printf("canceled. Closing driver and display.")
+            driver.quit()
+            display.stop()
+        except Exception as e:
+            printf(f"error not catched. skipping this account. {e}")
+            driver.quit()
+
+display.stop()

database.py

@@ -0,0 +1,72 @@
+import mysql.connector
+import configparser
+from os import path
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument(
+    "-f", 
+    "--file", 
+    help="Choose a file", 
+    type=argparse.FileType('r')
+)
+
+args = parser.parse_args()
+
+
+config_path = "./user_data/config.cfg"
+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"]
+
+
+mydb = mysql.connector.connect(
+    host=sql_host,
+    user=sql_usr,
+    password=sql_pwd,
+    database = sql_database
+)
+mycursor = mydb.cursor()
+
+def add_account(name: str, endroit: str, proprio: str):
+    command = f'INSERT INTO comptes (compte, proprio, endroit, last_pts) VALUES ("{name}", "{proprio}", "{endroit}",0);'
+    mycursor.execute(command)
+
+
+def ban_account(name: str, pts = 0):
+
+    command1 = f"INSERT INTO banned (nom, total) VALUES ('{name}', {pts});"
+    command2 = f'DELETE FROM comptes WHERE compte = "{name}";'
+    mycursor.execute(command1)
+    mycursor.execute(command2)
+
+def update_pts(name: str, pts = 0):
+    pass
+
+
+print("ajouter un compte : 1\nban un compte : 2")
+i = input()
+if i == "1":
+    if args.file :
+        l =[x.split(",")[0].split("@")[0] for x in args.file.readlines()] 
+        endroit = input("ou est le bot ? ")
+        proprio = input("qui est le proprio ? ")
+        for name in l :
+            add_account(name, endroit, proprio)
+    else : 
+        name = input("quel est le nom ? ").split("@")[0]
+        endroit = input("ou est le bot ? ")
+        proprio = input("qui est le proprio ? ")
+        add_account(name, endroit, proprio)
+elif i == '2':
+    name = input("quel est le compte qui a été ban ? ")
+    pts = input("il avait combien de points ? ")
+    ban_account(name, pts)
+
+mydb.commit()
+mycursor.close()
+mydb.close()

liste.txt

@@ -1 +0,0 @@
-you,have,to,add,a,lots,of,words,like,this,separated,with,a,coma

main.py

@@ -1,11 +1,23 @@
 #/usr/bin/python3.10
-
+from packaging.version import parse as parse_version
 import configparser
 import os 
-print
-config_path = f"{os.path.abspath( os.path.dirname( __file__ ) )}/config"
+import shutil
+import requests
+
+
+
 config = configparser.ConfigParser()
-config.read(config_path)
+
+try : 
+    config_path = f"{os.path.abspath( os.path.dirname( __file__ ) )}/user_data/config.cfg"
+    if config.read(config_path)==[] :
+        raise NameError("le fichier n'existe pas")
+except :
+    default_config = f"{os.path.abspath( os.path.dirname( __file__ ) )}/user_data/config.default"
+    shutil.copyfile(default_config, config_path)
+    config.read(config_path)
+
 
 def confirm(texte, default = False):
     if default : 
@@ -27,23 +39,22 @@ lang = "fr"
 text = {"fr" : {
     "compte" : "entrer l'adresse mail du compte ", 
     "mdp" : "entrez le mot de passe du compte ",
-    "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 ?",
-    "lien" : "entrez le lien",
-    "discorde" : "voulez vous envoyer les points sur discord ?",
-    "w1" : "entrez le lien du WebHook pour envoyer les points (https://support.discord.com/hc/fr/articles/228383668-Utiliser-les-Webhooks)",
-    "w2" : "entrez le lien du WebHook pour envoyer les erreurs",
-    "msqle" : "voulez vous untiliser 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",
-    "msqlt" : "entrez le nom de la table de la base de donnée",
-    "proxye" : "voulez vous utiliser un proxy",
-    "proxyl" : "entrez le lien du proxy",
-    "proxyp" : "entrez le port du proxy"
-
+    "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 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 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 ",
+    "msqlt" : "entrez le nom de la table de la base de donnée ",
+    "proxye" : "voulez vous utiliser un proxy ",
+    "proxyl" : "entrez le lien du proxy ",
+    "proxyp" : "entrez le port du proxy "
     }
     }
 
@@ -63,25 +74,30 @@ def setup_comptes():
         if confirm(t["next"], default = True):
             compte = input(t["compte"])
             mdp = input(t["mdp"])
-            lc.append(f"{compte},{mdp}\n")
+            lc.append(f"{compte},{mdp}")
         else:
             print(t["finc"])
             break
-    f = open('./login.csv', "w")
+    f = open('./user_data/login.csv', "w")
     for i in lc :
         f.write(i)
+        f.write("\n")
     f.close()
     print(t["ajout"])
-
-    #modifie le fichier de configuration
-    edit_config(3,f'{os.getcwd()}/login.csv')
+    edit_config_txt("logpath",f'{os.getcwd()}/user_data/login.csv')
 
 
-def edit_config(ligne, contenu):
+def edit_config_txt(ligne, contenu):
     f = open(config_path, "r")
     txt = f.readlines()
-    txt[ligne] = f'{txt[ligne].split("=")[0]}= {contenu}\n'
     f.close()
+    if txt.count(txt) >1:
+        raise NameError("il y a plus d'une occurence, echec de la modification")
+    
+    for i in range(len(txt)) :
+        name = txt[i].split(" = ")[0]
+        if name == ligne:
+            txt[i] = name + " = " + str(contenu) + "\n"
 
     f = open(config_path, "w")
     for i in txt :
@@ -95,45 +111,71 @@ def setup_settings():
     proxy()
     sql()
 
+
 def general():
     if confirm(t["fidelity"]):
         lien = input(t["lien"])
-        edit_config(7,lien)
+        edit_config_txt('FidelityLink',lien)
+    
 
 def discord():
     enabled = confirm(t["discorde"], default = True)
     if enabled : 
-        edit_config(13, True)
+        edit_config_txt("DiscordErrorEnabled", True)
+        
+        edit_config_txt('DiscordSuccessEnabled', confirm("send success ?", default = True))
         w1 = input(t["w1"])
-        edit_config(14,w1)
+        edit_config_txt("successlink",w1)
         w2 = input(t["w2"])
-        edit_config(15,w2)
+        edit_config_txt("errorlink",w2)
+        
         
 def sql() :
     enabled = confirm(t["msqle"], default = False)
     if enabled : 
-        edit_config(25, True)
+        edit_config_txt("sql_enabled", True)
         lien = input(t["msqll"])
-        edit_config(26,lien)
+        edit_config_txt("host",lien)
         table = input(t["msqlt"])
-        edit_config(27,table)
+        edit_config_txt("database",table)
         user = input(t["msqlu"])
-        edit_config(28,user)
+        edit_config_txt("usr",user)
         pwd = input(t["msqlp"])
-        edit_config(29,pwd)
+        edit_config_txt("pwd",pwd)
+
 
 def proxy() :
     enabled = confirm(t["proxye"], default = False)
     if enabled : 
-        edit_config(19, True)
+        edit_config_txt("proxy_enabled", True)
         lien = input(t["proxyl"])
-        edit_config(20,lien)
+        edit_config_txt("url",lien)
         port = input(t["proxyp"])
-        edit_config(21,port)
+        edit_config_txt("port",port)
+
+
+def check_update():
+    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 ()
+    f = open("./version", 'r')
+    txt = f.readlines()[0].replace("\n","")
+    f.close()
+    cur = parse_version(txt)
+    if (cur < latest) :
+        print("Already up to date.")
+    else :
+        print(f"updating to {latest}")
+        os.system("git pull")
+        print("updated")
 
 
 LogPath = config["PATH"]["logpath"]
 if LogPath == "/your/path/to/loginandpass.csv" :
     setup()
 else :
-    os.system("python3.10 V4.py")
+    check_update()
+    os.system("python3 V5.py")

manual_claim.py

@@ -0,0 +1,69 @@
+from easyprocess import EasyProcess
+from pyvirtualdisplay import Display
+from modules.config import *
+from selenium import webdriver
+from selenium.common import exceptions
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.firefox.options import Options
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select
+
+
+def setup_proxy(ip, port, options, socks=False) :
+    PROXY = f"{ip}:{port}"
+    if socks :
+        options.set_preference('network.proxy.type', 1)
+        options.set_preference('network.proxy.socks', ip)
+        options.set_preference('network.proxy.socks_port', int(port))
+        options.set_preference("browser.link.open_newwindow", 3)
+    else :
+        webdriver.DesiredCapabilities.FIREFOX['proxy'] = {
+            "httpProxy": PROXY,
+            "sslProxy": PROXY,
+            "proxyType": "MANUAL",
+        }
+
+def firefox_driver(mobile=False, Headless=False):
+    PC_USER_AGENT = (
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
+        "AppleWebKit/537.36 (KHTML, like Gecko)"
+        "Chrome/110.0.0.0 Safari/537.36 Edg/110.0.1587.56")
+    MOBILE_USER_AGENT = (
+        "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X)"
+        "AppleWebKit/605.1.15 (KHTML, like Gecko)"
+        "CriOS/103.0.5060.63 Mobile/15E148 Safari/604.1"
+    )
+    
+    options = Options()
+    options.set_preference('intl.accept_languages', 'fr-FR, fr')
+    if proxy_enabled :
+        setup_proxy(proxy_address,proxy_port, options)
+    options.set_preference("browser.link.open_newwindow", 3)
+    if FAST :
+        options.set_preference("permissions.default.image", 2) #disable image loading. May add this without the fast option soon
+    if Headless:
+        options.add_argument("-headless")
+    if mobile :
+        options.set_preference("general.useragent.override", MOBILE_USER_AGENT)
+    else :
+        options.set_preference("general.useragent.override", PC_USER_AGENT)
+    driver = webdriver.Firefox(options=options)
+    driver.set_window_size(1900 + hash(_mail)%20 , 1070 + hash(_password + "salt")%10)
+    return(driver)
+
+def select_accounts(multiple = True):
+    system("clear")  # clear from previous command to allow a clean choice
+    emails = [x[0] for x in Credentials]  # list of all email adresses
+    emails_selected = enquiries.choose(f"quel{'s' if multiple else ''} compte{'s' if multiple else ''} ?", emails, multi=multiple)
+    return([x for x in Credentials if x[0] in emails_selected])
+
+
+
+with Display(backend="xvnc", size=(2000, 1000), rfbport=5904) as disp:
+    _mail, _password  = select_accounts(False)[0]
+    driver = firefox_driver()
+    print(f"connect via VNC to port 5904. \nID: {_mail}\npwd : {_password}")
+    i = input('stop ? ')
+    driver.close()

modules/config.py

@@ -0,0 +1,167 @@
+#!/usr/bin/python3.10
+import configparser
+from csv import reader
+from os import sys, system, path
+from sys import platform
+import argparse
+from discord import (  # Importing discord.Webhook and discord.RequestsWebhookAdapter
+    RequestsWebhookAdapter,
+    Webhook,
+    Colour,
+)
+
+from time import time
+from random import shuffle
+
+"""
+Setup for option, like --override or --fulllog
+"""
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument(
+    "-o", 
+    "--override", 
+    help="override", 
+    dest="override", 
+    action="store_true"
+)
+
+parser.add_argument(
+    "-u", 
+    "--unban", 
+    help="unban an account", 
+    dest="unban", 
+    action="store_true"
+)
+
+parser.add_argument(
+    "-l",
+    "--log", 
+    dest="log", 
+    help="enable logging in terminal", 
+    action="store_true"
+)
+
+parser.add_argument(
+    "-fl",
+    "--fulllog",
+    dest="fulllog",
+    help="enable full logging in discord",
+    action="store_true",
+)
+parser.add_argument(
+    "-r", 
+    "--risky", 
+    help="make the program faster, probably better risk of ban", 
+    dest="fast", 
+    action="store_true"
+)
+
+parser.add_argument(
+    "-c", 
+    "--config", 
+    help="Choose a specific config file", 
+    type=argparse.FileType('r')
+)
+
+parser.add_argument(
+    "-a", 
+    "--add-points", 
+    help="Add points to the database from a file and exit",
+    dest="points_file",
+    default=""
+)
+
+parser.add_argument( 
+    "-v", 
+    "--vnc",
+    help="enable VNC",
+    dest="vnc",
+    default="None"
+)
+
+args = parser.parse_args()
+
+CUSTOM_START = args.override
+UNBAN = args.unban
+LOG = args.log
+FULL_LOG = args.fulllog
+FAST = args.fast
+if CUSTOM_START :
+    LOG = True
+VNC_ENABLED = args.vnc != "None"
+VNC_PORT = args.vnc
+POINTS_FILE = args.points_file
+
+# 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()
+
+
+if LINUX_HOST:
+    import enquiries
+else:
+    system("")  # enable colors in windows cmd
+
+#reading configuration
+
+config_path = f"{path.abspath(path.dirname(path.dirname( __file__ )))}/user_data/config.cfg"
+if args.config :
+    config_path = path.abspath(args.config.name)
+
+
+
+config = configparser.ConfigParser()
+config.read(config_path)
+
+# path configurations
+MotPath = config["PATH"]["motpath"]
+CREDENTIALS_PATH = config["PATH"]["logpath"]
+
+
+# discord configuration
+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"
+
+if DISCORD_ENABLED_ERROR:
+    webhookFailure = Webhook.from_url(DISCORD_ERROR_LINK, adapter=RequestsWebhookAdapter())
+if DISCORD_ENABLED_SUCCESS:
+    webhookSuccess = Webhook.from_url(DISCORD_SUCCESS_LINK, adapter=RequestsWebhookAdapter())
+
+# base settings
+FidelityLink = config["SETTINGS"]["FidelityLink"]
+DISCORD_EMBED = config["SETTINGS"]["embeds"] == "True" #print new point value in an embed
+Headless = config["SETTINGS"]["headless"] == "True"
+
+# proxy settings
+proxy_enabled = config["PROXY"]["proxy_enabled"] == "True"
+proxy_address = config["PROXY"]["url"]
+proxy_port = config["PROXY"]["port"]
+
+# MySQL settings
+sql_enabled = config["SQL"]["sql_enabled"] == "True"
+sql_usr = config["SQL"]["usr"]
+sql_pwd = config["SQL"]["pwd"]
+sql_host = config["SQL"]["host"]
+sql_database = config["SQL"]["database"]
+
+# Other settings 
+IPV6_CHECKED = config["OTHER"]["ipv6"]
+
+
+g = open(MotPath, "r", encoding="utf-8")
+lines = g.readlines()
+if len(lines) < 3 : 
+    Liste_de_mot = list(lines[0].split(","))
+else :
+    Liste_de_mot = [x.replace('\n', "") for x in lines]
+g.close()
+
+
+with open(CREDENTIALS_PATH) as f:
+    reader = reader(f)
+    Credentials = list(reader)
+shuffle(Credentials)

modules/db.py

@@ -0,0 +1,70 @@
+import mysql.connector
+
+
+def add_row(compte, points, mycursor, mydb):
+    sql = "INSERT INTO daily (compte, points, date) VALUES (%s, %s, current_date())"
+    val = (compte, points)
+    mycursor.execute(sql, val)
+    mydb.commit()
+    #printf(mycursor.rowcount, "record created.")
+
+
+def update_row(compte, points, mycursor, mydb):
+    sql = f"UPDATE daily SET points = {points} WHERE compte = '{compte}' AND date = current_date() ;"
+    mycursor.execute(sql)
+    mydb.commit()
+    #printf(mycursor.rowcount, "record(s) updated")
+
+
+def update_last(compte, points, mycursor, mydb):
+    sql = f"UPDATE comptes SET last_pts = {points} WHERE compte = '{compte}';"
+    mycursor.execute(sql)
+    mydb.commit()
+    #printf(mycursor.rowcount, "record(s) updated")
+
+
+def get_row(compte, points, mycursor, same_points = True): #return if there is a line with the same ammount of point or with the same name as well as the same day
+    if same_points :
+        mycursor.execute(f"SELECT * FROM daily WHERE points = {points} AND compte = '{compte}' AND date = current_date() ;")
+    else :
+        mycursor.execute(f"SELECT * FROM daily WHERE compte = '{compte}' AND date = current_date() ;")
+    myresult = mycursor.fetchall()
+    return(len(myresult) == 1)
+
+
+def add_to_database(compte, points, sql_host,sql_usr,sql_pwd,sql_database, save_if_fail=True):
+    if points is None:
+        pass
+    else:
+        try:
+            mydb = mysql.connector.connect(
+                host=sql_host,
+                user=sql_usr,
+                password=sql_pwd,
+                database = sql_database
+            )
+            mycursor = mydb.cursor()
+
+            if get_row(compte, points,mycursor, True): #check if the row exist with the same ammount of points and do nothind if it does
+                #printf("les points sont deja bon")
+                #return(0)
+                pass
+            elif get_row(compte, points,mycursor, False) : #check if the row exist, but without the same ammount of points and update the point account then
+                update_row(compte, points,mycursor,mydb)
+                #printf("row updated")
+                #return(1)
+            else : # if the row don't exist, create it with the good ammount of points
+                add_row(compte, points,mycursor,mydb)
+                #return(2) #printf("row added")
+            if int(points) > 10 :
+                update_last(compte, points, mycursor, mydb)
+
+            mycursor.close()
+            mydb.close()
+        except BaseException as e:
+            if save_if_fail:
+                print("\nLes points n'ont pas pu être ajoutés, enregistrement dans le fichier 'points.csv'\n")
+                with open("points.csv", "a") as file:
+                    file.write(f"{compte},{points}\n")
+            raise e
+

modules/driver_tools.py

@@ -0,0 +1,57 @@
+from modules.imports import *
+from modules.config import *
+
+
+def setup_proxy(ip, port, options, socks=False) :
+    PROXY = f"{ip}:{port}"
+    if socks :
+        options.set_preference('network.proxy.type', 1)
+        options.set_preference('network.proxy.socks', ip)
+        options.set_preference('network.proxy.socks_port', int(port))
+        options.set_preference("browser.link.open_newwindow", 3)
+    else :
+        webdriver.DesiredCapabilities.FIREFOX['proxy'] = {
+            "httpProxy": PROXY,
+            "sslProxy": PROXY,
+            "proxyType": "MANUAL",
+        }
+
+#Deal with rgpd popup as well as some random popup like 'are you satisfied' one
+def rgpd_popup(driver) -> None:
+    for i in ["bnp_btn_accept", "bnp_hfly_cta2", "bnp_hfly_close"] :
+        try:
+            driver.find_element(By.ID, i).click()
+        except:
+            pass
+
+# save webdriver cookies
+def save_cookies(driver, _mail):
+    pickle.dump(driver.get_cookies(), open(f"{'/'.join(__file__.split('/')[:-2])}/user_data/cookies/{_mail}.pkl", "wb"))
+
+# load cookies previously saved to the driver
+def load_cookies(driver, _mail):
+    cookies = pickle.load(open(f"{'/'.join(__file__.split('/')[:-2])}/user_data/cookies/{_mail}.pkl", "rb"))
+    for cookie in cookies:
+        driver.add_cookie(cookie)
+
+"""
+send_keys_wait([selenium element:element, str:keys]) send the different keys to the field element, with a random time between each press to simulate human action.
+keys can be an string, but also selenium keys
+"""
+def send_keys_wait(element, keys):
+    for i in keys:
+        element.send_keys(i)
+        if FAST :
+            pass
+        else :
+            sleep(uniform(0.1, 0.3))
+
+
+
+# Wait for the presence of the element identifier or [timeout]s
+def wait_until_visible(search_by: str, identifier: str, timeout = 20, browser = None) -> None:
+    try :
+        WebDriverWait(browser, timeout).until(EC.visibility_of_element_located((search_by,identifier)), "element not found")
+    except TimeoutException as e:
+        print(f"element not found after {timeout}s")
+

modules/error.py

@@ -0,0 +1,5 @@
+class Banned(Exception):
+    pass
+
+class NotBanned(Exception):
+    pass

modules/imports.py

@@ -0,0 +1,24 @@
+import asyncio
+import csv
+from os import sys, system, path
+from random import choice, randint, shuffle, uniform
+from re import findall, search
+from sys import platform
+from time import sleep
+from requests import get
+from selenium import webdriver
+from selenium.common import exceptions
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.firefox.options import Options
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select
+from selenium.common.exceptions import WebDriverException, TimeoutException, NoSuchElementException, ElementClickInterceptedException
+
+from pyotp import TOTP
+from pyvirtualdisplay import Display
+from pyvirtualdisplay.smartdisplay import SmartDisplay
+import pickle
+from datetime import timedelta, datetime
+from discord import Embed, Colour, File

modules/tools.py

@@ -0,0 +1,83 @@
+from modules.imports import *
+from modules.config import *
+
+
+# add the time arround the text given in [text]&
+def Timer(text: str, mail: str) -> str:
+    return(f"[{mail} - {datetime.today().strftime('%d-%m-%Y')} - {timedelta(seconds = round(float(time() - START_TIME)))}] " + str(text))
+
+
+# replace the function print, with more options
+# [txt] : string, [driver] : selenium webdriver
+def printf2(txt, mail, LOG = LOG):
+    print(Timer(txt, mail))
+
+
+
+# check if the user is using IPV4 using ipify.org
+# [driver] : selenium webdriver
+# never used here
+# can be useful as Ms had issues with IPV6 at some point
+def check_ipv4(driver):
+    driver.get("https://api64.ipify.org")
+    elm = driver.find_element(By.TAG_NAME, "body")
+    if len(elm.text.split('.')) == 4 :
+        return True
+    return False
+
+
+
+def custom_sleep(temps):
+    try : 
+        if FAST and temps > 50:
+            sleep(temps/10)
+        elif LOG: #only print sleep when user see it
+            points = ["⢿", "⣻", "⣽", "⣾", "⣷", "⣯", "⣟", "⡿"]
+            passe = 0
+            for i in range(int(temps)):
+                for i in range(8):
+                    sleep(0.125)
+                    passe += 0.125
+                    print(f"{points[i]}  -  {round(float(temps) - passe, 3)}", end="\r")
+            print("                        ", end="\r")
+        else:
+            sleep(temps)
+    except KeyboardInterrupt :
+        print("attente annulée")
+
+
+def format_error(e) -> str:
+    tb = e.__traceback__
+    txt = ""
+    while tb != None :
+        txt = txt + f" -> {tb.tb_frame.f_code.co_name} ({tb.tb_lineno}) "
+        tb = tb.tb_next
+    return(txt + "\n" + str(e))
+
+
+def progressBar(current, total=30, barLength=20, name="Progress"):
+    percent = float(current + 1) * 100 / total
+    arrow = "-" * int(percent / 100 * barLength - 1) + ">"
+    spaces = " " * (barLength - len(arrow))
+    print(name + ": [%s%s] %d %%" % (arrow, spaces, percent), end="\r")
+
+
+def save_points_from_file(file):
+    with open(file) as f:
+        reader = csv.reader(f)
+        points_list = list(reader)
+
+    for item in points_list:
+        compte, points = item[0], item[1]
+        add_to_database(compte, points, sql_host,sql_usr,sql_pwd,sql_database, save_if_fail=False)
+
+    with open(file, "w") as f:
+        f.write("")
+
+
+def select_accounts(multiple = True):
+    system("clear")  # clear from previous command to allow a clean choice
+    emails = [x[0] for x in Credentials]  # list of all email adresses
+    emails_selected = enquiries.choose(f"quel{'s' if multiple else ''} compte{'s' if multiple else ''} ?", emails, multi=multiple)
+    return([x for x in Credentials if x[0] in emails_selected])
+

requirements.txt

@@ -1,6 +1,12 @@
 mysql-connector-python
 argparse
 discord.py==1.7.3
-discord==1.7.3
 selenium
 enquiries
+rich
+requests
+pyvirtualdisplay
+pillow
+EasyProcess
+pyotp
+packaging

user_data/config.default

@@ -11,20 +11,25 @@ Headless = True
 
 [DISCORD]
 
-enabled = True
+DiscordErrorEnabled = True
+DiscordSuccessEnabled = True
 successlink = https://discord.com/api/webhooks/[put your webhook here]
-errorlink =https://discord.com/api/webhooks/[put your webhook here]
+errorlink = https://discord.com/api/webhooks/[put your webhook here]
 
 [PROXY]
 
-enabled = False
+proxy_enabled = False
 url = Null
 port = 0
 
 [SQL]
 
-enabled = False
+sql_enabled = False
 host = Null
 database = MsRewards
 usr = root
 pwd = password
+
+[OTHER]
+
+ipv6 = False

user_data/cookies/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

version

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