Spaces:
Runtime error
Runtime error
Update app.py
Browse files
app.py
CHANGED
|
@@ -6,7 +6,6 @@ list_of_servers = ['peoplemaking.games',
|
|
| 6 |
'tilde.zone',
|
| 7 |
'hostux.social',
|
| 8 |
'social.linux.pizza',
|
| 9 |
-
'nerdculture.de',
|
| 10 |
'toot.wales',
|
| 11 |
'kolektiva.social',
|
| 12 |
'seo.chat',
|
|
@@ -54,9 +53,6 @@ def client_log_in(provided_server = None):
|
|
| 54 |
|
| 55 |
secrets = json.loads(os.getenv('secrets_json'))
|
| 56 |
|
| 57 |
-
print("server: {}".format(server))
|
| 58 |
-
print("server dict {}".format(secrets[server]))
|
| 59 |
-
|
| 60 |
client_id = secrets[server]["client_id"]
|
| 61 |
client_secret = secrets[server]["client_secret"]
|
| 62 |
password = secrets[server]["password"]
|
|
@@ -80,13 +76,25 @@ def client_log_in(provided_server = None):
|
|
| 80 |
return mastodon
|
| 81 |
|
| 82 |
|
| 83 |
-
def get_auth_url(mastodon):
|
| 84 |
'''
|
| 85 |
Retrieves a URL for the user to visit to auth them with WatchTower.
|
| 86 |
:param mastodon: A admin masterdon instance.
|
| 87 |
:return: The target URL.
|
| 88 |
'''
|
| 89 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 90 |
redirect_uris="https://user1342-ivory.hf.space/")
|
| 91 |
|
| 92 |
|
|
@@ -384,7 +392,7 @@ def get_target_website(provided_server = None):
|
|
| 384 |
'''
|
| 385 |
|
| 386 |
mastodon = client_log_in(provided_server)
|
| 387 |
-
return get_auth_url(mastodon)
|
| 388 |
|
| 389 |
|
| 390 |
# The Gradio HTML component used for the 'sign in with Mastodon' button
|
|
|
|
| 6 |
'tilde.zone',
|
| 7 |
'hostux.social',
|
| 8 |
'social.linux.pizza',
|
|
|
|
| 9 |
'toot.wales',
|
| 10 |
'kolektiva.social',
|
| 11 |
'seo.chat',
|
|
|
|
| 53 |
|
| 54 |
secrets = json.loads(os.getenv('secrets_json'))
|
| 55 |
|
|
|
|
|
|
|
|
|
|
| 56 |
client_id = secrets[server]["client_id"]
|
| 57 |
client_secret = secrets[server]["client_secret"]
|
| 58 |
password = secrets[server]["password"]
|
|
|
|
| 76 |
return mastodon
|
| 77 |
|
| 78 |
|
| 79 |
+
def get_auth_url(mastodon,provided_server = None):
|
| 80 |
'''
|
| 81 |
Retrieves a URL for the user to visit to auth them with WatchTower.
|
| 82 |
:param mastodon: A admin masterdon instance.
|
| 83 |
:return: The target URL.
|
| 84 |
'''
|
| 85 |
+
|
| 86 |
+
if provided_server == None:
|
| 87 |
+
global slider_choice
|
| 88 |
+
server = slider_choice
|
| 89 |
+
else:
|
| 90 |
+
server = provided_server
|
| 91 |
+
|
| 92 |
+
secrets = json.loads(os.getenv('secrets_json'))
|
| 93 |
+
|
| 94 |
+
client_id = secrets[server]["client_id"]
|
| 95 |
+
client_secret = secrets[server]["client_secret"]
|
| 96 |
+
|
| 97 |
+
return mastodon.auth_request_url(client_id=client_id,client_secret=client_secret, scopes=["write:blocks", "write:mutes"],
|
| 98 |
redirect_uris="https://user1342-ivory.hf.space/")
|
| 99 |
|
| 100 |
|
|
|
|
| 392 |
'''
|
| 393 |
|
| 394 |
mastodon = client_log_in(provided_server)
|
| 395 |
+
return get_auth_url(mastodon, provided_server)
|
| 396 |
|
| 397 |
|
| 398 |
# The Gradio HTML component used for the 'sign in with Mastodon' button
|