Update app.py

app.py

@@ -41,31 +41,31 @@ def client_log_in():
 
     global slider_choice
     server = slider_choice
-    
+
     if server != None:
         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'))
-    
+
         print("server: {}".format(server))
         print("server dict {}".format(secrets[server]))
-    
+
         client_id = secrets[server]["client_id"]
         client_secret = secrets[server]["client_secret"]
         password = secrets[server]["password"]
         username = os.getenv('username')
-    
-    
+
+
         mastodon = Mastodon(
             client_id=client_id,client_secret=client_secret,
             api_base_url='https://{}'.format(server)
         )
-    
+
         access_token = mastodon.log_in(
             username=username,
             password=password,
@@ -101,12 +101,12 @@ def login_from_code(code):
         secrets = json.loads(os.getenv('secrets_json'))
         client_id = secrets[server]["client_id"]
         client_secret = secrets[server]["client_secret"]
-    
+
         mastodon = Mastodon(
             client_id=client_id, client_secret=client_secret,
             api_base_url='https://{}'.format(server)
         )
-    
+
         mastodon.log_in(code=code,
                         scopes=["write:blocks", "write:mutes"],
                         redirect_uri="https://user1342-ivory.hf.space/")
@@ -361,12 +361,16 @@ get_window_url_params = """
         return [text_input, url_params];
         }
     """
-slider_choice = None
+slider_choice = list_of_servers[0]
 def update_server(choice):
     print("In change server")
     global slider_choice
     slider_choice = choice
 
+    get_target_website()
+
+    return auth_button_text.format(get_target_website())
+
 def get_chatbot_text():
     return [('Welcome to Watchtower.', 'Log in via Mastodon and configure your blocking options above.')]
 
@@ -406,11 +410,11 @@ with block:
                 text_input = gr.Text(label="Input", visible=False).style()
                 text_output = gr.Text(label="Output", visible=False).style()
                 with gr.Row().style(equal_height=True):
+                    dropdown = gr.Dropdown(choices=list_of_servers, label="Server", value=list_of_servers[0])
                     html_button = mastodon_auth_button = gr.HTML(
                         value=auth_button_text.format(
                             get_target_website())).style(
                     )
-                    dropdown = gr.Dropdown(choices=list_of_servers, label="Server")
                 with gr.Row().style(equal_height=True):
                     radio = gr.CheckboxGroup(value=["Violent", "Hate Speech"],
                                              choices=["Violent", "Hate Speech", "Misinformation"],
@@ -423,7 +427,7 @@ with block:
                     color_map=["grey", "purple"])
 
                 btn = gr.Button("Run WatchTower").style(full_width=True).style()
-    dropdown.change(fn=update_server, inputs=[dropdown])
+    dropdown.change(fn=update_server, inputs=[dropdown], outputs=html_button)
     btn.click(fn=button_pressed, inputs=[slider, url_params],
               outputs=[text_output, chatbot], _js=get_window_url_params)
     gr.Markdown(