yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makes registration user/localname fields more sensible

Browse Source
This commit is contained in:
Mouse Reeve
2020-12-24 11:39:27 -08:00
parent f6f075fac6
commit e89bfdc572
6 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bookwyrm/view_actions.py
View File

@ -66,13 +66,13 @@ def register(request):
if not form.is_valid():
errors = True
username = form.data['username'].strip()
localname = form.data['localname'].strip()
email = form.data['email']
password = form.data['password']
# check username and email uniqueness
if models.User.objects.filter(localname=username).first():
form.add_error('username', 'User with this username already exists')
# check localname and email uniqueness
if models.User.objects.filter(localname=localname).first():
form.add_error('localname', 'User with this username already exists')
errors = True
if errors:
@ -82,8 +82,9 @@ def register(request):
}
return TemplateResponse(request, 'login.html', data)
username = '%s@%s' % (localname, DOMAIN)
user = models.User.objects.create_user(
username, email, password, local=True)
username, email, password, localname=localname, local=True)
if invite:
invite.times_used += 1
invite.save()