mirror of
https://codeberg.org/grunfink/snac2.git
synced 2024-11-25 06:25:04 +00:00
Add some special treatment to Event object display.
This commit is contained in:
parent
0a11d70fbe
commit
9acba489fb
2 changed files with 17 additions and 2 deletions
1
format.c
1
format.c
|
@ -311,6 +311,7 @@ xs_str *sanitize(const char *content)
|
||||||
|
|
||||||
s = xs_str_cat(s, s2);
|
s = xs_str_cat(s, s2);
|
||||||
} else {
|
} else {
|
||||||
|
/* treat end of divs as paragraph breaks */
|
||||||
if (strcmp(v, "</div>"))
|
if (strcmp(v, "</div>"))
|
||||||
s = xs_str_cat(s, "<p>");
|
s = xs_str_cat(s, "<p>");
|
||||||
}
|
}
|
||||||
|
|
18
html.c
18
html.c
|
@ -1374,6 +1374,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
|
||||||
char *type = xs_dict_get(msg, "type");
|
char *type = xs_dict_get(msg, "type");
|
||||||
char *actor;
|
char *actor;
|
||||||
char *v;
|
char *v;
|
||||||
|
int has_title = 0;
|
||||||
|
|
||||||
/* do not show non-public messages in the public timeline */
|
/* do not show non-public messages in the public timeline */
|
||||||
if ((read_only || !user) && !is_msg_public(msg))
|
if ((read_only || !user) && !is_msg_public(msg))
|
||||||
|
@ -1484,6 +1485,14 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (strcmp(type, "Event") == 0) {
|
||||||
|
/* add the calendar emoji */
|
||||||
|
xs_html_add(score,
|
||||||
|
xs_html_tag("span",
|
||||||
|
xs_html_attr("title", L("Event")),
|
||||||
|
xs_html_raw(" 📅 ")));
|
||||||
|
}
|
||||||
|
|
||||||
/* if it's a user from this same instance, add the score */
|
/* if it's a user from this same instance, add the score */
|
||||||
if (xs_startswith(id, srv_baseurl)) {
|
if (xs_startswith(id, srv_baseurl)) {
|
||||||
int n_likes = object_likes_len(id);
|
int n_likes = object_likes_len(id);
|
||||||
|
@ -1575,11 +1584,13 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
|
||||||
xs_html_add(entry,
|
xs_html_add(entry,
|
||||||
snac_content_wrap);
|
snac_content_wrap);
|
||||||
|
|
||||||
if (!xs_is_null(v = xs_dict_get(msg, "name"))) {
|
if (!has_title && !xs_is_null(v = xs_dict_get(msg, "name"))) {
|
||||||
xs_html_add(snac_content_wrap,
|
xs_html_add(snac_content_wrap,
|
||||||
xs_html_tag("h3",
|
xs_html_tag("h3",
|
||||||
xs_html_attr("class", "snac-entry-title"),
|
xs_html_attr("class", "snac-entry-title"),
|
||||||
xs_html_text(v)));
|
xs_html_text(v)));
|
||||||
|
|
||||||
|
has_title = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
xs_html *snac_content = NULL;
|
xs_html *snac_content = NULL;
|
||||||
|
@ -1604,12 +1615,15 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* print the summary as a header (sites like e.g. Friendica can contain one) */
|
/* print the summary as a header (sites like e.g. Friendica can contain one) */
|
||||||
if (!xs_is_null(v) && *v)
|
if (!has_title && !xs_is_null(v) && *v) {
|
||||||
xs_html_add(snac_content_wrap,
|
xs_html_add(snac_content_wrap,
|
||||||
xs_html_tag("h3",
|
xs_html_tag("h3",
|
||||||
xs_html_attr("class", "snac-entry-title"),
|
xs_html_attr("class", "snac-entry-title"),
|
||||||
xs_html_text(v)));
|
xs_html_text(v)));
|
||||||
|
|
||||||
|
has_title = 1;
|
||||||
|
}
|
||||||
|
|
||||||
snac_content = xs_html_tag("div", NULL);
|
snac_content = xs_html_tag("div", NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue