From bbc89bb2c2a6b74fb36c04659dfe45e75351c58c Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 12 Jul 2020 23:53:20 +0100
Subject: [PATCH] Fix misattribution of review due to missing reply ordering

---
 app/models.py                     | 5 +++--
 app/templates/macros/reviews.html | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/models.py b/app/models.py
index 3e71c75..ade4083 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1101,10 +1101,11 @@ class Thread(db.Model):
 
 	created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
 
-	replies    = db.relationship("ThreadReply", backref="thread", lazy="dynamic")
+	replies    = db.relationship("ThreadReply", backref="thread", lazy="dynamic", \
+			order_by=db.asc("thread_reply_id"))
 
 	watchers   = db.relationship("User", secondary=watchers, lazy="subquery", \
-						backref=db.backref("watching", lazy=True))
+			backref=db.backref("watching", lazy=True))
 
 	def getViewURL(self):
 		return url_for("threads.view", id=self.id)
diff --git a/app/templates/macros/reviews.html b/app/templates/macros/reviews.html
index 42ae614..6ba176c 100644
--- a/app/templates/macros/reviews.html
+++ b/app/templates/macros/reviews.html
@@ -19,14 +19,14 @@
 				<div class="col pr-0">
 					<div class="card">
 						<div class="card-header">
-							<a class="author {{ reply.author.rank.name }}"
-									href="{{ url_for('users.profile', username=reply.author.username) }}">
-								{{ reply.author.display_name }}
+							<a class="author {{ review.author.rank.name }}"
+									href="{{ url_for('users.profile', username=review.author.username) }}">
+								{{ review.author.display_name }}
 							</a>
 
 							<a name="reply-{{ reply.id }}" class="text-muted float-right"
 									href="{{ url_for('threads.view', id=review.thread.id) }}#reply-{{ reply.id }}">
-								{{ reply.created_at | datetime }}
+								{{ review.created_at | datetime }}
 							</a>
 						</div>
 
-- 
2.44.0