From f04e0fd2ae9e520987efb843fe8ff982dedaef60 Mon Sep 17 00:00:00 2001
From: Nicolas F <CounterPillow@users.noreply.github.com>
Date: Sun, 17 Jun 2018 01:57:14 +0200
Subject: [PATCH] comments: fix editing for users with a CAPTCHA (#502)

* comments: fix editing for users with a CAPTCHA

My bad!

* Update help.html
---
 nyaa/static/js/main.js   |  3 +++
 nyaa/templates/help.html |  2 +-
 nyaa/templates/view.html | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/nyaa/static/js/main.js b/nyaa/static/js/main.js
index 4bca446..4cb58df 100644
--- a/nyaa/static/js/main.js
+++ b/nyaa/static/js/main.js
@@ -118,6 +118,9 @@ $(document).ready(function() {
 			$errorStatus.text(error);
 		}).always(function() {
 			$submitButton.removeAttr('disabled');
+			if (grecaptcha) {
+				grecaptcha.reset();
+			}
 			$waitIndicator.hide();
 		});
 	})
diff --git a/nyaa/templates/help.html b/nyaa/templates/help.html
index 47cbbf5..9b9011e 100644
--- a/nyaa/templates/help.html
+++ b/nyaa/templates/help.html
@@ -14,7 +14,7 @@
 	<ul>
 		<li>Torrents uploaded by trusted users.</li>
 	</ul>
-	<span style="color:red; font-weight: bold;">Red</span> entries (remake) are torrents that matching any of the following:
+	<span style="color:red; font-weight: bold;">Red</span> entries (remake) are torrents that match any of the following:
 	<ul>
 		<li>Reencode of original release.</li>
 		<li>Remux of another uploader's original release for hardsubbing and/or fixing purposes.</li>
diff --git a/nyaa/templates/view.html b/nyaa/templates/view.html
index ffad138..57ac6ae 100644
--- a/nyaa/templates/view.html
+++ b/nyaa/templates/view.html
@@ -178,6 +178,23 @@
 						<div class="form-group">
 							<textarea class="form-control" name="comment" autofocus>{{- comment.text | escape | replace('\r\n', '\n') | replace('\n', '&#10;'|safe) -}}</textarea>
 						</div>
+						{% if config.USE_RECAPTCHA and g.user.age < config['ACCOUNT_RECAPTCHA_AGE'] %}
+						<div class="row">
+							<div class="col-md-4">
+								{% if comment_form.recaptcha.errors %}
+								<div class="alert alert-danger">
+									<p><strong>CAPTCHA error:</strong></p>
+									<ul>
+										{% for error in comment_form.recaptcha.errors %}
+										<li>{{ error }}</li>
+										{% endfor %}
+									</ul>
+								</div>
+								{% endif %}
+								{{ comment_form.recaptcha }}
+							</div>
+						</div>
+						{% endif %}
 						<input type="submit" value="Submit" class="btn btn-success btn-sm">
 						<button class="btn btn-sm edit-comment" title="Cancel">Cancel</button>
 						<span class="edit-error text-danger"></span>