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

ptdr not on a raspberrypi anymore

.gitignore

@@ -6,8 +6,10 @@ update.sh
 page.html
 screenshot.png
 login.csv
-requirements.txt
 data
 **/__pycache__
 /user_data
 install.sh
+nohup.out
+test.py
+points.csv

Dockerfile

@@ -4,17 +4,22 @@ 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 \
        libdbus-glib-1-2 \
-       libasound.so.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-* \
@@ -27,6 +32,7 @@ RUN set -x \
    && mv geckodriver /usr/bin/
 
 
+ENV TZ="Europe/Paris"
 WORKDIR /app/MsRewards
 CMD python main.py
 

README.md

@@ -1,9 +1,9 @@
 #  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 
@@ -12,17 +12,17 @@ sudo docker build .
 #copy the build id
 sudo docker run -ti --name MsRewards [build id]
 ```
-Then, fill the config and start the programm everydays with 
+Then, fill the config and start the program everyday with 
 ```
 sudo docker start MsRewards
 ```
 
 ## Other configuration
 
-To use the database, I recommand MySql, Create a database with the name you want and create a table `daily`, like the one from the image : 
+To use the database, I recommend MySql, Create a database with the name you want and create a table `daily`, like the one from the image : 
 ![B96F2F6D-7257-4F12-BFA7-0BEC3FB72993](https://user-images.githubusercontent.com/74496300/172872979-05396b6b-b682-471a-b71b-41602d816504.jpeg)
 
-You have to use the default worldlist (`sudo apt install wfrench`). The language is french by default, but you can change it if you want.  
+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.  
 You can add a link to a website where content is only the link of the monthly fidelity card.  
 
   
@@ -33,7 +33,7 @@ You should limit to 6 account per IP, and DON'T USE outlook account, they are ba
 
 installation recommandation :
 ```
-sudo apt-get install xdg-utils libdbus-glib-1-2 bzip2 wfrench -y
+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

database.py

@@ -1,6 +1,25 @@
 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()
@@ -35,19 +54,39 @@ def ban_account(name: str, pts = 0):
 def update_pts(name: str, pts = 0):
     pass
 
+if not MANUAL :
+    print("ajouter un compte : 1\nban un compte : 2")
+    i = input()
+    if i == "1":
+        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)
 
-print("ajouter un compte : 1\nban un compte : 2")
-i = input()
-if i == "1":
-    name = input("quel est le nom ? ")
-    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()
+    mydb.commit()
+    mycursor.close()
+    mydb.close()
+else :
+    import modules.db as datab
+    config_path = f"{path.abspath(path.dirname(path.dirname( __file__ )))}/MsRewards/user_data/config.cfg"
+    print(config_path)
+    config = configparser.ConfigParser()
+    config.read(config_path)
+    sql_usr = config["SQL"]["usr"]
+    sql_pwd = config["SQL"]["pwd"]
+    sql_host = config["SQL"]["host"]
+    sql_database = config["SQL"]["database"]
+    account_name = input("compte ? ")
+    points = int(input("points ? "))
+    datab.add_to_database(account_name, points, sql_host, sql_usr, sql_pwd, sql_database)

main.py

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

