less errors

what am i breaking ?

.gitignore

@@ -1,7 +1,6 @@
 /old
 geckodriver.log
 .vscode/
-update.sh
 /Git
 page.html
 screenshot.png
@@ -11,4 +10,5 @@ data
 /user_data
 install.sh
 nohup.out
-test.py
+points.csv
+/dev

CODE_OF_CONDUCT.md

@@ -0,0 +1,127 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at piair338@gmail.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

Dockerfile

@@ -4,11 +4,11 @@ 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 \
+       tzdata \
        wfrench \
        git \
        libx11-xcb1 \
@@ -19,6 +19,7 @@ RUN set -x \
        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-* \
@@ -31,6 +32,7 @@ RUN set -x \
    && mv geckodriver /usr/bin/
 
 
+ENV TZ="Europe/Paris"
 WORKDIR /app/MsRewards
 CMD python main.py
 

README.md

@@ -1,46 +1,50 @@
 #  MsReward
 
 
-A Microsoft reward automator, designed to work headless on any server.  
+A Microsoft reward automator, designed to work headless on any x64 server.  
 Using a discord webhook or SQL to log points everyday.  
-Using Selenium and geckodriver.
+Using Selenium and Geckodriver.
+# Installation instruction
+Make sure your contry is [supported by MS Rewards](https://support.microsoft.com/en-us/topic/microsoft-rewards-regions-9795ec47-c0f4-a33e-aede-738903359d63).  
+Create 5 Microsoft accounts, that the programm will use.    
+- [linux](#linux)
+- [Windows](#windows)
+- [MacOS](#macos)
+- [Database configuration](#database)
+- [Options](#options)
+- [Flags](#flags)   
+## Linux
 
-## If you're using docker (way easier)  
-to use docker, run 
+### Using docker (Recommended)  
+Make sure that [docker](https://docs.docker.com/get-docker/) and [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) are installed.  
+Clone the repository:
 ```
-sudo docker build .
-#copy the build id
-sudo docker run -ti --name MsRewards [build id]
+git clone https://github.com/piair338/MsRewards
 ```
-Then, fill the config and start the programm everydays with 
+Build the docker container:
 ```
-sudo docker start MsRewards
+cd MsRewards
+sudo docker build -t msrewards .
+```
+Run the app for the first time to configure it.  
+```
+sudo docker run -ti --name MsRewards msrewards
+```
+Then to run it everyday, you can use cron and add the line: 
+```
+10 10 * * * 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 : 
-![B96F2F6D-7257-4F12-BFA7-0BEC3FB72993](https://user-images.githubusercontent.com/74496300/172872979-05396b6b-b682-471a-b71b-41602d816504.jpeg)
-
-You have to use the default worldlist (`sudo apt install wfrench`). The language is french by default, but you can change it if you want.  
-You can add a link to a website where content is only the link of the monthly fidelity card.  
-
-  
-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 
-
-installation recommandation :
+### **not** using docker (not recommended) 
+**This is only a recommandation and shouldn't be used !**
 ```
-sudo apt-get install xdg-utils libdbus-glib-1-2 bzip2 wfrench tigervnc-standalone-server -y
+sudo apt-get install xdg-utils libdbus-glib-1-2 bzip2 wfrench tigervnc-standalone-server xvnc -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/
@@ -48,3 +52,41 @@ sudo mv geckodriver /usr/bin/
 rm geckodriver-v0.31.0-linux64.tar.gz
 rm firefox-91.9.1esr.tar.bz2
 ```
+## Windows
+Not yet tested, but using docker should work.  
+## MacOS
+I don't have a mac (yet) so i can't test, but again, install docker and follow the linux installation.  
+
+# Database
+
+To use the database, I recommend MySql, Create a database with the name `MsRewards` 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)
+
+# Options 
+TODO  
+# Flags
+## Override
+Enable you to choose what action to perform on which account. **Linux only**
+```
+python3 main.py -o
+```
+## VNC
+Enble a vnc to a specific port
+```
+python3 main.py -v 1234
+```
+## config
+Tell the programm which config to use.  
+Default to ./user_data/config.cfg  
+Putting only a number is equivalent to ./user_data/config[number].cfg 
+```
+python3 main.py -c 12
+```
+## Add points to database
+Add points to the database using the credentials provided in the default config file.  
+argument : file with a list of `account,points`
+```
+python3 main.py -a file.csv
+```
+
+

database.py

@@ -10,9 +10,16 @@ parser.add_argument(
     help="Choose a file", 
     type=argparse.FileType('r')
 )
+parser.add_argument(
+    "-m", 
+    "--manual", 
+    help="add point manually do database", 
+    dest="manual", 
+    action="store_true"
+)
 
 args = parser.parse_args()
-
+MANUAL = args.manual
 
 config_path = "./user_data/config.cfg"
 config = configparser.ConfigParser()
@@ -47,26 +54,39 @@ def ban_account(name: str, pts = 0):
 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 :
+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)
-    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)
+    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()
+    mydb.commit()
+    mycursor.close()
+    mydb.close()
+else :
+    import modules.db as datab
+    config_path = f"{path.abspath(path.dirname(path.dirname( __file__ )))}/MsRewards/user_data/config.cfg"
+    print(config_path)
+    config = configparser.ConfigParser()
+    config.read(config_path)
+    sql_usr = config["SQL"]["usr"]
+    sql_pwd = config["SQL"]["pwd"]
+    sql_host = config["SQL"]["host"]
+    sql_database = config["SQL"]["database"]
+    account_name = input("compte ? ")
+    points = int(input("points ? "))
+    datab.add_to_database(account_name, points, sql_host, sql_usr, sql_pwd, sql_database)

main.py

@@ -34,7 +34,7 @@ def confirm(texte, default = False):
         return False
     return default
     
-lang = "fr"
+lang = "en"
 
 text = {"fr" : {
     "compte" : "entrer l'adresse mail du compte ", 
@@ -55,6 +55,24 @@ text = {"fr" : {
     "proxye" : "voulez vous utiliser un proxy ",
     "proxyl" : "entrez le lien du proxy ",
     "proxyp" : "entrez le port du proxy "
+    }, 
+    "en" : {
+        "compte" : "enter email of an account", 
+        "mdp" : "enter password of this account ",
+        "next" : "Add another account ? ",
+        "finc" : "Adding accounts ",
+        "ajout" : "Accounts added ",
+        "discorde" : "Do you want to use discord ? (Highly recommended as it's untested without)",
+        "w1" : "Enter Webhook link for sending points everyday",
+        "w2" : "Enter Webhook link for errors ",
+        "msqle" : "Do you want to use a database ? ",
+        "msqll" : "database link ",
+        "msqlu" : "database username ",
+        "msqlp" : "database password ",
+        "msqlt" : "database name (should be MsRewards) ",
+        "proxye" : "Do you want to use a proxy ",
+        "proxyl" : "Proxy address ",
+        "proxyp" : "Proxy port "
     }
     }
 
@@ -92,7 +110,7 @@ def edit_config_txt(ligne, contenu):
     txt = f.readlines()
     f.close()
     if txt.count(txt) >1:
-        raise NameError("il y a plus d'une occurence, echec de la modification")
+        raise NameError("Fail")
     
     for i in range(len(txt)) :
         name = txt[i].split(" = ")[0]
@@ -106,16 +124,11 @@ def edit_config_txt(ligne, contenu):
 
 
 def setup_settings():
-    general()
     discord()
     proxy()
     sql()
 
 
-def general():
-    if confirm(t["fidelity"]):
-        lien = input(t["lien"])
-        edit_config_txt('FidelityLink',lien)
     
 
 def discord():
@@ -154,29 +167,32 @@ def proxy() :
         edit_config_txt("port",port)
 
 
-def check_update():
+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 ()
+        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")
-        print("updated")
-
+        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 :
     args = " ".join(sys.argv[1::])
-    check_update()
+    args = check_update(args)
     os.system("python3 V5.py " + args)

manual_claim.py

@@ -1,69 +0,0 @@
-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/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

@@ -1,18 +1,7 @@
 #!/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
-
+from modules.driver_tools import *
+from modules.imports import *
+import modules.globals as g
 """
 Setup for option, like --override or --fulllog
 """
@@ -50,19 +39,12 @@ parser.add_argument(
     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')
+    default=""
 )
 
 parser.add_argument(
@@ -81,87 +63,117 @@ parser.add_argument(
     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()
 
-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
+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
-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
+g.islinux = platform == "linux" # if the computer running this program is Linux, it allow more things 
+g.start_time = time()
 
 #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)
+
+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
-MotPath = config["PATH"]["motpath"]
-CREDENTIALS_PATH = config["PATH"]["logpath"]
+g.mot_path = config["PATH"]["motpath"]
+g.credential_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())
+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
-FidelityLink = config["SETTINGS"]["FidelityLink"]
-DISCORD_EMBED = config["SETTINGS"]["embeds"] == "True" #print new point value in an embed
-Headless = config["SETTINGS"]["headless"] == "True"
+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
-proxy_enabled = config["PROXY"]["proxy_enabled"] == "True"
-proxy_address = config["PROXY"]["url"]
-proxy_port = config["PROXY"]["port"]
+g.proxy_enabled = config["PROXY"]["proxy_enabled"] == "True"
+g.proxy_address = config["PROXY"]["url"]
+g.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.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"]
 
 
-g = open(MotPath, "r", encoding="utf-8")
-lines = g.readlines()
+try :
+    g.database_error_override = config["OTHER"]["database_override"] == "True"
+except :
+    pass
+
+try : 
+    g.fast = config["OTHER"]["fast"] == "True"
+except :
+    pass
+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]
-g.close()
+h.close()
 
 
-with open(CREDENTIALS_PATH) as f:
+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/driver_tools.py

@@ -1,22 +1,19 @@
 from modules.imports import *
 from modules.config import *
+from modules.tools import *
+import modules.globals as g
 
 
-def setup_proxy(ip, port, options, socks=False) :
+def setup_proxy(ip: str, port: str) -> None:
     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",
-        }
+    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
+
+#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:
@@ -24,13 +21,27 @@ def rgpd_popup(driver) -> None:
         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"))
+def save_cookies(driver) -> None:
+    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, _mail):
-    cookies = pickle.load(open(f"{'/'.join(__file__.split('/')[:-2])}/user_data/cookies/{_mail}.pkl", "rb"))
+def load_cookies(driver) -> None:
+    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)
 
@@ -38,13 +49,10 @@ def load_cookies(driver, _mail):
 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):
+def send_keys_wait(element, keys: str) -> None:
     for i in keys:
         element.send_keys(i)
-        if FAST :
-            pass
-        else :
-            sleep(uniform(0.1, 0.3))
+        sleep(uniform(0.1, 0.3))
 
 
 
@@ -52,6 +60,8 @@ def send_keys_wait(element, keys):
 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:
-        print(f"element not found after {timeout}s")
+        printf(f"element {identifier} not found after {timeout}s")
+        return(False)
 

modules/error.py

@@ -2,4 +2,7 @@ class Banned(Exception):
     pass
 
 class NotBanned(Exception):
+    pass
+
+class Identity(Exception):
     pass

modules/globals.py

@@ -0,0 +1,38 @@
+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
+database_error_override = False
+fast = False

modules/imports.py

@@ -1,24 +1,33 @@
+import argparse
 import asyncio
-import csv
-from os import sys, system, path
+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
-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 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
-import pickle
-from datetime import timedelta, datetime
-from discord import Embed, Colour, File
+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

@@ -1,19 +1,23 @@
 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, mail: str) -> str:
-    return(f"[{mail} - {datetime.today().strftime('%d-%m-%Y')} - {timedelta(seconds = round(float(time() - START_TIME)))}] " + str(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 printf2(txt, mail, LOG = LOG):
-    print(Timer(txt, mail))
+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
@@ -26,12 +30,9 @@ def check_ipv4(driver):
     return False
 
 
-
 def custom_sleep(temps):
     try : 
-        if FAST and temps > 50:
-            sleep(temps/10)
-        elif LOG: #only print sleep when user see it
+        if g.log : #only print sleep when user see it
             points = ["⢿", "⣻", "⣽", "⣾", "⣷", "⣯", "⣟", "⡿"]
             passe = 0
             for i in range(int(temps)):
@@ -64,20 +65,18 @@ def progressBar(current, total=30, barLength=20, name="Progress"):
 
 def save_points_from_file(file):
     with open(file) as f:
-        reader = csv.reader(f)
-        points_list = list(reader)
-
+        read = reader(f)
+        points_list = list(read)
     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)
-
+        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 Credentials]  # list of all email adresses
+    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 Credentials if x[0] in emails_selected])
+    return([x for x in g._cred if x[0] in emails_selected])
 

user_data/config.default

@@ -5,7 +5,6 @@ logpath = /your/path/to/loginandpass.csv
 
 [SETTINGS]
 
-FidelityLink = Null
 embeds = False
 Headless = True
 
@@ -32,4 +31,7 @@ pwd = password
 
 [OTHER]
 
-ipv6 = False
+avatar = https://cdn.discordapp.com/icons/793934298977009674/d8055bccef6eca4855c349e808d0d788.webp
+ipv6 = False
+database_override = False
+fast = False

version

@@ -1 +1 @@
-v5.2.0
+v5.10.11