blogpost_render() is now called with a new parameter 'with_comments' to determine...

[citadel.git] / webcit / blogview_renderer.c

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index ad287361e59a19e75134255d22c74e01c7a60da5..57f178a087791b7036d750c4bf59fc15a116c383 100644 (file)
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -44,49 +44,51 @@ void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP) {
 
 
 /*
- * Render (maybe) a single blog post and (maybe) its comments
+ * Render single blog post and (optionally) its comments
  */
-void blogpost_render(struct blogpost *bp) {
+void blogpost_render(struct blogpost *bp, int with_comments)
+{
        const StrBuf *Mime;
-       int p = 0;
        int i;
 
-       p = atoi(BSTR("p"));    /* are we looking for a specific post? */
        WC->bptlid = bp->top_level_id;
 
-       if ( ((p == 0) || (p == bp->top_level_id)) && (bp->num_msgs > 0) ) {
-               /* Show the top level post */
+       /* 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 (p == 0) {
-                       /* 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 {
-                       wc_printf("<a name=\"comments\"></a>\n");
-                       wc_printf(_("%d comments"), bp->num_msgs - 1);
-                       wc_printf(" | <a href=\"");
-                       tmplput_blog_permalink(NULL, NULL);
-                       wc_printf("\">%s</a>", _("permalink"));
-                       wc_printf("<br>\n");
-                       for (i=1; i<bp->num_msgs; ++i) {
-                               read_message(WC->WBuf, HKEY("view_blog_comment"), bp->msgs[i], 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 {
+               wc_printf("<a name=\"comments\"></a>\n");
+               wc_printf(_("%d comments"), bp->num_msgs - 1);
+               wc_printf(" | <a href=\"");
+               tmplput_blog_permalink(NULL, NULL);
+               wc_printf("\">%s</a>", _("permalink"));
+               wc_printf("<br>\n");
+               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 (p == bp->top_level_id) {
+       if (with_comments) {
                do_template("blog_comment_box");
        }
 
@@ -176,14 +178,21 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat,
        HashList *BLOG = (HashList *) *ViewSpecific;
        struct bltr b;
        struct blogpost *bp = NULL;
+       int p = 0;
 
        b = blogview_learn_thread_references(Msg->msgnum);
 
-       /* FIXME an optimization here -- one we ought to perform -- is to exit this
-        * function immediately if the viewer is only interested in a single post and
+       /* Stop processing if the viewer is only interested in a single post and
         * that message ID is neither the id nor the refs.
         */
+       p = atoi(BSTR("p"));    /* are we looking for a specific post? */
+       if ((p != 0) && (p != b.id) && (p != b.refs)) {
+               return 200;
+       }
 
+       /*
+        * Add our little bundle of blogworthy wonderfulness to the hash table
+        */
        if (b.refs == 0) {
                bp = malloc(sizeof(struct blogpost));
                if (!bp) return(200);
@@ -248,9 +257,12 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
        struct blogpost **blogposts = NULL;
        int num_blogposts = 0;
        int num_blogposts_alloc = 0;
+       int with_comments = 0;
 
-       /* Iterate through the hash list and copy the data pointers into an array */
+       /* Comments are shown if we are only viewing a single blog post */
+       if (atoi(BSTR("p"))) with_comments = 1;
 
+       /* Iterate through the hash list and copy the data pointers into an array */
        it = GetNewHashPos(BLOG, 0);
        while (GetNextHashPos(BLOG, it, &len, &Key, &Data)) {
                if (num_blogposts >= num_blogposts_alloc) {
@@ -269,7 +281,6 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
        /* Now we have our array.  It is ONLY an array of pointers.  The objects to
         * which they point are still owned by the hash list.
         */
-
        if (num_blogposts > 0) {
 
                /* Sort newest-to-oldest */
@@ -281,7 +292,7 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
 
                /* Now go through the list and render what we've got */
                for (i=0; i<num_blogposts; ++i) {
-                       blogpost_render(blogposts[i]);
+                       blogpost_render(blogposts[i], with_comments);
                }
 
                /* Done.  We are only freeing the array of pointers; the data itself