mirrors/snac2
3
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-10 03:50:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

html_msg_icon() is full xs_html.

Browse Source
This commit is contained in:
default 2023-11-27 10:27:28 +01:00
parent 1663adbf56
commit cac8eba520
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
html.c
View File

@ -200,10 +200,11 @@ xs_html *html_actor_icon(xs_dict *actor, const char *date,
} }
xs_str *html_msg_icon(xs_str *os, const xs_dict *msg) xs_html *html_msg_icon(const xs_dict *msg)
{ {
char *actor_id; char *actor_id;
xs *actor = NULL; xs *actor = NULL;
xs_html *actor_icon = NULL;
if ((actor_id = xs_dict_get(msg, "attributedTo")) == NULL) if ((actor_id = xs_dict_get(msg, "attributedTo")) == NULL)
actor_id = xs_dict_get(msg, "actor"); actor_id = xs_dict_get(msg, "actor");
@ -223,12 +224,10 @@ xs_str *html_msg_icon(xs_str *os, const xs_dict *msg)
date = xs_dict_get(msg, "published"); date = xs_dict_get(msg, "published");
udate = xs_dict_get(msg, "updated"); udate = xs_dict_get(msg, "updated");
xs_html *actor_icon = html_actor_icon(actor, date, udate, url, priv); actor_icon = html_actor_icon(actor, date, udate, url, priv);
xs *s1 = xs_html_render(actor_icon);
os = xs_str_cat(os, s1);
} }
return os; return actor_icon;
} }
@ -1180,16 +1179,17 @@ xs_str *html_entry(snac *user, xs_str *os, const xs_dict *msg, int local,
} }
if (strcmp(type, "Follow") == 0) { if (strcmp(type, "Follow") == 0) {
s = xs_str_cat(s, "<div class=\"snac-post\">\n<div class=\"snac-post-header\">\n"); xs_html *h = xs_html_tag("div",
xs_html_attr("class", "snac-post"),
xs_html_tag("div",
xs_html_attr("class", "snac-post-header"),
xs_html_tag("div",
xs_html_attr("class", "snac-origin"),
xs_html_text(L("follows you"))),
html_msg_icon(msg)));
xs *s1 = xs_fmt("<div class=\"snac-origin\">%s</div>\n", L("follows you")); xs *s1 = xs_html_render(h);
s = xs_str_cat(s, s1); return xs_str_cat(os, s1);
s = html_msg_icon(s, msg);
s = xs_str_cat(s, "</div>\n</div>\n");
return xs_str_cat(os, s);
} }
else else
if (!xs_match(type, "Note|Question|Page|Article")) { if (!xs_match(type, "Note|Question|Page|Article")) {
@ -1306,7 +1306,11 @@ xs_str *html_entry(snac *user, xs_str *os, const xs_dict *msg, int local,
} }
} }
s = html_msg_icon(s, msg); {
xs_html *h = html_msg_icon(msg);
xs *s1 = xs_html_render(h);
s = xs_str_cat(s, s1);
}
/* add the content */ /* add the content */
s = xs_str_cat(s, "</div>\n<div class=\"e-content snac-content\">\n"); /** **/ s = xs_str_cat(s, "</div>\n<div class=\"e-content snac-content\">\n"); /** **/