commit a1673e6
default
·
2022-12-08 06:40:15 +0000 UTC
parent a5b8dd7
Some tweaks to improve the page position after like or boost.
1 files changed,
+9,
-13
M
html.c
M
html.c
+9,
-13
1@@ -399,7 +399,7 @@ d_char *build_mentions(snac *snac, char *msg)
2 }
3
4
5-d_char *html_entry_controls(snac *snac, d_char *os, char *msg, int num)
6+d_char *html_entry_controls(snac *snac, d_char *os, char *msg, const char *md5)
7 {
8 char *id = xs_dict_get(msg, "id");
9 char *actor = xs_dict_get(msg, "attributedTo");
10@@ -407,7 +407,6 @@ d_char *html_entry_controls(snac *snac, d_char *os, char *msg, int num)
11 xs *boosts = object_announces(id);
12
13 xs *s = xs_str_new(NULL);
14- xs *md5 = xs_md5_hex(id, strlen(id));
15
16 s = xs_str_cat(s, "<div class=\"snac-controls\">\n");
17
18@@ -416,10 +415,10 @@ d_char *html_entry_controls(snac *snac, d_char *os, char *msg, int num)
19 "<form method=\"post\" action=\"%s/admin/action\">\n"
20 "<input type=\"hidden\" name=\"id\" value=\"%s\">\n"
21 "<input type=\"hidden\" name=\"actor\" value=\"%s\">\n"
22- "<input type=\"hidden\" name=\"redir\" value=\"%d_entry\">\n"
23+ "<input type=\"hidden\" name=\"redir\" value=\"%s_entry\">\n"
24 "\n",
25
26- snac->actor, id, actor, num
27+ snac->actor, id, actor, md5
28 );
29
30 s = xs_str_cat(s, s1);
31@@ -489,7 +488,7 @@ d_char *html_entry_controls(snac *snac, d_char *os, char *msg, int num)
32 }
33
34
35-d_char *html_entry(snac *snac, d_char *os, char *msg, int local, int level, int *num)
36+d_char *html_entry(snac *snac, d_char *os, char *msg, int local, int level, const char *md5)
37 {
38 char *id = xs_dict_get(msg, "id");
39 char *type = xs_dict_get(msg, "type");
40@@ -511,10 +510,8 @@ d_char *html_entry(snac *snac, d_char *os, char *msg, int local, int level, int
41 else
42 s = xs_str_cat(s, "<div>\n");
43
44- if (level == 0) {
45- xs *s1 = xs_fmt("<a name=\"%d_entry\"></a>\n", *num);
46-
47- *num = *num + 1;
48+ {
49+ xs *s1 = xs_fmt("<a name=\"%s_entry\"></a>\n", md5);
50
51 s = xs_str_cat(s, s1);
52 }
53@@ -733,7 +730,7 @@ d_char *html_entry(snac *snac, d_char *os, char *msg, int local, int level, int
54 /** controls **/
55
56 if (!local)
57- s = html_entry_controls(snac, s, msg, *num);
58+ s = html_entry_controls(snac, s, msg, md5);
59
60 /** children **/
61 xs *children = object_children(id);
62@@ -759,7 +756,7 @@ d_char *html_entry(snac *snac, d_char *os, char *msg, int local, int level, int
63 s = xs_str_cat(s, "</details>\n");
64
65 if (chd != NULL)
66- s = html_entry(snac, s, chd, local, level + 1, num);
67+ s = html_entry(snac, s, chd, local, level + 1, cmd5);
68 else
69 snac_debug(snac, 2, xs_fmt("cannot read from timeline child %s", cmd5));
70
71@@ -795,7 +792,6 @@ d_char *html_timeline(snac *snac, char *list, int local, int skip, int show, int
72 d_char *s = xs_str_new(NULL);
73 char *v;
74 double t = ftime();
75- int num = 0;
76
77 s = html_user_header(snac, s, local);
78
79@@ -811,7 +807,7 @@ d_char *html_timeline(snac *snac, char *list, int local, int skip, int show, int
80 if (!valid_status(object_get_by_md5(v, &msg, NULL)))
81 continue;
82
83- s = html_entry(snac, s, msg, local, 0, &num);
84+ s = html_entry(snac, s, msg, local, 0, v);
85 }
86
87 s = xs_str_cat(s, "</div>\n");