djsundog/brutaldon
1
0
Fork 0
mirror of http://git.carcosa.net/jmcbray/brutaldon.git synced 2024-11-27 09:10:08 -05:00
Code Issues Projects Releases Wiki Activity

Make sure newly created accounts have preferences attached

Browse Source
This commit is contained in:
Jason McBrayer 2018-06-19 06:26:35 -04:00
parent 6cbb2d10ed
commit cbb5b544ed
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
brutaldon/views.py
View File

@ -216,6 +216,17 @@ def oauth_callback(request):
redirect_uri=redirect_uri) redirect_uri=redirect_uri)
request.session['access_token'] = access_token request.session['access_token'] = access_token
user = mastodon.account_verify_credentials() user = mastodon.account_verify_credentials()
try:
account = Account.objects.get(username=username, client_id=client.id)
account.access_token = access_token
account.save()
except (Account.DoesNotExist, Account.MultipleObjectsReturned):
preferences = Preferences(theme = Theme.objects.get(1))
account = Account(username=user.acct,
access_token = access_token,
client = Client.objects.get(api_base_id=request.session['instance']),
preferences = preferences)
account.save()
request.session['user'] = user request.session['user'] = user
return redirect(home) return redirect(home)
@ -259,10 +270,12 @@ def old_login(request):
try: try:
account = Account.objects.get(username=username, client_id=client.id) account = Account.objects.get(username=username, client_id=client.id)
except (Account.DoesNotExist, Account.MultipleObjectsReturned): except (Account.DoesNotExist, Account.MultipleObjectsReturned):
preferences = Preferences(theme = Theme.objects.get(1))
account = Account( account = Account(
username = username, username = username,
access_token = "", access_token = "",
client = client) client = client,
preferences = preferences)
try: try:
access_token = mastodon.log_in(username, access_token = mastodon.log_in(username,
password) password)