Jaculabilis
/
amanuensis
1
1
Fork 0
Code Issues 19 Pull Requests Projects 1 Releases Activity

Refactor lexicon.join handler

This commit is contained in:
Tim Van Baak 2020-04-27 22:04:13 -07:00
parent e311202700
commit c09851333e
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
amanuensis/server/lexicon/__init__.py
View File

@ -32,20 +32,24 @@ def join(name):
form = LexiconJoinForm() form = LexiconJoinForm()
if form.validate_on_submit(): if not form.validate_on_submit():
# Gate on password if one is required # GET or POST with invalid form data
if (g.lexicon.cfg.join.password return render_template('lexicon.join.jinja', form=form)
and form.password.data != g.lexicon.cfg.join.password):
return redirect(url_for("lexicon.join", name=name))
# Gate on join validity
if player_can_join_lexicon(current_user, g.lexicon, form.password.data):
add_player_to_lexicon(current_user, g.lexicon)
return redirect(url_for('session.session', name=name))
else:
flash("Could not join game")
return redirect(url_for("home.home", name=name))
return render_template('lexicon.join.jinja', form=form) # POST with valid data
# If the game is passworded, check password
if (g.lexicon.cfg.join.password
and form.password.data != g.lexicon.cfg.join.password):
# Bad creds, try again
flash('Incorrect password')
return redirect(url_for('lexicon.join', name=name))
# If the password was correct, check if the user can join
if player_can_join_lexicon(current_user, g.lexicon, form.password.data):
add_player_to_lexicon(current_user, g.lexicon)
return redirect(url_for('session.session', name=name))
else:
flash('Could not join game')
return redirect(url_for('home.home', name=name))
@bp_lexicon.route('/contents/', methods=['GET']) @bp_lexicon.route('/contents/', methods=['GET'])