From 845df51686c863aaef73f8603cdaf0f9c61079cb Mon Sep 17 00:00:00 2001 From: default Date: Tue, 3 Jan 2023 10:11:20 +0100 Subject: Don't generate empty children popups. --- html.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'html.c') diff --git a/html.c b/html.c index 666bbb2..8298d87 100644 --- a/html.c +++ b/html.c @@ -764,17 +764,19 @@ d_char *html_entry(snac *snac, d_char *os, char *msg, int local, int level, cons if (left) { char *p, *cmd5; int older_open = 0; + xs *ss = xs_str_new(NULL); + int n_children = 0; - s = xs_str_cat(s, "
...

\n"); + ss = xs_str_cat(ss, "

...

\n"); if (level < 4) - s = xs_str_cat(s, "

\n"); + ss = xs_str_cat(ss, "
\n"); else - s = xs_str_cat(s, "
\n"); + ss = xs_str_cat(ss, "
\n"); if (left > 3) { xs *s1 = xs_fmt("
%s\n", L("Older...")); - s = xs_str_cat(s, s1); + ss = xs_str_cat(ss, s1); older_open = 1; } @@ -784,12 +786,14 @@ d_char *html_entry(snac *snac, d_char *os, char *msg, int local, int level, cons object_get_by_md5(cmd5, &chd, NULL); if (older_open && left <= 3) { - s = xs_str_cat(s, "
\n"); + ss = xs_str_cat(ss, "
\n"); older_open = 0; } - if (chd != NULL) - s = html_entry(snac, s, chd, local, level + 1, cmd5); + if (chd != NULL) { + ss = html_entry(snac, ss, chd, local, level + 1, cmd5); + n_children++; + } else snac_debug(snac, 2, xs_fmt("cannot read from timeline child %s", cmd5)); @@ -797,10 +801,13 @@ d_char *html_entry(snac *snac, d_char *os, char *msg, int local, int level, cons } if (older_open) - s = xs_str_cat(s, "
\n"); + ss = xs_str_cat(ss, "\n"); - s = xs_str_cat(s, "\n"); - s = xs_str_cat(s, "\n"); + ss = xs_str_cat(ss, "\n"); + ss = xs_str_cat(ss, "\n"); + + if (n_children) + s = xs_str_cat(s, ss); } s = xs_str_cat(s, "\n\n"); -- cgit v1.2.3