commit 42629c9

default  ·  2023-11-08 09:22:25 +0000 UTC
parent 8417a80
Show the "Search results for #tag" title.
1 files changed,  +11, -8
M html.c
M html.c
+11, -8
 1@@ -241,7 +241,7 @@ xs_str *html_base_header(xs_str *s)
 2 }
 3 
 4 
 5-xs_str *html_instance_header(xs_str *s)
 6+xs_str *html_instance_header(xs_str *s, char *tag)
 7 {
 8     s = html_base_header(s);
 9 
10@@ -304,8 +304,10 @@ xs_str *html_instance_header(xs_str *s)
11     s = xs_str_cat(s, "</div>\n");
12 
13     {
14-        xs *s1 = xs_fmt("<h2 class=\"snac-header\">%s</h2>\n",
15-            L("Recent posts by users in this instance"));
16+        xs *l = tag ? xs_fmt(L("Search results for #%s"), tag) :
17+            xs_dup(L("Recent posts by users in this instance"));
18+
19+        xs *s1 = xs_fmt("<h2 class=\"snac-header\">%s</h2>\n", l);
20         s = xs_str_cat(s, s1);
21     }
22 
23@@ -1554,7 +1556,7 @@ xs_str *html_timeline(snac *user, const xs_list *list, int local,
24     if (user)
25         s = html_user_header(user, s, local);
26     else
27-        s = html_instance_header(s);
28+        s = html_instance_header(s, tag);
29 
30     if (user && !local)
31         s = html_top_controls(user, s);
32@@ -1629,16 +1631,17 @@ xs_str *html_timeline(snac *user, const xs_list *list, int local,
33     }
34 
35     if (show_more) {
36-        xs *t = NULL;
37-        xs *m = NULL;
38+        xs *t  = NULL;
39+        xs *m  = NULL;
40+        xs *ss = xs_fmt("skip=%d&show=%d", skip + show, show);
41 
42         if (tag) {
43             t = xs_fmt("%s?t=%s", srv_baseurl, tag);
44-            m = xs_fmt("%s&skip=%d&show=%d", t, skip + show, show);
45+            m = xs_fmt("%s&%s", t, ss);
46         }
47         else {
48             t = xs_fmt("%s%s", user ? user->actor : srv_baseurl, local ? "" : "/admin");
49-            m = xs_fmt("%s?&skip=%d&show=%d", t, skip + show, show);
50+            m = xs_fmt("%s?%s", t, ss);
51         }
52 
53         xs *s1 = xs_fmt(