More html_entry() tweaks.

This commit is contained in:
default 2023-11-28 18:56:06 +01:00
parent 6821d3df9f
commit d00ee229f7

13
html.c
View file

@ -1639,9 +1639,11 @@ xs_str *html_entry(snac *user, xs_str *os, const xs_dict *msg, int local,
#endif #endif
{ {
const char *content = xs_dict_get(msg, "content"); /** build the content string **/
xs *c = sanitize(xs_is_null(content) ? "" : content); char *content = xs_dict_get(msg, "content");
xs *c = sanitize(xs_is_null(content) ? "" : content);
char *p, *v; char *p, *v;
/* do some tweaks to the content */ /* do some tweaks to the content */
@ -1693,6 +1695,9 @@ xs_str *html_entry(snac *user, xs_str *os, const xs_dict *msg, int local,
} }
} }
/* c contains sanitized HTML */
s = xs_str_cat(s, c);
if (strcmp(type, "Question") == 0) { /** question content **/ if (strcmp(type, "Question") == 0) { /** question content **/
xs_list *oo = xs_dict_get(msg, "oneOf"); xs_list *oo = xs_dict_get(msg, "oneOf");
xs_list *ao = xs_dict_get(msg, "anyOf"); xs_list *ao = xs_dict_get(msg, "anyOf");
@ -1821,10 +1826,8 @@ xs_str *html_entry(snac *user, xs_str *os, const xs_dict *msg, int local,
} }
xs *s1 = xs_html_render(poll); xs *s1 = xs_html_render(poll);
c = xs_str_cat(c, s1); s = xs_str_cat(s, s1);
} }
s = xs_str_cat(s, c);
} }
s = xs_str_cat(s, "\n"); s = xs_str_cat(s, "\n");