From 2cc1fcbc72ba7844d86e5fc35223f3253e9cb92f Mon Sep 17 00:00:00 2001
From: piair <piair@piair.xyz>
Date: Tue, 27 Feb 2024 01:41:18 +0100
Subject: [PATCH] removed a lot of unused command line parameters

---
 modules/config.py | 100 +++++++++++++---------------------------------
 1 file changed, 27 insertions(+), 73 deletions(-)

diff --git a/modules/config.py b/modules/config.py
index 7a93db9..12d71f4 100644
--- a/modules/config.py
+++ b/modules/config.py
@@ -4,61 +4,29 @@ from modules.imports import *
 import modules.globals as g
 import json
 
+
 class FakeWebHook:
-    def send(self, text = "", username='', avatar_url='', embed = "", file =""):
+    def send(self, text="", username='', avatar_url='', embed="", file=""):
         print(text)
 
+
 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(
-    "-fl",
-    "--fulllog",
-    dest="fulllog",
-    help="enable full logging in discord",
-    action="store_true",
-)
-
-parser.add_argument(
-    "-d",
-    "--dev",
-    dest="dev",
-    help="enable dev mode",
-    action="store_true",
-)
-
-parser.add_argument(
-    "-c", 
-    "--config", 
-    help="Choose a specific config file", 
+    "-c",
+    "--config",
+    help="Choose a specific config file",
     default=""
 )
 
-
-parser.add_argument( 
-    "-v", 
+parser.add_argument(
+    "-v",
     "--vnc",
     help="enable VNC",
     dest="vnc"
 )
 
-parser.add_argument( 
+parser.add_argument(
     "--version",
     help="display a message on discord to tell that the bot have been updated",
     dest="update_version",
@@ -66,8 +34,8 @@ parser.add_argument(
 )
 
 parser.add_argument(
-    "--very-custom", 
-    help="Choose a specific config file", 
+    "--json",
+    help="input json to start the bot with custom parameters",
     default=""
 )
 
@@ -80,31 +48,21 @@ with open("/app/MsRewards-Reborn/user_data/proxy.json", "r") as inFile:
 with open("/app/MsRewards-Reborn/user_data/configs.json", "r") as inFile:
     config = json.load(inFile)
 
-
 args = parser.parse_args()
 
-g.custom_start = args.override
-g.unban = args.unban
-g.full_log = args.fulllog
-g.dev = args.dev
-g.very_custom = args.very_custom
-
-if g.custom_start :
-    g.log = True
+g.json_start = args.json
 
 g.vnc_enabled = args.vnc != "None"
 g.vnc_port = args.vnc
 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()
 
+g.start_time = time()
 
 # path configurations
 g.mot_path = "/usr/share/dict/french"
 g.credential_path = "/app/MsRewards-Reborn/user_data/login.csv"
 
-
 discord_conf = config[args.config]["discord"]
 
 # discord configuration
@@ -115,39 +73,35 @@ g.discord_enabled_success = discord[discord_conf]["successT"] == "True"
 
 g.avatar_url = settings["avatarlink"]
 
-if not g.very_custom :
+if not g.json_start:
     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())
-else :
+else:
     webhookFailure = FakeWebHook()
     webhookSuccess = FakeWebHook()
+
+
 # base settings
-g.discord_embed = False # send new point value in an embed, fixed for now
+g.discord_embed = False  # send new point value in an embed, fixed for now
 g.headless = False
 
 # proxy settings
 g.proxy_enabled = config[args.config]["proxy"] != "-1"
-if g.proxy_enabled :
+if g.proxy_enabled:
     g.proxy_address = proxy[config[args.config]["proxy"]]["address"]
     g.proxy_port = proxy[config[args.config]["proxy"]]["port"]
 
 
-g.fast = False
-
 # list of words
-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.mot_path, "r", encoding="utf-8") as h:
+    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]
 
 
-Credentials = [ (config[args.config]['accounts'][x]["mail"],config[args.config]['accounts'][x]["pwd"],config[args.config]['accounts'][x]["2fa"]) for x in config[args.config]['accounts']]
-g._cred = Credentials
-
-if g.proxy_enabled :
-    setup_proxy(g.proxy_address,g.proxy_port)
+if g.proxy_enabled:
+    setup_proxy(g.proxy_address, g.proxy_port)