From 4c7985f6945d38925446376e99a3a0606b58aa74 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@uncensored.citadel.org>
Date: Fri, 3 Jun 2011 18:12:19 -0400
Subject: [PATCH] blogpost_render() is now beautiful and elegant

---
 webcit/blogview_renderer.c | 39 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index 57f178a08..16a5116be 100644
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -44,38 +44,22 @@ void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP) {
 
 
 /*
- * Render single blog post and (optionally) its comments
+ * Render a single blog post and (optionally) its comments
  */
 void blogpost_render(struct blogpost *bp, int with_comments)
 {
 	const StrBuf *Mime;
 	int i;
 
-	WC->bptlid = bp->top_level_id;
+	WC->bptlid = bp->top_level_id;	/* This is used in templates; do not remove it */
 
 	/* Always show the top level post, unless we somehow ended up with an empty list */
 	if (bp->num_msgs > 0) {
 		read_message(WC->WBuf, HKEY("view_blog_post"), bp->msgs[0], NULL, &Mime);
 	}
 
-	/* If we were asked to suppress comments, show only the comment count */
-	if (!with_comments) {
-		/* Show the number of comments */
-		wc_printf("<a href=\"readfwd?p=%d?go=", bp->top_level_id);
-		urlescputs(ChrPtr(WC->CurRoom.name));
-		wc_printf("#comments\">");
-		wc_printf(_("%d comments"), bp->num_msgs - 1);
-		wc_printf("</a> | <a href=\"");
-		tmplput_blog_permalink(NULL, NULL);
-		wc_printf("\">%s</a>", _("permalink"));
-		wc_printf("<br><br><br>\n");
-	}
-
-	else if (bp->num_msgs < 2) {
-		wc_printf(_("%d comments"), 0);
-	}
-
-	else {
+	if (with_comments) {
+		/* Show any existing comments, then offer the comment box */
 		wc_printf("<a name=\"comments\"></a>\n");
 		wc_printf(_("%d comments"), bp->num_msgs - 1);
 		wc_printf(" | <a href=\"");
@@ -85,13 +69,20 @@ void blogpost_render(struct blogpost *bp, int with_comments)
 		for (i=1; i<bp->num_msgs; ++i) {
 			read_message(WC->WBuf, HKEY("view_blog_comment"), bp->msgs[i], NULL, &Mime);
 		}
-	}
-
-	/* offer the comment box */
-	if (with_comments) {
 		do_template("blog_comment_box");
 	}
 
+	else {
+		/* Show only the number of comments */
+		wc_printf("<a href=\"readfwd?p=%d?go=", bp->top_level_id);
+		urlescputs(ChrPtr(WC->CurRoom.name));
+		wc_printf("#comments\">");
+		wc_printf(_("%d comments"), bp->num_msgs - 1);
+		wc_printf("</a> | <a href=\"");
+		tmplput_blog_permalink(NULL, NULL);
+		wc_printf("\">%s</a>", _("permalink"));
+		wc_printf("<br><br><br>\n");
+	}
 }
 
 
-- 
2.30.2