lynnesbian/FediBooks
lynnesbian/FediBooks
1
0
Fork 0
mirror of https://github.com/Lynnesbian/FediBooks/ synced 2024-11-25 08:38:59 +00:00
Code Issues Releases Wiki Activity

fix pleroma support

Browse source
This commit is contained in:
Lynne Megido 2019-09-12 21:54:55 +10:00
parent 30ccd37505
commit 129a7a78f8
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webui.py
View file

@ -20,6 +20,7 @@ app.config['MYSQL_PASSWORD'] = cfg['db_pass']
mysql = MySQL(app) mysql = MySQL(app)
scopes = ['write:statuses', 'write:accounts', 'read:accounts', 'read:notifications', 'read:statuses', 'push'] scopes = ['write:statuses', 'write:accounts', 'read:accounts', 'read:notifications', 'read:statuses', 'push']
scopes_pleroma = ['read', 'write', 'push']
@app.before_request @app.before_request
def login_check(): def login_check():
@ -421,7 +422,7 @@ def bot_create():
session['client_id'], session['client_secret'] = Mastodon.create_app( session['client_id'], session['client_secret'] = Mastodon.create_app(
"FediBooks", "FediBooks",
api_base_url="https://{}".format(session['instance']), api_base_url="https://{}".format(session['instance']),
scopes=scopes, scopes=scopes if session['instance_type'] == 'Mastodon' else scopes_pleroma,
redirect_uris=[redirect_uri], redirect_uris=[redirect_uri],
website=cfg['base_uri'] website=cfg['base_uri']
) )
@ -432,7 +433,11 @@ def bot_create():
api_base_url="https://{}".format(session['instance']) api_base_url="https://{}".format(session['instance'])
) )
url = client.auth_request_url(client_id=session['client_id'], redirect_uris=redirect_uri, scopes=scopes) url = client.auth_request_url(
client_id=session['client_id'],
redirect_uris=redirect_uri,
scopes=scopes if session['instance_type'] == 'Mastodon' else scopes_pleroma
)
return redirect(url, code=303) return redirect(url, code=303)
elif session['instance_type'] == 'Misskey': elif session['instance_type'] == 'Misskey':
@ -452,7 +457,11 @@ def bot_create():
try: try:
# test authentication # test authentication
client = Mastodon(client_id=session['client_id'], client_secret=session['client_secret'], api_base_url=session['instance']) client = Mastodon(client_id=session['client_id'], client_secret=session['client_secret'], api_base_url=session['instance'])
session['secret'] = client.log_in(code = session['code'], scopes=scopes, redirect_uri='{}/do/authenticate_bot'.format(cfg['base_uri'])) session['secret'] = client.log_in(
code = session['code'],
scopes=scopes if session['instance_type'] == 'Mastodon' else scopes_pleroma,
redirect_uri='{}/do/authenticate_bot'.format(cfg['base_uri'])
)
username = client.account_verify_credentials()['username'] username = client.account_verify_credentials()['username']
handle = "@{}@{}".format(username, session['instance']) handle = "@{}@{}".format(username, session['instance'])
except: except: