From f83bf55d3f4e5e58943275b3b6f5d76d88f9b88e Mon Sep 17 00:00:00 2001
From: Robin Malley <rmalley@cock.li>
Date: Sun, 12 Mar 2023 05:29:36 +0000
Subject: [PATCH] Fix a bug where the search pages did not show comments

When comments were added, the search page was not modified
appropriately.
---
 src/lua/endpoints/search_get.lua |  3 ++-
 src/pages/search_sql.etlua.in    | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/lua/endpoints/search_get.lua b/src/lua/endpoints/search_get.lua
index 47fe7fe..7e046ec 100644
--- a/src/lua/endpoints/search_get.lua
+++ b/src/lua/endpoints/search_get.lua
@@ -54,7 +54,8 @@ local function search_get(req)
 			author = row[4],
 			posted = os.date("%B %d %Y",tonumber(row[5])),
 			tags = libtags.get(row[1]),
-			hits = row[6]
+			hits = row[6],
+			ncomments = row[7]
 		})
 	end
 	local ret = pages.search{
diff --git a/src/pages/search_sql.etlua.in b/src/pages/search_sql.etlua.in
index 3dce77b..21c02ec 100644
--- a/src/pages/search_sql.etlua.in
+++ b/src/pages/search_sql.etlua.in
@@ -4,9 +4,11 @@ SELECT
 	posts.isanon,
 	authors.name,
 	posts.post_time,
-	posts.views
+	posts.views,
+	COUNT(comments.id)
 FROM
 	posts,authors
+LEFT JOIN comments ON comments.postid = posts.id
 WHERE
 	authors.id = posts.authorid
 	AND posts.unlisted = 0
@@ -25,6 +27,8 @@ WHERE
 		<% end -%>
 	<% end -%>
 <% end -%>
+GROUP BY
+	posts.id
 <% for _,tag in pairs(result.tags) do -%>
 INTERSECT
 SELECT
@@ -33,9 +37,11 @@ SELECT
 	posts.isanon,
 	authors.name,
 	posts.post_time,
-	posts.views
+	posts.views,
+	COUNT(comments.id)
 FROM
 	posts,authors,tags
+LEFT JOIN comments ON comments.postid = posts.id
 WHERE
 	posts.authorid = authors.id
 	AND tags.postid = posts.id
@@ -43,4 +49,6 @@ WHERE
 	<% n = (n == "-" and "NOT" or "") -%>
 	AND <%= n %> tags.tag = ?
 <% end -%>
+GROUP BY
+	posts.id
 ;