Update app.py

app.py

@@ -1,53 +1,30 @@
 from mastodon import Mastodon  # Mastodon.py
 
-list_of_servers = [
-"mastodon.social",
-"peoplemaking.games",
-"maly.io",
-"ani.work",
-"libretooth.gr",
-"tilde.zone",
-"pettingzoo.co",
-"phpc.social",
-"hostux.social",
-"activism.openworlds.info",
-"metalhead.club",
-"x0r.be",
-"mathstodon.xyz",
-"indieweb.social",
-"social.linux.pizza",
-"lor.sh",
-"nerdculture.de",
-"toot.wales",
-"kolektiva.social",
-"mastodon.pirateparty.be",
-"socel.net",
-"mastodon.nz",
-"noc.social",
-"seo.chat",
-"ioc.exchange",
-"qoto.org",
-"glasgow.social",
-"primarycare.app",
-"mindly.social",
-"mstdn.party",
-"universeodon.com",
-"learningdisability.social",
-"ravenation.club",
-"home.social",
-"mastodon.ie",
-"techhub.social",
-"mastodon.scot",
-"sfba.social",
-"mastodon.sdf.org",
-"fosstodon.org",
-"mastodon.lol",
-"mastodonapp.uk",
-"mstdn.social",
-"mas.to",
-"newsie.social",
-"social.bau-ha.us",
-"infosec.exchange"]
+list_of_servers = ['peoplemaking.games',
+ 'ani.work',
+ 'libretooth.gr',
+ 'tilde.zone',
+ 'hostux.social',
+ 'social.linux.pizza',
+ 'nerdculture.de',
+ 'toot.wales',
+ 'kolektiva.social',
+ 'seo.chat',
+ 'ioc.exchange',
+ 'glasgow.social',
+ 'mindly.social',
+ 'mstdn.party',
+ 'universeodon.com',
+ 'ravenation.club',
+ 'home.social',
+ 'techhub.social',
+ 'mastodon.scot',
+ 'sfba.social',
+ 'mastodon.sdf.org',
+ 'mastodon.lol',
+ 'mstdn.social',
+ 'mas.to',
+ 'newsie.social']
 
 # A HTML blob of text used to define the 'login in with' button
 auth_button_text = '''<a href="{}"><button class="w3-button w3-light-grey w3-padding-large w3-section " onclick="document.getElementById('download').style.display='block'">
@@ -61,24 +38,32 @@ def client_log_in():
      Generates an authenticated Masterdon client for the admin user. Used for retireving the target website URL
     '''
 
-    # Setup a 'secret' file used for persisting session between requests.
-    secret_file = open("ivory-secret.txt", "w")
-    secret_file.write("{}\n".format(os.getenv('app_secret_1')))
-    secret_file.write("{}\n".format(os.getenv('app_secret_2')))
-    secret_file.write("https://infosec.exchange\n")
-    secret_file.write("WatchTower | Ivory")
-    secret_file.close()
+
+    global slider_choice
+    server = slider_choice
+    id = "WatchTower Ivory | Mastodon"
+
+    #client_id, client_secret = Mastodon.create_app(id,
+    #                    api_base_url= server, scopes=["write:blocks", "write:mutes"],
+    #                    redirect_uris="https://user1342-ivory.hf.space/",
+    #                    website="https://www.watchtower.cartographer.one/")
+    
+    secrets = json.loads(os.getenv('secrets_json'))
+    client_id = secrets[server]["client_id"]
+    client_secret = secrets[server]["client_secret"]
+    password = secrets[server]["password"]
+    username = os.getenv('username')
+    
 
     mastodon = Mastodon(
-        client_id="ivory-secret.txt",
-        api_base_url='https://infosec.exchange'
+        client_id=client_id,client_secret=client_secret,
+        api_base_url='https://{}'.format(server)
     )
 
-    mastodon.log_in(
-        os.getenv('username'),
-        os.getenv('password'),
-        scopes=["write:blocks", "write:mutes"],
-        redirect_uri="https://user1342-ivory.hf.space/",
+    access_token = mastodon.log_in(
+        username=username,
+        password=password,
+        redirect_uri="https://user1342-ivory.hf.space/"
     )
 
     return mastodon
@@ -100,9 +85,17 @@ def login_from_code(code):
     :param code: The code which will authenticate the user/ WatchTower.
     :return: A masterdon client instance signed in as the user.
     '''
+
+    global slider_choice
+    server = slider_choice
+
+    secrets = json.loads(os.getenv('secrets_json'))
+    client_id = secrets[server]["client_id"]
+    client_secret = secrets[server]["client_secret"]
+
     mastodon = Mastodon(
-        client_id="ivory-secret.txt",
-        api_base_url='https://infosec.exchange'
+        client_id=client_id, client_secret=client_secret,
+        api_base_url='https://{}'.format(server)
     )
 
     mastodon.log_in(code=code,
@@ -225,8 +218,7 @@ def block_users(client, threshold, dataset):
     :return: The number of blocked users.
     '''
     num_users_blocked = 0
-    global dropdown
-    print("Testing dropdown value {}".format(slider_choice))
+
 
     for filename in os.listdir("users"):
         filename = os.path.join("users", filename)