fixed a rare error occuring when the cookie creation isn't successful

ptdr not on a raspberrypi anymore

.gitignore

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

Dockerfile

@@ -4,43 +4,35 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV GECKODRIVER_VER v0.31.0
 ENV FIREFOX_VER 87.0
 WORKDIR /app
-
 RUN set -x \
    && apt update \
    && apt upgrade -y \
    && apt install -y \
-       firefox-esr \
+       tzdata \
        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 \
+   && ln -fs /usr/share/zoneinfo/Europe/Paris /etc/localtime \
+   && 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
+ENV TZ="Europe/Paris"
+WORKDIR /app/MsRewards
 CMD python main.py
 

README.md

@@ -1,25 +1,25 @@
 #  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.  
-Using Selenium and geckodriver.
+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 
+Then, fill the config and start the program everyday with 
 ```
-docker start MsRewards
+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.  
@@ -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,832 @@
+#!/usr/bin/python3.10
+from modules.imports import *
+from modules.config import *
+from modules.db import add_to_database
+from modules.tools import *
+from modules.error import *
+from modules.driver_tools import *
+from modules.cards import *
+import modules.globals as g
+
+
+driver = g.driver
+display = g.display
+
+
+# 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')
+    options.set_preference("browser.link.open_newwindow", 3)
+    options.set_preference("dom.confirm_repost.testing.always_accept", True)
+    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(g._mail)%20 , 1900 + hash(g._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(g._mail)%20 , 1070 + hash(g._password + "salt")%10)
+    return(driver)
+
+
+def log_error(error, ldriver=driver, log=g.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 g.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=g._mail)
+        webhookFailure.send(embed=embed, username="error", file=file, avatar_url = g.avatar_url)
+        webhookFailure.send(username="error", file=File("page.html"), avatar_url = g.avatar_url)
+
+
+# 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()
+                if g.log:
+                    progressBar(j, 10, name="quiz 2")
+            else:
+                answer_elem = driver.find_element(By.ID, "rqAnswerOption1")
+                answer_elem.click()
+                if g.log:
+                    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")
+    custom_sleep(3)
+
+
+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):  
+            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
+                if g.log :
+                    progressBar(counter, 16, name="Quiz 8")
+                try:
+                    answer_elem = driver.find_element(By.ID, answer_id)
+                    answer_elem.click()
+                    sleep(1)
+                except exceptions.NoSuchElementException :
+                    driver.refresh()
+                    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 ")
+    custom_sleep(3)
+
+
+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")
+    custom_sleep(3)
+
+
+# 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")
+    custom_sleep(3)
+
+
+def all_cards():
+    driver.get("https://rewards.bing.com")
+    wait_until_visible(By.CLASS_NAME, "c-card-content", 10, driver)
+    liste = driver.find_elements(By.CLASS_NAME, "c-card-content")
+    custom_sleep(2)
+    if "welcometour" in driver.current_url:
+        welcome_tour_NO(driver)
+    try :
+        promo()
+    except Exception as e:
+        printf("no promo card")
+    if(len(liste) < 10): #most likely an error during loading
+        driver.refresh()
+        liste = driver.find_elements(By.CLASS_NAME, "c-card-content")
+        if(len(liste) < 10):
+            log_error("moins de 10 cartes", driver)
+            return("PAS ASSEZ DE CARTES")
+    if (len(liste) < 20): # most likely not in france
+        if not g.norvege :
+            g.norvege = True
+            printf("moins de 20 cartes, disabling fidelity")
+            g.fidelity_link = "Disabled because norway"
+            log_error("Verifying if Norway", driver, True)
+    for i in range(len(liste)):
+        printf(f"carte {i}")
+        try : 
+            checked = ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML"))
+        except StaleElementReferenceException :
+            driver.refresh()
+            liste = driver.find_elements(By.CLASS_NAME, "c-card-content")
+            printf(f"staled, {len(liste)}")
+            checked = ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML"))
+        except IndexError:
+            driver.refresh()
+            custom_sleep(10)
+            liste = driver.find_elements(By.CLASS_NAME, "c-card-content")
+            try : 
+                checked = ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML"))
+            except :
+                log_error("IndexError", driver)
+                return("INDEX ERROR")
+        if checked:
+            custom_sleep(1.5)
+            driver.execute_script("arguments[0].scrollIntoView();", liste[i])
+            custom_sleep(1.5)
+            liste[i].click()
+            if len(driver.window_handles) > 1 :
+                driver.switch_to.window(driver.window_handles[1])
+                try_play(driver.title)
+                close_tab(driver.window_handles[1])
+                try : 
+                    driver.refresh()
+                    liste = driver.find_elements(By.CLASS_NAME, "c-card-content")
+                    if ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML")) :
+                        printf(f"carte {i} not okay. Retrying.")
+                        try :
+                            liste[i].click()
+                        except :
+                            log_error("problème inconnu ? sauf si c'est un element obscure...", driver)
+                            driver.get("https://rewards.bing.com")
+                            checked = ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML"))
+                        driver.switch_to.window(driver.window_handles[1])
+                        try_play(driver.title)
+                        close_tab(driver.window_handles[1])
+                        if ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML")):
+                            log_error(f"Card {i} Can't be completed. Why MS ?", driver)
+                except :
+                    pass
+            else : 
+                try : 
+                    welcome_tour(liste[i], driver)
+                except Exception as e:
+                    printf("no new windows" + format_error(e))
+                    driver.get("https://rewards.bing.com")
+            custom_sleep(3)
+
+
+def promo():
+    elm = driver.find_element(By.ID, "promo-item")
+    for i in range(10):
+        if not elm:
+            break
+        if i > 8 :
+            log_error("chelou, plus de 8 truc", driver)
+        driver.execute_script("arguments[0].click();", elm)
+        custom_sleep(3)
+        if len(driver.window_handles) > 1 :
+            driver.switch_to.window(driver.window_handles[len(driver.window_handles)-1])
+            try_play(driver.title)
+            close_tab(driver.window_handles[1])
+        else : 
+            try : 
+                spotify(driver)
+            except :
+                printf("no new windows", driver)
+                driver.get("https://rewards.bing.com")
+        custom_sleep(3)
+
+
+# Find out which type of action to do
+def try_play(nom="inconnu"):
+    def play(number):
+        if number == 8 or number == 9:
+            try:
+                printf(f"\033[96mQuiz 8 detected on `{nom}` \033[0m")
+                play_quiz8()
+                printf(f"\033[92mQuiz 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[96mQuiz 4 detected on `{nom}` \033[0m")
+                play_quiz4()
+                printf(f"\033[92mQuiz 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[96mQuiz 2 detected on `{nom}`\033[0m")
+                play_quiz2()
+                printf(f"\033[92mQuiz 2 succeeded on `{nom}`\033[0m")
+            except Exception as e:
+                printf(f"fail of PlayQuiz 2. Aborted {e}")
+        else:
+            printf("There is an error. rqAnswerOption present in page but no action to do. skipping.")
+
+    try:
+        if wait_until_visible(By.ID, "rqStartQuiz", 5, driver):
+            custom_sleep(3)
+            driver.find_element(By.ID, "rqStartQuiz").click()  # start the quiz
+            answer_number = driver.page_source.count("rqAnswerOption")
+            play(answer_number)
+        else :
+            raise (NameError("going to next part"))
+    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")
+                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é")
+            fidelity()
+
+        else:
+            printf(f"rien à faire sur la page {nom}")
+            custom_sleep(uniform(3, 5))
+
+
+# Login with password or with cookies.
+# The driver should be in the same state on both case 
+def pwd_login(ldriver):    
+    printf("pwd_login : start")
+    ldriver.get("https://login.live.com")
+    wait_until_visible(By.ID, "i0116", browser = ldriver)
+    mail_elem = ldriver.find_element(By.ID, "i0116")
+    send_keys_wait(mail_elem, g._mail)
+    mail_elem.send_keys(Keys.ENTER)
+    wait_until_visible(By.ID, "i0118", browser = ldriver)
+    pwd_elem = ldriver.find_element(By.ID, "i0118")
+    send_keys_wait(pwd_elem, g._password)
+    pwd_elem.send_keys(Keys.ENTER)
+    custom_sleep(2)
+    # 2FA
+    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(g._otp.now())
+            a2f_elem.send_keys(Keys.ENTER)
+        except Exception as e :
+            log_error(e)
+
+
+def cookie_login(ldriver):
+    printf("cookies_login : start")
+    ldriver.get("https://login.live.com")
+    try : 
+        load_cookies(ldriver)
+    except FileNotFoundError :
+        printf("No cookies file Found.")
+        return(False)
+    except Exception as e:
+        log_error(f"error performing cookies login. Trying with password instead. {str(e)}", driver)
+        return(False)
+    try :
+        ldriver.refresh()
+    except Exception as e:
+        printf(format_error(e))
+        printf("FIX YOUR SITE MS.......")
+        
+    return(True)
+
+
+# Accept all cookies question, and check if the account is locked
+def login_part_2(ldriver, cookies = False):
+    custom_sleep(5)
+    if ('Abuse' in ldriver.current_url) : 
+        raise Banned()
+    if ('identity' in ldriver.current_url) : 
+        raise Identity()
+    if ('notice' in ldriver.current_url) : 
+        ldriver.find_element(By.ID, "id__0").click()
+    if cookies:
+        save_cookies(ldriver)
+    for id in ["KmsiCheckboxField", "id__0", "iLooksGood", "idSIButton9", "iCancel"]:
+        if get_domain(ldriver) == "account.microsoft.com":
+            break
+        try:
+            ldriver.find_element(By.ID, id).click()
+            restart = True
+        except Exception as e:
+            pass
+    wait_until_visible(By.CSS_SELECTOR, '[data-bi-id="sh-sharedshell-home"]', 20, ldriver)
+    ldriver.get("https://www.bing.com/?setlang=fr&cc=fr&cc=FR")
+    rgpd_popup(ldriver)
+    ldriver.refresh()
+    rgpd_popup(ldriver)
+
+
+# login() tries to login to your Microsoft account.
+# it uses global variable g._mail and g._password to login
+def login(ldriver):
+    try : 
+        success_cookies = cookie_login(ldriver)
+        if not success_cookies:
+            pwd_login(ldriver)
+        login_part_2(ldriver, not success_cookies)
+        ldriver.get("https://rewards.bing.com/")
+    except Banned:
+        raise Banned()
+    except Identity:
+        raise Banned()
+    except Exception as e:
+        log_error(e)
+        ldriver.quit()
+        return(False)
+
+
+# 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(3, 7))
+        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://rewards.bing.com")
+        custom_sleep(1)
+        if "/proofs/" in driver.current_url:
+            for id in ["KmsiCheckboxField","iLooksGood", "idSIButton9", "iCancel"]:
+                try:
+                    driver.find_element(By.ID, id).click()
+                    restart = True
+                except Exception as e:
+                    pass
+        wait_until_visible(By.CSS_SELECTOR, 'span[mee-element-ready="$ctrl.loadCounterAnimation()"]', browser=driver)
+        try : 
+            point = search('availablePoints\":([\d]+)', driver.page_source)[1]
+        except Exception as e:
+            sleep(5)
+            log_error(f"Dev error, checking why it doesn't work (waited a bit, is this still white ?) {format_error(e)}", driver, True)
+            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 g.discord_enabled_success:
+        if g.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 g.sql_enabled :
+        add_to_database(account_name, points, g.sql_host, g.sql_usr, g.sql_pwd, g.sql_database)
+
+
+def fidelity():
+    try:
+        while 1: #close all tabs
+            try:
+                close_tab(1)
+            except:
+                break
+        try : 
+            fidelity_link_page = get(g.fidelity_link) #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.execute_script("location.reload(true);")
+                    wait_until_visible(By.CSS_SELECTOR, 'div[class="pull-left spacer-48-bottom punchcard-row"]', browser=driver)
+                    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 = 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)
+                    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_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(3, 7))
+                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 locked. Fix that. (-U ?)", driver)
+        return()
+    except Identity :
+        log_error("This account has an issue. Fix that.", driver)
+        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(g._mail)
+    except Exception as e:
+        log_error(e)
+
+
+def dev():
+    input("dev pause")
+
+
+def CustomStart():
+    if not g.islinux :
+        raise NameError('You need to be on linux to do that, due to the utilisation of a module named enquieries, sorry.') 
+    global driver
+
+    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()
+    g.start_time = time() # Reset timer to the start of the actions
+
+    for cred in liste:
+        g._mail = cred[0]
+        g._password = cred[1]
+        if len(cred) == 3:
+            g._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(g._mail)
+                except Exception as e:
+                    printf(f"CustomStart {e}")
+            driver.quit()
+
+
+if g.vnc_enabled : 
+    display = SmartDisplay(backend="xvnc", size=(2160, 2160), rfbport=g.vnc_port, color_depth=24) 
+else :
+    display = SmartDisplay(size=(2160, 2160)) 
+display.start()
+
+
+if g.custom_start:
+    CustomStart()
+elif g.unban:
+    g._mail, g._password  = select_accounts(False)[0]
+    driver = firefox_driver()
+    try : 
+        login(driver)
+    except Banned:
+        unban()
+    driver.quit()
+elif g.points_file != "":
+    save_points_from_file(g.points_file)
+else:
+    if g.update_version != "None":
+        if g.discord_enabled_error:
+            webhookFailure.send(f"Updated to {g.update_version}", username="UPDATE", avatar_url="https://cdn-icons-png.flaticon.com/512/1688/1688988.png")
+    for cred in g._cred:
+        g._mail = cred[0]
+        g._password = cred[1]
+        if len(cred) == 3:
+            g._otp = TOTP(cred[2])
+        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,92 @@
+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')
+)
+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()
+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
+
+if not MANUAL :
+    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()
+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)

liste.txt

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

main.py

@@ -1,12 +1,24 @@
 #/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
+import sys
+
+
 config = configparser.ConfigParser()
+
+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 : 
         txt = '[Y/n]'
@@ -30,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 points sur discord ?",
-    "w1" : "entrez le lien du WebHook pour envoyer les points (https://support.discord.com/hc/fr/articles/228383668-Utiliser-les-Webhooks)",
+    "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 ",
@@ -43,7 +55,6 @@ text = {"fr" : {
     "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,75 @@ 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(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.10 V4.py")
+    args = " ".join(sys.argv[1::])
+    args = check_update(args)
+    os.system("python3 V5.py " + args)

modules/cards.py

@@ -0,0 +1,34 @@
+from modules.imports import *
+
+
+def welcome_tour(elm, driver):
+    try : 
+        driver.find_element(By.CSS_SELECTOR, '[class="welcome-tour-next-button c-call-to-action c-glyph"]').click()
+    except :
+        pass
+    driver.find_element(By.CSS_SELECTOR, '[class="quiz-link gray-button c-call-to-action c-glyph f-lightweight"]').click()
+    sleep(5)
+    driver.find_element(By.CSS_SELECTOR, '[class="c-glyph glyph-cancel"]').click()
+    elm.click()
+    driver.find_element(By.CSS_SELECTOR, '[class="quiz-link gray-button c-call-to-action c-glyph f-lightweight"]').click()
+    sleep(5)
+    driver.find_element(By.CSS_SELECTOR, '[class="c-glyph glyph-cancel"]').click()
+    elm.click()
+    driver.find_element(By.CSS_SELECTOR, '[class="quiz-link gray-button c-call-to-action c-glyph f-lightweight"]').click()
+    sleep(5)
+    driver.find_element(By.CSS_SELECTOR, '[class="c-glyph glyph-cancel"]').click()
+
+def welcome_tour_NO(driver):
+    try : 
+        driver.find_element(By.CSS_SELECTOR, '[class="welcome-tour-next-button c-call-to-action c-glyph"]').click()
+    except :
+        pass
+    driver.find_element(By.CSS_SELECTOR, '[class="c-glyph glyph-cancel"]').click()
+    sleep(5)
+
+
+def spotify(driver):
+    sleep(5)
+    driver.find_element(By.CSS_SELECTOR, '[data-bi-id="spotify-premium gratuit"]').click()
+    sleep(5)
+    close_tab(driver.window_handles[1])

modules/config.py

@@ -0,0 +1,170 @@
+#!/usr/bin/python3.10
+from modules.driver_tools import *
+from modules.imports import *
+import modules.globals as g
+"""
+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(
+    "-c", 
+    "--config", 
+    help="Choose a specific config file", 
+    default=""
+)
+
+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"
+)
+
+parser.add_argument( 
+    "--version",
+    help="display a message on discord to tell that the bot have been updated",
+    dest="update_version",
+    default="None"
+)
+
+parser.add_argument(
+    "--dev", 
+    help="dev option", 
+    dest="dev", 
+    action="store_true"
+)
+
+
+args = parser.parse_args()
+
+g.custom_start = args.override
+g.unban = args.unban
+g.log = args.log
+g.full_log = args.fulllog
+g.dev = args.dev
+
+if g.custom_start :
+    g.log = True
+
+g.vnc_enabled = args.vnc != "None"
+g.vnc_port = args.vnc
+g.points_file = args.points_file
+g.update_version = args.update_version
+# global variables used later in the code
+g.islinux = platform == "linux" # if the computer running this program is Linux, it allow more things 
+g.start_time = time()
+
+#reading configuration
+config = configparser.ConfigParser()
+
+if args.config :
+    try :
+        config_path  =f"{path.abspath(path.dirname(path.dirname( __file__ )))}/user_data/config{args.config}.cfg"
+        config.read(config_path)
+        g.mot_path = config["PATH"]["motpath"]
+    except :
+        config_path = path.abspath(args.config)
+        config.read(config_path)
+else : 
+    config_path = f"{path.abspath(path.dirname(path.dirname( __file__ )))}/user_data/config.cfg"
+    config.read(config_path)
+
+
+# path configurations
+g.mot_path = config["PATH"]["motpath"]
+g.credential_path = config["PATH"]["logpath"]
+
+
+# discord configuration
+g.discord_success_link = config["DISCORD"]["successlink"]
+g.discord_error_link = config["DISCORD"]["errorlink"]
+g.discord_enabled_error = config["DISCORD"]["DiscordErrorEnabled"] == "True"
+g.discord_enabled_success = config["DISCORD"]["DiscordSuccessEnabled"]== "True"
+try :
+    g.avatar_url = config["OTHER"]["avatar"] 
+except :
+    g.avatar_url = "https://cdn.discordapp.com/icons/793934298977009674/d8055bccef6eca4855c349e808d0d788.webp"
+    
+if g.discord_enabled_error:
+    webhookFailure = Webhook.from_url(g.discord_error_link, adapter=RequestsWebhookAdapter())
+if g.discord_enabled_success:
+    webhookSuccess = Webhook.from_url(g.discord_success_link, adapter=RequestsWebhookAdapter())
+
+# base settings
+g.fidelity_link = config["SETTINGS"]["FidelityLink"]
+g.discord_embed = config["SETTINGS"]["embeds"] == "True" #print new point value in an embed
+g.headless = config["SETTINGS"]["headless"] == "True"
+
+# proxy settings
+g.proxy_enabled = config["PROXY"]["proxy_enabled"] == "True"
+g.proxy_address = config["PROXY"]["url"]
+g.proxy_port = config["PROXY"]["port"]
+
+# MySQL settings
+g.sql_enabled = config["SQL"]["sql_enabled"] == "True"
+g.sql_usr = config["SQL"]["usr"]
+g.sql_pwd = config["SQL"]["pwd"]
+g.sql_host = config["SQL"]["host"]
+g.sql_database = config["SQL"]["database"]
+
+
+h = open(g.mot_path, "r", encoding="utf-8")
+lines = h.readlines()
+if len(lines) < 3 : 
+    Liste_de_mot = list(lines[0].split(","))
+else :
+    Liste_de_mot = [x.replace('\n', "") for x in lines]
+h.close()
+
+
+with open(g.credential_path) as f:
+    reader = reader(f)
+    Credentials = list(reader)
+shuffle(Credentials)
+g._cred = Credentials
+
+if g.proxy_enabled :
+    setup_proxy(g.proxy_address,g.proxy_port)

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,63 @@
+from modules.imports import *
+from modules.config import *
+from modules.tools import *
+import modules.globals as g
+
+def setup_proxy(ip, port) :
+    PROXY = f"{ip}:{port}"
+    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):
+    if g.dev:
+        f = open(f"{'/'.join(__file__.split('/')[:-2])}/user_data/cookies/{g._mail}_unsafe.pkl", "w")
+        for i in driver.get_cookies():
+            f.write(str(i) + "\n")
+        f.close()
+    else :
+        pickle.dump(driver.get_cookies(), open(f"{'/'.join(__file__.split('/')[:-2])}/user_data/cookies/{g._mail}.pkl", "wb"))
+
+# load cookies previously saved to the driver
+def load_cookies(driver):
+    if g.dev:
+        f = open(f"{'/'.join(__file__.split('/')[:-2])}/user_data/cookies/{g._mail}_unsafe.pkl", "r")
+        lines = f.readlines()
+        f.close()
+        cookies = [literal_eval(x) for x in lines]
+    else :
+        cookies = pickle.load(open(f"{'/'.join(__file__.split('/')[:-2])}/user_data/cookies/{g._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)
+        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")
+        return(True)
+    except TimeoutException as e:
+        printf(f"element not found after {timeout}s")
+        return(False)
+

modules/error.py

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

modules/globals.py

@@ -0,0 +1,36 @@
+driver = None
+_mail = '_mail temp'
+_password = '_password temp'
+_otp = '_otp temp'
+display = None
+_cred = []
+custom_start = False
+unban = False
+log =  False
+full_log = False
+vnc_enabled = False
+vnc_port = 0
+points_file = "/"
+update_version = False
+islinux = True
+start_time = 0
+mot_path = "/"
+credential_path = "/"
+discord_success_link = "https://example.com"
+discord_error_link = "https://example.com"
+discord_enabled_error = False
+discord_enabled_success = False
+avatar_url = ""
+fidelity_link = "None"
+discord_embed = False
+headless = False
+proxy_enabled = False
+proxy_address = "0.0.0.0"
+proxy_port = "0"
+sql_enabled = False
+sql_usr = "None"
+sql_pwd = "azerty"
+sql_host = "https://example.com"
+sql_database = "MsRewards"
+dev = False
+norvege = False

modules/imports.py

@@ -0,0 +1,33 @@
+import argparse
+import asyncio
+import configparser
+import pickle
+from csv import reader
+from datetime import datetime, timedelta
+from os import path, sys, system
+from random import choice, randint, shuffle, uniform
+from re import findall, search
+from sys import platform
+from time import sleep, time
+
+from discord import Colour, Embed, File, RequestsWebhookAdapter, Webhook
+from pyotp import TOTP
+from pyvirtualdisplay import Display
+from pyvirtualdisplay.smartdisplay import SmartDisplay
+from requests import get
+from selenium import webdriver
+from selenium.common import exceptions
+from selenium.common.exceptions import (ElementClickInterceptedException,
+                                        NoSuchElementException,
+                                        StaleElementReferenceException,
+                                        TimeoutException, WebDriverException)
+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 import expected_conditions as EC
+from selenium.webdriver.support.ui import Select, WebDriverWait
+from ast import literal_eval
+try:
+    import enquiries
+except:
+    system("")  # enable colors in windows cmd

modules/tools.py

@@ -0,0 +1,82 @@
+from modules.imports import *
+from modules.config import *
+from modules.db import *
+import modules.globals as g
+# add the time arround the text given in [text]&
+def Timer(text: str) -> str:
+    return(f"[{g._mail.split('@')[0]} - {datetime.today().strftime('%d/%m')} - {timedelta(seconds = round(float(time() - g.start_time)))}] " + str(text))
+
+
+# replace the function print, with more options
+# [txt] : string, [driver] : selenium webdriver
+def printf(txt):
+    print(Timer(txt))
+
+
+# return current page domain
+def get_domain(driver):
+    return(driver.current_url.split("/")[2])
+
+    
+# 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 g.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:
+        read = reader(f)
+        points_list = list(read)
+    for item in points_list:
+        compte, points = item[0], item[1]
+        add_to_database(compte, points, g.sql_host,g.sql_usr,g.sql_pwd,g.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 g._cred]  # 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 g._cred 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]
 
 [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]
+avatar = https://cdn.discordapp.com/icons/793934298977009674/d8055bccef6eca4855c349e808d0d788.webp
+ipv6 = False

user_data/cookies/.gitignore

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

version

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