@@ -1,16 +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,
-)
-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
 """
@@ -33,13 +24,6 @@ parser.add_argument(
     action="store_true"
 )
 
-parser.add_argument(
-    "--claim", 
-    help="show claim", 
-    dest="claim", 
-    action="store_true"
-)
-
 parser.add_argument(
     "-l",
     "--log", 
@@ -55,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(
@@ -78,87 +55,116 @@ parser.add_argument(
     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()
-CLAIM = args.claim
-CUSTOM_START = args.override
-UNBAN = args.unban
-LOG = args.log
-FULL_LOG = args.fulllog
-FAST = args.fast
-if CUSTOM_START :
-    LOG = True
 
-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 programm 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 seetings 
-IPV6_CHECKED = config["OTHER"]["ipv6"]
-CLAIM_AMAZON = config["OTHER"]["claim_amazon"] == "True"
+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()
+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

@@ -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

@@ -1,7 +1,8 @@
-from selenium.common.exceptions import TimeoutException, NoSuchElementException, ElementClickInterceptedException
-
 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/progress.py

@@ -1,32 +0,0 @@
-#add return a string witx tabs
-def tabs(x):
-    return(x*4*" ")
-
-
-#create dictionnary with all progress bars
-def dico(progress):
-    dico_task = {
-        "daily" : {
-            "all" : progress.add_task("[yellow]daily", total=100, start=False, visible=False),
-            "carte0" : progress.add_task(f"[yellow]{tabs(1)}carte 1", total=100, start=False, visible = False),
-            "carte1" : progress.add_task(f"[yellow]{tabs(1)}carte 2", total=100, start=False, visible = False),
-            "carte2" : progress.add_task(f"[yellow]{tabs(1)}carte 3", total=100, start=False, visible = False)
-        },
-        "weekly" : {
-            "all" : progress.add_task("[yellow]weekly", total=100, start=False, visible=False),
-            "carte1" : progress.add_task(f"[yellow]{tabs(1)}carte 1", total=100, start=False, visible = False),
-            "carte2" : progress.add_task(f"[yellow]{tabs(1)}carte 2", total=100, start=False, visible = False),
-            "carte3" : progress.add_task(f"[yellow]{tabs(1)}carte 3", total=100, start=False, visible = False),
-            "carte3" : progress.add_task(f"[yellow]{tabs(1)}carte 4", total=100, start=False, visible = False),
-            "carte3" : progress.add_task(f"[yellow]{tabs(1)}carte 5", total=100, start=False, visible = False),
-            "carte3" : progress.add_task(f"[yellow]{tabs(1)}carte 6", total=100, start=False, visible = False),
-            "carte3" : progress.add_task(f"[yellow]{tabs(1)}carte 7", total=100, start=False, visible = False),
-            "carte3" : progress.add_task(f"[yellow]{tabs(1)}carte 8", total=100, start=False, visible = False),
-            "carte3" : progress.add_task(f"[yellow]{tabs(1)}carte 9", total=100, start=False, visible = False),
-        },
-        "PC" : progress.add_task(f"[yellow]PC", total=100, start=False, visible = False),
-        "Mobile" : progress.add_task(f"[yellow]Mobile", total=100, start=False, visible = False),
-
-
-    }
-    return(dico_task)

modules/tools.py

@@ -1,87 +1,38 @@
-from time import sleep
-from datetime import timedelta
-from random import uniform
-import discord
-from discord import (  # Importing discord.Webhook and discord.RequestsWebhookAdapter
-    Colour,
-    Webhook,
-)
-
+from modules.imports import *
 from modules.config import *
-
-"""
-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 alos selenium keys
-"""
-def send_keys_wait(element, keys):
-    for i in keys:
-        element.send_keys(i)
-        if FAST :
-            pass
-        else :
-            sleep(uniform(0.1, 0.3))
-
-
-def LogError(message, driver, mail, log=FULL_LOG):
-    print(f"\n\n\033[93m Erreur : {str(message)}  \033[0m\n\n")
-    if DISCORD_ENABLED_ERROR:
-        with open("page.html", "w") as f:
-            f.write(driver.page_source)
-
-        driver.save_screenshot("screenshot.png")
-        if not log:
-            embed = discord.Embed(
-                title="An Error has occured",
-                description=str(message),
-                colour=Colour.red(),
-            )
-        else:
-            embed = discord.Embed(
-                title="Full log is enabled",
-                description=str(message),
-                colour=Colour.blue(),
-            )
-
-        file = discord.File("screenshot.png")
-        embed.set_image(url="attachment://screenshot.png")
-        embed.set_footer(text=mail)
-        webhookFailure.send(embed=embed, file=file)
-        webhookFailure.send(file=discord.File("page.html"))
-
-
-
-# add the time arround the text given in [text]
-# [text] : string
-def Timer(text, mail):
-    return(f"[{mail} - {timedelta(seconds = round(float(time() - START_TIME)))}] " + str(text))
+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 wbdriver
-def printf2(txt, mail, LOG = LOG):
-    if LOG:
-        print(Timer(txt, mail))
+# [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")
+    elm = driver.find_element(By.TAG_NAME, "body")
     if len(elm.text.split('.')) == 4 :
         return True
     return False
 
 
-
-def CustomSleep(temps):
+def custom_sleep(temps):
     try : 
-        if FAST and temps > 50:
-            sleep(temps/10)
-            return()
-        if not LOG or not LINUX_HOST: #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)):
@@ -96,7 +47,13 @@ def CustomSleep(temps):
         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"):
@@ -104,3 +61,22 @@ def progressBar(current, total=30, barLength=20, name="Progress"):
     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

@@ -5,3 +5,8 @@ selenium
 enquiries
 rich
 requests
+pyvirtualdisplay
+pillow
+EasyProcess
+pyotp
+packaging

user_data/config.default

@@ -31,6 +31,5 @@ usr = root
 pwd = password
 
 [OTHER]
-
-ipv6 = False
-claim_amazon = False
+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