southfox/mastodon-BDSM
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity

[fix] fix secret path

Browse source
This commit is contained in:
SouthFox 2023-05-24 14:05:05 +08:00
parent 0aa8e08f05
commit 18f946b706
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BDSM/toot.py
View file

@ -22,7 +22,7 @@ def app_register(url):
def app_login(url): def app_login(url):
mastodon = Mastodon( mastodon = Mastodon(
client_id='data/pyBDSM_clientcred.secret', client_id='data/pyBDSM_clientcred.secret',
access_token='user.secret', access_token='data/user.secret',
api_base_url=url api_base_url=url
) )

44
BDSM/views.py
View file

@ -12,6 +12,7 @@ from BDSM.toot import app_login, app_register, archive_toot, get_context
from mastodon import Mastodon from mastodon import Mastodon
from types import SimpleNamespace from types import SimpleNamespace
from datetime import timezone from datetime import timezone
from typing import Any
@ -157,47 +158,46 @@ def settings():
return redirect(url_for('settings')) return redirect(url_for('settings'))
settings = Settings.query.first() settings = Settings.query.first()
app_init = os.path.isfile('pyBDSM_clientcred.secret') and os.path.isfile('user.secret') app_init = os.path.isfile("data/pyBDSM_clientcred.secret") and os.path.isfile("data/user.secret")
if settings == None: if settings == None:
flash('请输入相关设置！') flash('请输入相关设置！')
return render_template('settings.html',settings=settings, app_init=app_init) return render_template('settings.html',settings=settings, app_init=app_init)
@app.route('/register', methods=['GET', 'POST']) @app.route("/register", methods=["GET", "POST"])
def register(): def register() -> Any:
settings = Settings.query.first() settings = Settings.query.first()
if settings == None: if settings == None:
flash('请先输入站点地址！') flash('请先输入站点地址！')
return redirect(url_for('settings')) return redirect(url_for('settings'))
else: else:
if os.path.isfile("data/user.secret"):
flash('应用已授权！')
return redirect(url_for("settings"))
domain = settings.domain domain = settings.domain
url = "https://" + domain url = "https://" + domain
if not os.path.isfile("data/pyBDSM_clientcred.secret"):
app_register(url)
if request.method == 'POST':
token = request.form['token'].rstrip()
mastodon = Mastodon(client_id="data/pyBDSM_clientcred.secret", api_base_url=url)
print("test")
mastodon.log_in(code=token, to_file="data/user.secret", scopes=['read'])
if not os.path.isfile("data/user.secret"):
mastodon = Mastodon(client_id="data/pyBDSM_clientcred.secret", api_base_url=url)
url = mastodon.auth_request_url(client_id="data/pyBDSM_clientcred.secret", scopes=['read'])
return render_template("register.html",url=url)
mastodon, _ = app_login(url) mastodon, _ = app_login(url)
account = mastodon.me().acct account = mastodon.me().acct
settings.account = account settings.account = account
db.session.commit() db.session.commit()
if request.method == 'POST':
token = request.form['token'].rstrip()
mastodon = Mastodon(client_id='pyBDSM_clientcred.secret', api_base_url=url)
mastodon.log_in(code=token, to_file='user.secret', scopes=['read'])
if os.path.isfile('user.secret'):
flash('应用已授权！')
return redirect(url_for('settings'))
if not os.path.isfile('pyBDSM_clientcred.secret'):
app_register(url)
if not os.path.isfile('user.secret'):
mastodon = Mastodon(client_id='pyBDSM_clientcred.secret', api_base_url=url)
url = mastodon.auth_request_url(client_id='pyBDSM_clientcred.secret', scopes=['read'])
return render_template('register.html',url=url)
flash('已授权过！')
return redirect(url_for('settings'))
@app.route('/archive', methods=['GET', 'POST']) @app.route('/archive', methods=['GET', 'POST'])
def archive(): def archive():