Reintegrate lexicon routes and joining

amanuensis/errors.py

@@ -16,7 +16,6 @@ class BackendArgumentTypeError(ArgumentError):
     A call to a backend function was made with a value of an invalid type for the parameter.
     Specify the invalid parameter and value as a kwarg.
     """
-
     def __init__(self, obj_type, **kwarg):
         if not kwarg:
             raise ValueError("Missing kwarg")

amanuensis/server/__init__.py

@@ -11,7 +11,6 @@ from amanuensis.parser import filesafe_title
 import amanuensis.server.auth as auth
 import amanuensis.server.home as home
 import amanuensis.server.lexicon as lexicon
-import amanuensis.server.session as session
 
 
 def date_format(dt: datetime, formatstr="%Y-%m-%d %H:%M:%S%z") -> str:
@@ -83,7 +82,6 @@ def get_app(
     app.register_blueprint(auth.bp)
     app.register_blueprint(home.bp)
     app.register_blueprint(lexicon.bp)
-    app.register_blueprint(session.bp)
 
     # Add a root redirect
     def root():

amanuensis/server/lexicon.jinja

@@ -26,10 +26,7 @@
     {% else %}href="{{ url_for('lexicon.stats', name=g.lexicon.name) }}"
     {% endif %}>Statistics</a>{% endblock %}
 
-{% if current_user.is_authenticated and (
-    current_user.is_site_admin
-    or memq.try_from_ids(g.db, current_user.id, g.lexicon.id)
- ) %}
+{% if current_user.is_authenticated and memq.try_from_ids(g.db, current_user.id, g.lexicon.id) %}
     {# self.sb_logo(), #}
 {% set template_sidebar_rows = [
     self.sb_home(),

amanuensis/server/session/__init__.py

@@ -1,240 +1,245 @@
 from flask import (
-    Blueprint,
-)
+	Blueprint,
+	render_template,
+	url_for,
+	redirect,
+	g,
+	flash,
+	request,
+	Markup)
+from flask_login import current_user
 
-# from flask_login import current_user
+from amanuensis.lexicon import (
+	attempt_publish,
+	get_player_characters,
+	create_character_in_lexicon,
+	get_draft)
+from amanuensis.models import LexiconModel
+from amanuensis.parser import parse_raw_markdown
+from amanuensis.server.helpers import (
+	lexicon_param,
+	player_required,
+	editor_required)
 
-# from amanuensis.lexicon import (
-# 	attempt_publish,
-# 	get_player_characters,
-# 	create_character_in_lexicon,
-# 	get_draft)
-# from amanuensis.models import LexiconModel
-# from amanuensis.parser import parse_raw_markdown
-# from amanuensis.server.helpers import (
-# 	lexicon_param,
-# 	player_required,
-# 	editor_required)
+from .forms import (
+	LexiconCharacterForm,
+	LexiconReviewForm,
+	LexiconPublishTurnForm,
+	LexiconConfigForm)
 
-# from .forms import (
-# 	LexiconCharacterForm,
-# 	LexiconReviewForm,
-# 	LexiconPublishTurnForm,
-# 	LexiconConfigForm)
-
-# from .editor import load_editor, new_draft, update_draft, PreviewHtmlRenderer
+from .editor import load_editor, new_draft, update_draft, PreviewHtmlRenderer
 
 
-bp = Blueprint(
-    "session", __name__, url_prefix="/lexicon/<name>/session", template_folder="."
-)
+bp_session = Blueprint('session', __name__,
+	url_prefix='/lexicon/<name>/session',
+	template_folder='.')
 
 
-# @bp_session.route('/', methods=['GET', 'POST'])
-# @lexicon_param
-# @player_required
-# def session(name):
-# 	drafts = []
-# 	approved = []
-# 	draft_ctx = g.lexicon.ctx.draft
-# 	draft_filenames = draft_ctx.ls()
-# 	for draft_filename in draft_filenames:
-# 		with draft_ctx.read(draft_filename) as draft:
-# 			if draft.status.ready and not draft.status.approved:
-# 				drafts.append(draft)
-# 			if draft.status.approved:
-# 				approved.append(draft)
-# 	characters = []
-# 	for char in g.lexicon.cfg.character.values():
-# 		if char.player == current_user.uid:
-# 			characters.append(char)
-# 	form = LexiconPublishTurnForm()
-# 	if form.validate_on_submit():
-# 		if attempt_publish(g.lexicon):
-# 			return redirect(url_for('lexicon.contents', name=name))
-# 		else:
-# 			flash('Publish failed')
-# 			return redirect(url_for('session.session', name=name))
-# 	return render_template(
-# 		'session.root.jinja',
-# 		ready_articles=drafts,
-# 		approved_articles=approved,
-# 		characters=characters,
-# 		publish_form=form)
+@bp_session.route('/', methods=['GET', 'POST'])
+@lexicon_param
+@player_required
+def session(name):
+	drafts = []
+	approved = []
+	draft_ctx = g.lexicon.ctx.draft
+	draft_filenames = draft_ctx.ls()
+	for draft_filename in draft_filenames:
+		with draft_ctx.read(draft_filename) as draft:
+			if draft.status.ready and not draft.status.approved:
+				drafts.append(draft)
+			if draft.status.approved:
+				approved.append(draft)
+	characters = []
+	for char in g.lexicon.cfg.character.values():
+		if char.player == current_user.uid:
+			characters.append(char)
+	form = LexiconPublishTurnForm()
+	if form.validate_on_submit():
+		if attempt_publish(g.lexicon):
+			return redirect(url_for('lexicon.contents', name=name))
+		else:
+			flash('Publish failed')
+			return redirect(url_for('session.session', name=name))
+	return render_template(
+		'session.root.jinja',
+		ready_articles=drafts,
+		approved_articles=approved,
+		characters=characters,
+		publish_form=form)
 
 
-# def edit_character(name, form, character):
-# 	if not form.is_submitted():
-# 		# GET, populate with values
-# 		return render_template(
-# 			'session.character.jinja', form=form.for_character(character))
+def edit_character(name, form, character):
+	if not form.is_submitted():
+		# GET, populate with values
+		return render_template(
+			'session.character.jinja', form=form.for_character(character))
 
-# 	if not form.validate():
-# 		# POST with invalid data, return unchanged
-# 		return render_template('session.character.jinja', form=form)
+	if not form.validate():
+		# POST with invalid data, return unchanged
+		return render_template('session.character.jinja', form=form)
 
-# 	# POST with valid data, update character
-# 	with g.lexicon.ctx.edit_config() as cfg:
-# 		char = cfg.character[character.cid]
-# 		char.name = form.characterName.data
-# 		char.signature = form.defaultSignature.data
-# 	flash('Character updated')
-# 	return redirect(url_for('session.session', name=name))
+	# POST with valid data, update character
+	with g.lexicon.ctx.edit_config() as cfg:
+		char = cfg.character[character.cid]
+		char.name = form.characterName.data
+		char.signature = form.defaultSignature.data
+	flash('Character updated')
+	return redirect(url_for('session.session', name=name))
 
 
-# def create_character(name: str, form: LexiconCharacterForm):
-# 	# Characters can't be created if the game has already started
-# 	if g.lexicon.status != LexiconModel.PREGAME:
-# 		flash("Characters can't be added after the game has started")
-# 		return redirect(url_for('session.session', name=name))
-# 	# Characters can't be created beyond the per-player limit
-# 	player_characters = get_player_characters(g.lexicon, current_user.uid)
-# 	if len(list(player_characters)) >= g.lexicon.cfg.join.chars_per_player:
-# 		flash("Can't create more characters")
-# 		return redirect(url_for('session.session', name=name))
+def create_character(name: str, form: LexiconCharacterForm):
+	# Characters can't be created if the game has already started
+	if g.lexicon.status != LexiconModel.PREGAME:
+		flash("Characters can't be added after the game has started")
+		return redirect(url_for('session.session', name=name))
+	# Characters can't be created beyond the per-player limit
+	player_characters = get_player_characters(g.lexicon, current_user.uid)
+	if len(list(player_characters)) >= g.lexicon.cfg.join.chars_per_player:
+		flash("Can't create more characters")
+		return redirect(url_for('session.session', name=name))
 
-# 	if not form.is_submitted():
-# 		# GET, populate with default values
-# 		return render_template(
-# 			'session.character.jinja', form=form.for_new())
+	if not form.is_submitted():
+		# GET, populate with default values
+		return render_template(
+			'session.character.jinja', form=form.for_new())
 
-# 	if not form.validate():
-# 		# POST with invalid data, return unchanged
-# 		return render_template('session.character.jinja', form=form)
+	if not form.validate():
+		# POST with invalid data, return unchanged
+		return render_template('session.character.jinja', form=form)
 
-# 	# POST with valid data, create character
-# 	char_name = form.characterName.data
-# 	cid = create_character_in_lexicon(current_user, g.lexicon, char_name)
-# 	with g.lexicon.ctx.edit_config() as cfg:
-# 		cfg.character[cid].signature = form.defaultSignature.data
-# 	flash('Character created')
-# 	return redirect(url_for('session.session', name=name))
+	# POST with valid data, create character
+	char_name = form.characterName.data
+	cid = create_character_in_lexicon(current_user, g.lexicon, char_name)
+	with g.lexicon.ctx.edit_config() as cfg:
+		cfg.character[cid].signature = form.defaultSignature.data
+	flash('Character created')
+	return redirect(url_for('session.session', name=name))
 
 
-# @bp_session.route('/character/', methods=['GET', 'POST'])
-# @lexicon_param
-# @player_required
-# def character(name):
-# 	form = LexiconCharacterForm()
-# 	cid = request.args.get('cid')
-# 	if not cid:
-# 		# No character specified, creating a new character
-# 		return create_character(name, form)
+@bp_session.route('/character/', methods=['GET', 'POST'])
+@lexicon_param
+@player_required
+def character(name):
+	form = LexiconCharacterForm()
+	cid = request.args.get('cid')
+	if not cid:
+		# No character specified, creating a new character
+		return create_character(name, form)
 
-# 	character = g.lexicon.cfg.character.get(cid)
-# 	if not character:
-# 		# Bad character id, abort
-# 		flash('Character not found')
-# 		return redirect(url_for('session.session', name=name))
-# 	if current_user.uid not in (character.player, g.lexicon.cfg.editor):
-# 		# Only its owner and the editor can edit a character
-# 		flash('Access denied')
-# 		return redirect(url_for('session.session', name=name))
-# 	# Edit allowed
-# 	return edit_character(name, form, character)
+	character = g.lexicon.cfg.character.get(cid)
+	if not character:
+		# Bad character id, abort
+		flash('Character not found')
+		return redirect(url_for('session.session', name=name))
+	if current_user.uid not in (character.player, g.lexicon.cfg.editor):
+		# Only its owner and the editor can edit a character
+		flash('Access denied')
+		return redirect(url_for('session.session', name=name))
+	# Edit allowed
+	return edit_character(name, form, character)
 
 
-# @bp_session.route('/settings/', methods=['GET', 'POST'])
-# @lexicon_param
-# @editor_required
-# def settings(name):
-# 	form: LexiconConfigForm = LexiconConfigForm(g.lexicon)
+@bp_session.route('/settings/', methods=['GET', 'POST'])
+@lexicon_param
+@editor_required
+def settings(name):
+	form: LexiconConfigForm = LexiconConfigForm(g.lexicon)
 
-# 	if not form.is_submitted():
-# 		# GET
-# 		form.load(g.lexicon)
-# 		return render_template('session.settings.jinja', form=form)
+	if not form.is_submitted():
+		# GET
+		form.load(g.lexicon)
+		return render_template('session.settings.jinja', form=form)
 
-# 	if not form.validate():
-# 		# POST with invalid data
-# 		flash('Validation error')
-# 		return render_template('session.settings.jinja', form=form)
+	if not form.validate():
+		# POST with invalid data
+		flash('Validation error')
+		return render_template('session.settings.jinja', form=form)
 
-# 	# POST with valid data
-# 	form.save(g.lexicon)
-# 	flash('Settings updated')
-# 	return redirect(url_for('session.session', name=name))
+	# POST with valid data
+	form.save(g.lexicon)
+	flash('Settings updated')
+	return redirect(url_for('session.session', name=name))
 
 
-# @bp_session.route('/review/', methods=['GET', 'POST'])
-# @lexicon_param
-# @editor_required
-# def review(name):
-# 	# Ensure the article exists
-# 	draft = get_draft(g.lexicon, request.args.get('aid'))
-# 	if not draft:
-# 		flash("Unknown article id")
-# 		return redirect(url_for('session.session', name=name))
+@bp_session.route('/review/', methods=['GET', 'POST'])
+@lexicon_param
+@editor_required
+def review(name):
+	# Ensure the article exists
+	draft = get_draft(g.lexicon, request.args.get('aid'))
+	if not draft:
+		flash("Unknown article id")
+		return redirect(url_for('session.session', name=name))
 
-# 	draft_filename = f'{draft.character}.{draft.aid}'
-# 	with g.lexicon.ctx.draft.edit(draft_filename) as draft:
-# 		# If the article was unreadied in the meantime, abort
-# 		if not draft.status.ready:
-# 			flash("Article was rescinded")
-# 			return redirect(url_for('session.session', name=name))
+	draft_filename = f'{draft.character}.{draft.aid}'
+	with g.lexicon.ctx.draft.edit(draft_filename) as draft:
+		# If the article was unreadied in the meantime, abort
+		if not draft.status.ready:
+			flash("Article was rescinded")
+			return redirect(url_for('session.session', name=name))
 
-# 		parsed_draft = parse_raw_markdown(draft.contents)
-# 		preview = parsed_draft.render(PreviewHtmlRenderer(g.lexicon))
-# 		rendered_html = preview.contents
-# 		citations = preview.citations
+		parsed_draft = parse_raw_markdown(draft.contents)
+		preview = parsed_draft.render(PreviewHtmlRenderer(g.lexicon))
+		rendered_html = preview.contents
+		citations = preview.citations
 
-# 		# If the article was already reviewed, just preview it
-# 		if draft.status.approved:
-# 			return render_template(
-# 				"session.review.jinja",
-# 				article_html=Markup(rendered_html),
-# 				citations=citations)
+		# If the article was already reviewed, just preview it
+		if draft.status.approved:
+			return render_template(
+				"session.review.jinja",
+				article_html=Markup(rendered_html),
+				citations=citations)
 
-# 		# Otherwise, prepare the review form
-# 		form = LexiconReviewForm()
-# 		if not form.validate_on_submit():
-# 			# GET or POST with invalid data
-# 			return render_template(
-# 				"session.review.jinja",
-# 				form=form,
-# 				article_html=Markup(rendered_html),
-# 				citations=citations)
+		# Otherwise, prepare the review form
+		form = LexiconReviewForm()
+		if not form.validate_on_submit():
+			# GET or POST with invalid data
+			return render_template(
+				"session.review.jinja",
+				form=form,
+				article_html=Markup(rendered_html),
+				citations=citations)
 
-# 		# POST with valid data
-# 		if form.approved.data == LexiconReviewForm.REJECTED:
-# 			draft.status.ready = False
-# 			draft.status.approved = False
-# 			g.lexicon.log(f"Article '{draft.title}' rejected ({draft.aid})")
-# 			return redirect(url_for('session.session', name=name))
-# 		else:
-# 			draft.status.ready = True
-# 			draft.status.approved = True
-# 			g.lexicon.log(f"Article '{draft.title}' approved ({draft.aid})")
+		# POST with valid data
+		if form.approved.data == LexiconReviewForm.REJECTED:
+			draft.status.ready = False
+			draft.status.approved = False
+			g.lexicon.log(f"Article '{draft.title}' rejected ({draft.aid})")
+			return redirect(url_for('session.session', name=name))
+		else:
+			draft.status.ready = True
+			draft.status.approved = True
+			g.lexicon.log(f"Article '{draft.title}' approved ({draft.aid})")
 
-# 	# Draft was approved, check for asap publishing
-# 	if g.lexicon.cfg.publish.asap:
-# 		if attempt_publish(g.lexicon):
-# 			redirect(url_for('lexicon.contents', name=name))
-# 	return redirect(url_for('session.session', name=name))
+	# Draft was approved, check for asap publishing
+	if g.lexicon.cfg.publish.asap:
+		if attempt_publish(g.lexicon):
+			redirect(url_for('lexicon.contents', name=name))
+	return redirect(url_for('session.session', name=name))
 
 
-# @bp_session.route('/editor/', methods=['GET'])
-# @lexicon_param
-# @player_required
-# def editor(name):
-# 	lexicon: LexiconModel = g.lexicon
-# 	aid: str = request.args.get('aid')
-# 	return load_editor(lexicon, aid)
+@bp_session.route('/editor/', methods=['GET'])
+@lexicon_param
+@player_required
+def editor(name):
+	lexicon: LexiconModel = g.lexicon
+	aid: str = request.args.get('aid')
+	return load_editor(lexicon, aid)
 
 
-# @bp_session.route('/editor/new', methods=['GET'])
-# @lexicon_param
-# @player_required
-# def editor_new(name):
-# 	lexicon: LexiconModel = g.lexicon
-# 	cid: str = request.args.get('cid')
-# 	return new_draft(lexicon, cid)
+@bp_session.route('/editor/new', methods=['GET'])
+@lexicon_param
+@player_required
+def editor_new(name):
+	lexicon: LexiconModel = g.lexicon
+	cid: str = request.args.get('cid')
+	return new_draft(lexicon, cid)
 
 
-# @bp_session.route('/editor/update', methods=['POST'])
-# @lexicon_param
-# @player_required
-# def editor_update(name):
-# 	lexicon: LexiconModel = g.lexicon
-# 	article_json = request.json['article']
-# 	return update_draft(lexicon, article_json)
+@bp_session.route('/editor/update', methods=['POST'])
+@lexicon_param
+@player_required
+def editor_update(name):
+	lexicon: LexiconModel = g.lexicon
+	article_json = request.json['article']
+	return update_draft(lexicon, article_json)

tests/test_server.py

@@ -9,5 +9,5 @@ def test_app_testing(app: Flask):
 def test_client(app: Flask):
     """Test that the test client works."""
     with app.test_client() as client:
-        response = client.get("/home/")
-        assert b"Amanuensis" in response.data
+        response = client.get("/")
+        assert b"world" in response.data