");
}
}
else {
diff --git a/html.c b/html.c
index f50fb7d..f97c45d 100644
--- a/html.c
+++ b/html.c
@@ -41,7 +41,7 @@ int login(snac *snac, const xs_dict *headers)
}
-xs_str *replace_shortnames(xs_str *s, xs_list *tag, int ems)
+xs_str *replace_shortnames(xs_str *s, const xs_list *tag, int ems)
/* replaces all the :shortnames: with the emojis in tag */
{
if (!xs_is_null(tag)) {
@@ -55,20 +55,20 @@ xs_str *replace_shortnames(xs_str *s, xs_list *tag, int ems)
tag_list = xs_dup(tag);
}
- xs *style = xs_fmt("height: %dem; vertical-align: middle;", ems);
+ xs *style = xs_fmt("height: %dem; width: %dem; vertical-align: middle;", ems, ems);
- xs_list *p = tag_list;
- char *v;
+ const char *v;
+ int c = 0;
- while (xs_list_iter(&p, &v)) {
- char *t = xs_dict_get(v, "type");
+ while (xs_list_next(tag_list, &v, &c)) {
+ const char *t = xs_dict_get(v, "type");
if (t && strcmp(t, "Emoji") == 0) {
- char *n = xs_dict_get(v, "name");
- char *i = xs_dict_get(v, "icon");
+ const char *n = xs_dict_get(v, "name");
+ const char *i = xs_dict_get(v, "icon");
if (n && i) {
- char *u = xs_dict_get(i, "url");
+ const char *u = xs_dict_get(i, "url");
xs_html *img = xs_html_sctag("img",
xs_html_attr("loading", "lazy"),
xs_html_attr("src", u),
@@ -88,7 +88,7 @@ xs_str *replace_shortnames(xs_str *s, xs_list *tag, int ems)
xs_str *actor_name(xs_dict *actor)
/* gets the actor name */
{
- char *v;
+ const char *v;
if (xs_is_null((v = xs_dict_get(actor, "name"))) || *v == '\0') {
if (xs_is_null(v = xs_dict_get(actor, "preferredUsername")) || *v == '\0') {
@@ -106,7 +106,7 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
xs_html *actor_icon = xs_html_tag("p", NULL);
xs *avatar = NULL;
- char *v;
+ const char *v;
int fwing = 0;
int fwer = 0;
@@ -125,7 +125,7 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
if (avatar == NULL)
avatar = xs_fmt("data:image/png;base64, %s", default_avatar_base64());
- char *actor_id = xs_dict_get(actor, "id");
+ const char *actor_id = xs_dict_get(actor, "id");
xs *href = NULL;
if (user) {
@@ -216,7 +216,7 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
}
{
- char *username, *id;
+ const char *username, *id;
if (xs_is_null(username = xs_dict_get(actor, "preferredUsername")) || *username == '\0') {
/* This should never be reached */
@@ -244,19 +244,19 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
}
-xs_html *html_msg_icon(snac *user, char *actor_id, const xs_dict *msg)
+xs_html *html_msg_icon(snac *user, const char *actor_id, const xs_dict *msg)
{
xs *actor = NULL;
xs_html *actor_icon = NULL;
if (actor_id && valid_status(actor_get_refresh(user, actor_id, &actor))) {
- char *date = NULL;
- char *udate = NULL;
- char *url = NULL;
+ const char *date = NULL;
+ const char *udate = NULL;
+ const char *url = NULL;
int priv = 0;
const char *type = xs_dict_get(msg, "type");
- if (xs_match(type, "Note|Question|Page|Article|Video"))
+ if (xs_match(type, POSTLIKE_OBJECT_TYPE))
url = xs_dict_get(msg, "id");
priv = !is_msg_public(msg);
@@ -271,14 +271,14 @@ xs_html *html_msg_icon(snac *user, char *actor_id, const xs_dict *msg)
}
-xs_html *html_note(snac *user, char *summary,
- char *div_id, char *form_id,
- char *ta_plh, char *ta_content,
- char *edit_id, char *actor_id,
- xs_val *cw_yn, char *cw_text,
- xs_val *mnt_only, char *redir,
- char *in_reply_to, int poll,
- char *att_file, char *att_alt_text)
+xs_html *html_note(snac *user, const char *summary,
+ const char *div_id, const char *form_id,
+ const char *ta_plh, const char *ta_content,
+ const char *edit_id, const char *actor_id,
+ const xs_val *cw_yn, const char *cw_text,
+ const xs_val *mnt_only, const char *redir,
+ const char *in_reply_to, int poll,
+ const char *att_file, const char *att_alt_text)
{
xs *action = xs_fmt("%s/admin/note", user->actor);
@@ -460,9 +460,11 @@ static xs_html *html_base_head(void)
/* add server CSS and favicon */
xs *f;
f = xs_fmt("%s/favicon.ico", srv_baseurl);
- xs_list *p = xs_dict_get(srv_config, "cssurls");
- char *v;
- while (xs_list_iter(&p, &v)) {
+ const xs_list *p = xs_dict_get(srv_config, "cssurls");
+ const char *v;
+ int c = 0;
+
+ while (xs_list_next(p, &v, &c)) {
xs_html_add(head,
xs_html_sctag("link",
xs_html_attr("rel", "stylesheet"),
@@ -498,8 +500,8 @@ xs_html *html_instance_head(void)
}
}
- char *host = xs_dict_get(srv_config, "host");
- char *title = xs_dict_get(srv_config, "title");
+ const char *host = xs_dict_get(srv_config, "host");
+ const char *title = xs_dict_get(srv_config, "title");
xs_html_add(head,
xs_html_tag("title",
@@ -509,12 +511,12 @@ xs_html *html_instance_head(void)
}
-static xs_html *html_instance_body(char *tag)
+static xs_html *html_instance_body(void)
{
- char *host = xs_dict_get(srv_config, "host");
- char *sdesc = xs_dict_get(srv_config, "short_description");
- char *email = xs_dict_get(srv_config, "admin_email");
- char *acct = xs_dict_get(srv_config, "admin_account");
+ const char *host = xs_dict_get(srv_config, "host");
+ const char *sdesc = xs_dict_get(srv_config, "short_description");
+ const char *email = xs_dict_get(srv_config, "admin_email");
+ const char *acct = xs_dict_get(srv_config, "admin_account");
xs *blurb = xs_replace(snac_blurb, "%host%", host);
@@ -560,16 +562,6 @@ static xs_html *html_instance_body(char *tag)
xs_html_text(handle)))));
}
- {
- xs *l = tag ? xs_fmt(L("Search results for #%s"), tag) :
- xs_dup(L("Recent posts by users in this instance"));
-
- xs_html_add(body,
- xs_html_tag("h2",
- xs_html_attr("class", "snac-header"),
- xs_html_text(l)));
- }
-
return body;
}
@@ -749,7 +741,17 @@ static xs_html *html_user_body(snac *user, int read_only)
xs_html_text(" - "),
xs_html_tag("a",
xs_html_attr("href", instance_url),
- xs_html_text(L("instance"))));
+ xs_html_text(L("instance"))),
+ xs_html_text(" "),
+ xs_html_tag("form",
+ xs_html_attr("style", "display: inline!important"),
+ xs_html_attr("class", "snac-search-box"),
+ xs_html_attr("action", admin_url),
+ xs_html_sctag("input",
+ xs_html_attr("type", "text"),
+ xs_html_attr("name", "q"),
+ xs_html_attr("title", L("Search posts by content (regular expression) or #tag")),
+ xs_html_attr("placeholder", L("Content search")))));
}
xs_html_add(body,
@@ -760,7 +762,7 @@ static xs_html *html_user_body(snac *user, int read_only)
xs_html_attr("class", "h-card snac-top-user"));
if (read_only) {
- char *header = xs_dict_get(user->config, "header");
+ const char *header = xs_dict_get(user->config, "header");
if (header && *header) {
xs_html_add(top_user,
xs_html_tag("div",
@@ -797,10 +799,10 @@ static xs_html *html_user_body(snac *user, int read_only)
xs_html_add(top_user,
top_user_bio);
- xs_dict *metadata = xs_dict_get(user->config, "metadata");
+ const xs_dict *metadata = xs_dict_get(user->config, "metadata");
if (xs_type(metadata) == XSTYPE_DICT) {
- xs_str *k;
- xs_str *v;
+ const xs_str *k;
+ const xs_str *v;
xs_dict *val_links = user->links;
if (xs_is_null(val_links))
@@ -813,10 +815,10 @@ static xs_html *html_user_body(snac *user, int read_only)
while (xs_dict_next(metadata, &k, &v, &c)) {
xs_html *value;
- if (xs_startswith(v, "https:/" "/")) {
+ if (xs_startswith(v, "https:/") || xs_startswith(v, "http:/")) {
/* is this link validated? */
xs *verified_link = NULL;
- xs_number *val_time = xs_dict_get(val_links, v);
+ const xs_number *val_time = xs_dict_get(val_links, v);
if (xs_type(val_time) == XSTYPE_NUMBER) {
time_t t = xs_number_get(val_time);
@@ -928,7 +930,7 @@ xs_html *html_top_controls(snac *snac)
/** user settings **/
- char *email = "[disabled by admin]";
+ const char *email = "[disabled by admin]";
if (xs_type(xs_dict_get(srv_config, "disable_email_notifications")) != XSTYPE_TRUE) {
email = xs_dict_get(snac->config_o, "email");
@@ -940,40 +942,40 @@ xs_html *html_top_controls(snac *snac)
}
}
- char *cw = xs_dict_get(snac->config, "cw");
+ const char *cw = xs_dict_get(snac->config, "cw");
if (xs_is_null(cw))
cw = "";
- char *telegram_bot = xs_dict_get(snac->config, "telegram_bot");
+ const char *telegram_bot = xs_dict_get(snac->config, "telegram_bot");
if (xs_is_null(telegram_bot))
telegram_bot = "";
- char *telegram_chat_id = xs_dict_get(snac->config, "telegram_chat_id");
+ const char *telegram_chat_id = xs_dict_get(snac->config, "telegram_chat_id");
if (xs_is_null(telegram_chat_id))
telegram_chat_id = "";
- char *ntfy_server = xs_dict_get(snac->config, "ntfy_server");
+ const char *ntfy_server = xs_dict_get(snac->config, "ntfy_server");
if (xs_is_null(ntfy_server))
ntfy_server = "";
- char *ntfy_token = xs_dict_get(snac->config, "ntfy_token");
+ const char *ntfy_token = xs_dict_get(snac->config, "ntfy_token");
if (xs_is_null(ntfy_token))
ntfy_token = "";
- char *purge_days = xs_dict_get(snac->config, "purge_days");
+ const char *purge_days = xs_dict_get(snac->config, "purge_days");
if (!xs_is_null(purge_days) && xs_type(purge_days) == XSTYPE_NUMBER)
purge_days = (char *)xs_number_str(purge_days);
else
purge_days = "0";
- xs_val *d_dm_f_u = xs_dict_get(snac->config, "drop_dm_from_unknown");
- xs_val *bot = xs_dict_get(snac->config, "bot");
- xs_val *a_private = xs_dict_get(snac->config, "private");
+ const xs_val *d_dm_f_u = xs_dict_get(snac->config, "drop_dm_from_unknown");
+ const xs_val *bot = xs_dict_get(snac->config, "bot");
+ const xs_val *a_private = xs_dict_get(snac->config, "private");
xs *metadata = xs_str_new(NULL);
- xs_dict *md = xs_dict_get(snac->config, "metadata");
- xs_str *k;
- xs_str *v;
+ const xs_dict *md = xs_dict_get(snac->config, "metadata");
+ const xs_str *k;
+ const xs_str *v;
int c = 0;
while (xs_dict_next(md, &k, &v, &c)) {
@@ -1158,13 +1160,14 @@ xs_str *build_mentions(snac *snac, const xs_dict *msg)
/* returns a string with the mentions in msg */
{
xs_str *s = xs_str_new(NULL);
- char *list = xs_dict_get(msg, "tag");
- char *v;
+ const char *list = xs_dict_get(msg, "tag");
+ const char *v;
+ int c = 0;
- while (xs_list_iter(&list, &v)) {
- char *type = xs_dict_get(v, "type");
- char *href = xs_dict_get(v, "href");
- char *name = xs_dict_get(v, "name");
+ while (xs_list_next(list, &v, &c)) {
+ const char *type = xs_dict_get(v, "type");
+ const char *href = xs_dict_get(v, "href");
+ const char *name = xs_dict_get(v, "name");
if (type && strcmp(type, "Mention") == 0 &&
href && strcmp(href, snac->actor) != 0 && name) {
@@ -1208,10 +1211,11 @@ xs_str *build_mentions(snac *snac, const xs_dict *msg)
}
-xs_html *html_entry_controls(snac *snac, char *actor, const xs_dict *msg, const char *md5)
+xs_html *html_entry_controls(snac *snac, const char *actor,
+ const xs_dict *msg, const char *md5)
{
- char *id = xs_dict_get(msg, "id");
- char *group = xs_dict_get(msg, "audience");
+ const char *id = xs_dict_get(msg, "id");
+ const char *group = xs_dict_get(msg, "audience");
xs *likes = object_likes(id);
xs *boosts = object_announces(id);
@@ -1265,8 +1269,8 @@ xs_html *html_entry_controls(snac *snac, char *actor, const xs_dict *msg, const
}
if (is_msg_public(msg)) {
- if (strcmp(actor, snac->actor) == 0 || xs_list_in(boosts, snac->md5) == -1) {
- /* not already boosted or us; add button */
+ if (xs_list_in(boosts, snac->md5) == -1) {
+ /* not already boosted; add button */
xs_html_add(form,
html_button("boost", L("Boost"), L("Announce this post to your followers")));
}
@@ -1310,7 +1314,7 @@ xs_html *html_entry_controls(snac *snac, char *actor, const xs_dict *msg, const
html_button("delete", L("Delete"), L("Delete this post")),
html_button("hide", L("Hide"), L("Hide this post and its children")));
- char *prev_src = xs_dict_get(msg, "sourceContent");
+ const char *prev_src = xs_dict_get(msg, "sourceContent");
if (!xs_is_null(prev_src) && strcmp(actor, snac->actor) == 0) { /** edit **/
/* post can be edited */
@@ -1318,13 +1322,13 @@ xs_html *html_entry_controls(snac *snac, char *actor, const xs_dict *msg, const
xs *form_id = xs_fmt("%s_edit_form", md5);
xs *redir = xs_fmt("%s_entry", md5);
- char *att_file = "";
- char *att_alt_text = "";
- xs_list *att_list = xs_dict_get(msg, "attachment");
+ const char *att_file = "";
+ const char *att_alt_text = "";
+ const xs_list *att_list = xs_dict_get(msg, "attachment");
/* does it have an attachment? */
if (xs_type(att_list) == XSTYPE_LIST && xs_list_len(att_list)) {
- xs_dict *d = xs_list_get(att_list, 0);
+ const xs_dict *d = xs_list_get(att_list, 0);
if (xs_type(d) == XSTYPE_DICT) {
att_file = xs_dict_get_def(d, "url", "");
@@ -1368,12 +1372,13 @@ xs_html *html_entry_controls(snac *snac, char *actor, const xs_dict *msg, const
xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
- int level, char *md5, int hide_children)
+ int level, const char *md5, int hide_children)
{
- char *id = xs_dict_get(msg, "id");
- char *type = xs_dict_get(msg, "type");
- char *actor;
- char *v;
+ const char *id = xs_dict_get(msg, "id");
+ const char *type = xs_dict_get(msg, "type");
+ const char *actor;
+ const char *v;
+ int has_title = 0;
/* do not show non-public messages in the public timeline */
if ((read_only || !user) && !is_msg_public(msg))
@@ -1405,8 +1410,9 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
html_msg_icon(read_only ? NULL : user, xs_dict_get(msg, "actor"), msg)));
}
else
- if (!xs_match(type, "Note|Question|Page|Article|Video")) {
+ if (!xs_match(type, POSTLIKE_OBJECT_TYPE)) {
/* skip oddities */
+ snac_debug(user, 1, xs_fmt("html_entry: ignoring object type '%s' %s", type, id));
return NULL;
}
@@ -1483,6 +1489,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 (xs_startswith(id, srv_baseurl)) {
int n_likes = object_likes_len(id);
@@ -1499,7 +1513,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
if (xs_list_len(boosts)) {
/* if somebody boosted this, show as origin */
- char *p = xs_list_get(boosts, -1);
+ const char *p = xs_list_get(boosts, -1);
xs *actor_r = NULL;
if (user && xs_list_in(boosts, user->md5) != -1) {
@@ -1519,7 +1533,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
if (!xs_is_null(name)) {
xs *href = NULL;
- char *id = xs_dict_get(actor_r, "id");
+ const char *id = xs_dict_get(actor_r, "id");
int fwers = 0;
int fwing = 0;
@@ -1548,7 +1562,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
if (strcmp(type, "Note") == 0) {
if (level == 0) {
/* is the parent not here? */
- char *parent = xs_dict_get(msg, "inReplyTo");
+ const char *parent = xs_dict_get(msg, "inReplyTo");
if (user && !xs_is_null(parent) && *parent && !timeline_here(user, parent)) {
xs_html_add(post_header,
@@ -1574,11 +1588,13 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
xs_html_add(entry,
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_tag("h3",
xs_html_attr("class", "snac-entry-title"),
xs_html_text(v)));
+
+ has_title = 1;
}
xs_html *snac_content = NULL;
@@ -1591,7 +1607,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
v = "...";
/* only show it when not in the public timeline and the config setting is "open" */
- char *cw = xs_dict_get(user->config, "cw");
+ const char *cw = xs_dict_get(user->config, "cw");
if (xs_is_null(cw) || read_only)
cw = "";
@@ -1603,12 +1619,15 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
}
else {
/* 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_tag("h3",
xs_html_attr("class", "snac-entry-title"),
xs_html_text(v)));
+ has_title = 1;
+ }
+
snac_content = xs_html_tag("div", NULL);
}
@@ -1617,7 +1636,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
{
/** build the content string **/
- char *content = xs_dict_get(msg, "content");
+ const char *content = xs_dict_get(msg, "content");
xs *c = sanitize(xs_is_null(content) ? "" : content);
@@ -1635,7 +1654,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
c = replace_shortnames(c, xs_dict_get(msg, "tag"), 2);
/* Peertube videos content is in markdown */
- char *mtype = xs_dict_get(msg, "mediaType");
+ const char *mtype = xs_dict_get(msg, "mediaType");
if (xs_type(mtype) == XSTYPE_STRING && strcmp(mtype, "text/markdown") == 0) {
/* a full conversion could be better */
c = xs_replace_i(c, "\r", "");
@@ -1648,26 +1667,33 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
}
if (strcmp(type, "Question") == 0) { /** question content **/
- xs_list *oo = xs_dict_get(msg, "oneOf");
- xs_list *ao = xs_dict_get(msg, "anyOf");
- xs_list *p;
- xs_dict *v;
+ const xs_list *oo = xs_dict_get(msg, "oneOf");
+ const xs_list *ao = xs_dict_get(msg, "anyOf");
+ const xs_list *p;
+ const xs_dict *v;
int closed = 0;
+ const char *f_closed = NULL;
xs_html *poll = xs_html_tag("div", NULL);
if (read_only)
closed = 1; /* non-identified page; show as closed */
else
- if (xs_dict_get(msg, "closed"))
- closed = 2;
- else
if (user && xs_startswith(id, user->actor))
closed = 1; /* we questioned; closed for us */
else
if (user && was_question_voted(user, id))
closed = 1; /* we already voted; closed for us */
+ if ((f_closed = xs_dict_get(msg, "closed")) != NULL) {
+ /* it has a closed date... but is it in the past? */
+ time_t t0 = time(NULL);
+ time_t t1 = xs_parse_iso_date(f_closed, 0);
+
+ if (t1 < t0)
+ closed = 2;
+ }
+
/* get the appropriate list of options */
p = oo != NULL ? oo : ao;
@@ -1675,10 +1701,11 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
/* closed poll */
xs_html *poll_result = xs_html_tag("table",
xs_html_attr("class", "snac-poll-result"));
+ int c = 0;
- while (xs_list_iter(&p, &v)) {
- char *name = xs_dict_get(v, "name");
- xs_dict *replies = xs_dict_get(v, "replies");
+ while (xs_list_next(p, &v, &c)) {
+ const char *name = xs_dict_get(v, "name");
+ const xs_dict *replies = xs_dict_get(v, "replies");
if (name && replies) {
char *ti = (char *)xs_number_str(xs_dict_get(replies, "totalItems"));
@@ -1715,9 +1742,10 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
xs_html_attr("name", "irt"),
xs_html_attr("value", id))));
- while (xs_list_iter(&p, &v)) {
- char *name = xs_dict_get(v, "name");
- xs_dict *replies = xs_dict_get(v, "replies");
+ int c = 0;
+ while (xs_list_next(p, &v, &c)) {
+ const char *name = xs_dict_get(v, "name");
+ const xs_dict *replies = xs_dict_get(v, "replies");
if (name) {
char *ti = (char *)xs_number_str(xs_dict_get(replies, "totalItems"));
@@ -1755,7 +1783,13 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
}
else {
/* show when the poll closes */
- char *end_time = xs_dict_get(msg, "endTime");
+ const char *end_time = xs_dict_get(msg, "endTime");
+
+ /* Pleroma does not have an endTime field;
+ it has a closed time in the future */
+ if (xs_is_null(end_time))
+ end_time = xs_dict_get(msg, "closed");
+
if (!xs_is_null(end_time)) {
time_t t0 = time(NULL);
time_t t1 = xs_parse_iso_date(end_time, 0);
@@ -1792,12 +1826,12 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
xs_html_add(snac_content,
content_attachments);
- xs_list *p = attach;
-
- while (xs_list_iter(&p, &v)) {
- char *type = xs_dict_get(v, "type");
- char *href = xs_dict_get(v, "href");
- char *name = xs_dict_get(v, "name");
+ int c = 0;
+ const xs_dict *a;
+ while (xs_list_next(attach, &a, &c)) {
+ const char *type = xs_dict_get(a, "type");
+ const char *href = xs_dict_get(a, "href");
+ const char *name = xs_dict_get(a, "name");
if (xs_startswith(type, "image/") || strcmp(type, "Image") == 0) {
xs_html_add(content_attachments,
@@ -1861,7 +1895,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
}
/* has this message an audience (i.e., comes from a channel or community)? */
- char *audience = xs_dict_get(msg, "audience");
+ const char *audience = xs_dict_get(msg, "audience");
if (strcmp(type, "Page") == 0 && !xs_is_null(audience)) {
xs_html *au_tag = xs_html_tag("p",
xs_html_text("("),
@@ -1911,7 +1945,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
}
xs_list *p = children;
- char *cmd5;
+ const char *cmd5;
int cnt = 0;
int o_cnt = 0;
@@ -1983,11 +2017,11 @@ xs_html *html_footer(void)
xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
int skip, int show, int show_more,
- char *tag, char *page, int utl)
+ char *title, char *page, int utl)
/* returns the HTML for the timeline */
{
xs_list *p = (xs_list *)list;
- char *v;
+ const char *v;
double t = ftime();
xs *desc = NULL;
@@ -1995,11 +2029,12 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
if (xs_list_len(list) == 1) {
/* only one element? pick the description from the source */
- char *id = xs_list_get(list, 0);
+ const char *id = xs_list_get(list, 0);
xs *d = NULL;
object_get_by_md5(id, &d);
- if (d && (v = xs_dict_get(d, "sourceContent")) != NULL)
- desc = xs_dup(v);
+ const char *sc = xs_dict_get(d, "sourceContent");
+ if (d && sc != NULL)
+ desc = xs_dup(sc);
alternate = xs_dup(xs_dict_get(d, "id"));
}
@@ -2013,7 +2048,7 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
}
else {
head = html_instance_head();
- body = html_instance_body(tag);
+ body = html_instance_body();
}
xs_html *html = xs_html_tag("html",
@@ -2024,6 +2059,41 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
xs_html_add(body,
html_top_controls(user));
+ /* show links to the available lists */
+ if (user && !read_only) {
+ xs *lists = list_maint(user, NULL, 0); /* get list of lists */
+
+ if (xs_list_len(lists)) {
+ int ct = 0;
+ const char *v;
+
+ xs_html *lol = xs_html_tag("ul",
+ xs_html_attr("class", "snac-list-of-lists"));
+ xs_html_add(body, lol);
+
+ while (xs_list_next(lists, &v, &ct)) {
+ const char *lname = xs_list_get(v, 1);
+ xs *url = xs_fmt("%s/list/%s", user->actor, xs_list_get(v, 0));
+ xs *ttl = xs_fmt(L("Timeline for list '%s'"), lname);
+
+ xs_html_add(lol,
+ xs_html_tag("li",
+ xs_html_tag("a",
+ xs_html_attr("href", url),
+ xs_html_attr("class", "snac-list-link"),
+ xs_html_attr("title", ttl),
+ xs_html_text(lname))));
+ }
+ }
+ }
+
+ if (title) {
+ xs_html_add(body,
+ xs_html_tag("h2",
+ xs_html_attr("class", "snac-header"),
+ xs_html_text(title)));
+ }
+
xs_html_add(body,
xs_html_tag("a",
xs_html_attr("name", "snac-posts")));
@@ -2052,11 +2122,18 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
/* is this message a non-public reply? */
if (user != NULL && !is_msg_public(msg)) {
- char *irt = xs_dict_get(msg, "inReplyTo");
+ const char *irt = xs_dict_get(msg, "inReplyTo");
+ /* is it a reply to something not in the storage? */
if (!xs_is_null(irt) && !object_here(irt)) {
- snac_debug(user, 1, xs_fmt("skipping non-public reply to an unknown post %s", v));
- continue;
+ /* is it for me? */
+ const xs_list *to = xs_dict_get_def(msg, "to", xs_stock(XSTYPE_LIST));
+ const xs_list *cc = xs_dict_get_def(msg, "cc", xs_stock(XSTYPE_LIST));
+
+ if (xs_list_in(to, user->actor) == -1 && xs_list_in(cc, user->actor) == -1) {
+ snac_debug(user, 1, xs_fmt("skipping non-public reply to an unknown post %s", v));
+ continue;
+ }
}
}
@@ -2081,7 +2158,7 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
xs *list = history_list(user);
xs_list *p = list;
- char *v;
+ const char *v;
while (xs_list_iter(&p, &v)) {
xs *fn = xs_replace(v, ".html", "");
@@ -2106,25 +2183,22 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
}
if (show_more) {
- xs *t = NULL;
xs *m = NULL;
xs *ss = xs_fmt("skip=%d&show=%d", skip + show, show);
- xs *url = page == NULL || user == NULL ?
- xs_dup(srv_baseurl) : xs_fmt("%s%s", user->actor, page);
+ xs *url = xs_dup(user == NULL ? srv_baseurl : user->actor);
- if (tag) {
- t = xs_fmt("%s?t=%s", url, tag);
- m = xs_fmt("%s&%s", t, ss);
- }
- else {
- t = xs_dup(url);
- m = xs_fmt("%s?%s", t, ss);
- }
+ if (page != NULL)
+ url = xs_str_cat(url, page);
+
+ if (xs_str_in(url, "?") != -1)
+ m = xs_fmt("%s&%s", url, ss);
+ else
+ m = xs_fmt("%s?%s", url, ss);
xs_html *more_links = xs_html_tag("p",
xs_html_tag("a",
- xs_html_attr("href", t),
+ xs_html_attr("href", url),
xs_html_attr("name", "snac-more"),
xs_html_text(L("Back to top"))),
xs_html_text(" - "),
@@ -2157,7 +2231,7 @@ xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t)
xs_html_text("..."))));
xs_list *p = list;
- char *actor_id;
+ const char *actor_id;
while (xs_list_iter(&p, &actor_id)) {
xs *md5 = xs_md5_hex(actor_id, strlen(actor_id));
@@ -2173,7 +2247,7 @@ xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t)
html_actor_icon(snac, actor, xs_dict_get(actor, "published"), NULL, NULL, 0, 1)));
/* content (user bio) */
- char *c = xs_dict_get(actor, "summary");
+ const char *c = xs_dict_get(actor, "summary");
if (!xs_is_null(c)) {
xs *sc = sanitize(c);
@@ -2317,7 +2391,7 @@ xs_str *html_notifications(snac *user, int skip, int show)
xs_html *noti_seen = NULL;
xs_list *p = n_list;
- xs_str *v;
+ const xs_str *v;
while (xs_list_iter(&p, &v)) {
xs *noti = notify_get(user, v);
@@ -2325,10 +2399,10 @@ xs_str *html_notifications(snac *user, int skip, int show)
continue;
xs *obj = NULL;
- char *type = xs_dict_get(noti, "type");
- char *utype = xs_dict_get(noti, "utype");
- char *id = xs_dict_get(noti, "objid");
- char *date = xs_dict_get(noti, "date");
+ const char *type = xs_dict_get(noti, "type");
+ const char *utype = xs_dict_get(noti, "utype");
+ const char *id = xs_dict_get(noti, "objid");
+ const char *date = xs_dict_get(noti, "date");
if (xs_is_null(id) || !valid_status(object_get(id, &obj)))
continue;
@@ -2336,14 +2410,14 @@ xs_str *html_notifications(snac *user, int skip, int show)
if (is_hidden(user, id))
continue;
- char *actor_id = xs_dict_get(noti, "actor");
+ const char *actor_id = xs_dict_get(noti, "actor");
xs *actor = NULL;
if (!valid_status(actor_get(actor_id, &actor)))
continue;
xs *a_name = actor_name(actor);
- char *label = type;
+ const char *label = type;
if (strcmp(type, "Create") == 0)
label = L("Mention");
@@ -2455,14 +2529,14 @@ xs_str *html_notifications(snac *user, int skip, int show)
int html_get_handler(const xs_dict *req, const char *q_path,
char **body, int *b_size, char **ctype, xs_str **etag)
{
- char *accept = xs_dict_get(req, "accept");
+ const char *accept = xs_dict_get(req, "accept");
int status = 404;
snac snac;
xs *uid = NULL;
- char *p_path;
+ const char *p_path;
int cache = 1;
int save = 1;
- char *v;
+ const char *v;
xs *l = xs_split_n(q_path, "/", 2);
v = xs_list_get(l, 1);
@@ -2501,7 +2575,7 @@ int html_get_handler(const xs_dict *req, const char *q_path,
int skip = 0;
int show = xs_number_get(xs_dict_get(srv_config, "max_timeline_entries"));
- char *q_vars = xs_dict_get(req, "q_vars");
+ const xs_dict *q_vars = xs_dict_get(req, "q_vars");
if ((v = xs_dict_get(q_vars, "skip")) != NULL)
skip = atoi(v), cache = 0, save = 0;
if ((v = xs_dict_get(q_vars, "show")) != NULL)
@@ -2546,35 +2620,99 @@ int html_get_handler(const xs_dict *req, const char *q_path,
status = 401;
}
else {
- double t = history_mtime(&snac, "timeline.html_");
+ const char *q = xs_dict_get(q_vars, "q");
- /* if enabled by admin, return a cached page if its timestamp is:
- a) newer than the timeline timestamp
- b) newer than the start time of the server
- */
- if (cache && t > timeline_mtime(&snac) && t > p_state->srv_start_time) {
- snac_debug(&snac, 1, xs_fmt("serving cached timeline"));
+ if (q && *q) {
+ if (*q == '#') {
+ /** search by tag **/
+ xs *tl = tag_search(q, skip, show + 1);
+ int more = 0;
+ if (xs_list_len(tl) >= show + 1) {
+ /* drop the last one */
+ tl = xs_list_del(tl, -1);
+ more = 1;
+ }
- status = history_get(&snac, "timeline.html_", body, b_size,
- xs_dict_get(req, "if-none-match"), etag);
+ xs *page = xs_fmt("/admin?q=%%23%s", q + 1);
+ xs *title = xs_fmt(xs_list_len(tl) ?
+ L("Search results for tag %s") : L("Nothing found for tag %s"), q);
+
+ *body = html_timeline(&snac, tl, 0, skip, show, more, title, page, 0);
+ *b_size = strlen(*body);
+ status = 200;
+ }
+ else {
+ /** search by content **/
+ int to = 0;
+ int msecs = atoi(xs_dict_get_def(q_vars, "msecs", "0"));
+ xs *tl = content_search(&snac, q, 1, skip, show, msecs, &to);
+ xs *title = NULL;
+ xs *page = xs_fmt("/admin?q=%s&msecs=%d", q, msecs + 10);
+ int tl_len = xs_list_len(tl);
+
+ if (tl_len)
+ title = xs_fmt(L("Search results for '%s'"), q);
+ else
+ if (skip)
+ title = xs_fmt(L("No more matches for '%s'"), q);
+ else
+ title = xs_fmt(L("Nothing found for '%s'"), q);
+
+ *body = html_timeline(&snac, tl, 0, skip, tl_len, to || tl_len == show, title, page, 0);
+ *b_size = strlen(*body);
+ status = 200;
+ }
}
else {
- snac_debug(&snac, 1, xs_fmt("building timeline"));
+ double t = history_mtime(&snac, "timeline.html_");
- xs *list = timeline_list(&snac, "private", skip, show);
- xs *next = timeline_list(&snac, "private", skip + show, 1);
+ /* if enabled by admin, return a cached page if its timestamp is:
+ a) newer than the timeline timestamp
+ b) newer than the start time of the server
+ */
+ if (cache && t > timeline_mtime(&snac) && t > p_state->srv_start_time) {
+ snac_debug(&snac, 1, xs_fmt("serving cached timeline"));
- xs *pins = pinned_list(&snac);
- pins = xs_list_cat(pins, list);
+ status = history_get(&snac, "timeline.html_", body, b_size,
+ xs_dict_get(req, "if-none-match"), etag);
+ }
+ else {
+ snac_debug(&snac, 1, xs_fmt("building timeline"));
- *body = html_timeline(&snac, pins, 0, skip, show,
- xs_list_len(next), NULL, "/admin", 1);
+ xs *list = timeline_list(&snac, "private", skip, show);
+ xs *next = timeline_list(&snac, "private", skip + show, 1);
+ xs *pins = pinned_list(&snac);
+ pins = xs_list_cat(pins, list);
+
+ *body = html_timeline(&snac, pins, 0, skip, show,
+ xs_list_len(next), NULL, "/admin", 1);
+
+ *b_size = strlen(*body);
+ status = 200;
+
+ if (save)
+ history_add(&snac, "timeline.html_", *body, *b_size, etag);
+ }
+ }
+ }
+ }
+ else
+ if (xs_startswith(p_path, "admin/p/")) { /** unique post by md5 **/
+ if (!login(&snac, req)) {
+ *body = xs_dup(uid);
+ status = 401;
+ }
+ else {
+ xs *l = xs_split(p_path, "/");
+ const char *md5 = xs_list_get(l, -1);
+
+ if (md5 && *md5 && timeline_here(&snac, md5)) {
+ xs *list = xs_list_append(xs_list_new(), md5);
+
+ *body = html_timeline(&snac, list, 0, 0, 0, 0, NULL, "/admin", 1);
*b_size = strlen(*body);
status = 200;
-
- if (save)
- history_add(&snac, "timeline.html_", *body, *b_size, etag);
}
}
}
@@ -2613,12 +2751,37 @@ int html_get_handler(const xs_dict *req, const char *q_path,
xs *next = timeline_instance_list(skip + show, 1);
*body = html_timeline(&snac, list, 0, skip, show,
- xs_list_len(next), NULL, "/instance", 0);
+ xs_list_len(next), L("Showing instance timeline"), "/instance", 0);
*b_size = strlen(*body);
status = 200;
}
}
else
+ if (xs_startswith(p_path, "list/")) { /** list timelines **/
+ if (!login(&snac, req)) {
+ *body = xs_dup(uid);
+ status = 401;
+ }
+ else {
+ xs *l = xs_split(p_path, "/");
+ const char *lid = xs_list_get(l, -1);
+
+ xs *list = list_timeline(&snac, lid, skip, show);
+ xs *next = list_timeline(&snac, lid, skip + show, 1);
+
+ if (list != NULL) {
+ xs *base = xs_fmt("/list/%s", lid);
+ xs *name = list_maint(&snac, lid, 3);
+ xs *title = xs_fmt(L("Showing timeline for list '%s'"), name);
+
+ *body = html_timeline(&snac, list, 0, skip, show,
+ xs_list_len(next), title, base, 1);
+ *b_size = strlen(*body);
+ status = 200;
+ }
+ }
+ }
+ else
if (xs_startswith(p_path, "p/")) { /** a timeline with just one entry **/
if (xs_type(xs_dict_get(snac.config, "private")) == XSTYPE_TRUE)
return 403;
@@ -2640,7 +2803,7 @@ int html_get_handler(const xs_dict *req, const char *q_path,
else
if (xs_startswith(p_path, "s/")) { /** a static file **/
xs *l = xs_split(p_path, "/");
- char *id = xs_list_get(l, 1);
+ const char *id = xs_list_get(l, 1);
int sz;
if (id && *id) {
@@ -2661,8 +2824,8 @@ int html_get_handler(const xs_dict *req, const char *q_path,
if (xs_type(xs_dict_get(srv_config, "disable_history")) == XSTYPE_TRUE)
return 403;
- xs *l = xs_split(p_path, "/");
- char *id = xs_list_get(l, 1);
+ xs *l = xs_split(p_path, "/");
+ const char *id = xs_list_get(l, 1);
if (id && *id) {
if (xs_endswith(id, "timeline.html_")) {
@@ -2689,55 +2852,7 @@ int html_get_handler(const xs_dict *req, const char *q_path,
xs_dict_get(srv_config, "host"));
xs *rss_link = xs_fmt("%s.rss", snac.actor);
- xs_html *rss = xs_html_tag("rss",
- xs_html_attr("version", "0.91"));
-
- xs_html *channel = xs_html_tag("channel",
- xs_html_tag("title",
- xs_html_text(rss_title)),
- xs_html_tag("language",
- xs_html_text("en")),
- xs_html_tag("link",
- xs_html_text(rss_link)),
- xs_html_tag("description",
- xs_html_text(bio)));
-
- xs_html_add(rss, channel);
-
- xs_list *p = elems;
- char *v;
-
- while (xs_list_iter(&p, &v)) {
- xs *msg = NULL;
-
- if (!valid_status(timeline_get_by_md5(&snac, v, &msg)))
- continue;
-
- char *id = xs_dict_get(msg, "id");
- char *content = xs_dict_get(msg, "content");
-
- if (!xs_startswith(id, snac.actor))
- continue;
-
- /* create a title with the first line of the content */
- xs *es_title = xs_replace(content, "
", "\n");
- xs *title = xs_str_new(NULL);
- int i;
-
- for (i = 0; es_title[i] && es_title[i] != '\n' && es_title[i] != '&' && i < 50; i++)
- title = xs_append_m(title, &es_title[i], 1);
-
- xs_html_add(channel,
- xs_html_tag("item",
- xs_html_tag("title",
- xs_html_text(title)),
- xs_html_tag("link",
- xs_html_text(id)),
- xs_html_tag("description",
- xs_html_text(content))));
- }
-
- *body = xs_html_render_s(rss, "\n");
+ *body = timeline_to_rss(&snac, elems, rss_title, rss_link, bio);
*b_size = strlen(*body);
*ctype = "application/rss+xml; charset=utf-8";
status = 200;
@@ -2766,8 +2881,9 @@ int html_post_handler(const xs_dict *req, const char *q_path,
int status = 0;
snac snac;
- char *uid, *p_path;
- xs_dict *p_vars;
+ const char *uid;
+ const char *p_path;
+ const xs_dict *p_vars;
xs *l = xs_split_n(q_path, "/", 2);
@@ -2795,15 +2911,15 @@ int html_post_handler(const xs_dict *req, const char *q_path,
if (p_path && strcmp(p_path, "admin/note") == 0) { /** **/
/* post note */
- xs_str *content = xs_dict_get(p_vars, "content");
- xs_str *in_reply_to = xs_dict_get(p_vars, "in_reply_to");
- xs_str *attach_url = xs_dict_get(p_vars, "attach_url");
- xs_list *attach_file = xs_dict_get(p_vars, "attach");
- xs_str *to = xs_dict_get(p_vars, "to");
- xs_str *sensitive = xs_dict_get(p_vars, "sensitive");
- xs_str *summary = xs_dict_get(p_vars, "summary");
- xs_str *edit_id = xs_dict_get(p_vars, "edit_id");
- xs_str *alt_text = xs_dict_get(p_vars, "alt_text");
+ const xs_str *content = xs_dict_get(p_vars, "content");
+ const xs_str *in_reply_to = xs_dict_get(p_vars, "in_reply_to");
+ const xs_str *attach_url = xs_dict_get(p_vars, "attach_url");
+ const xs_list *attach_file = xs_dict_get(p_vars, "attach");
+ const xs_str *to = xs_dict_get(p_vars, "to");
+ const xs_str *sensitive = xs_dict_get(p_vars, "sensitive");
+ const xs_str *summary = xs_dict_get(p_vars, "summary");
+ const xs_str *edit_id = xs_dict_get(p_vars, "edit_id");
+ const xs_str *alt_text = xs_dict_get(p_vars, "alt_text");
int priv = !xs_is_null(xs_dict_get(p_vars, "mentioned_only"));
xs *attach_list = xs_list_new();
@@ -2823,7 +2939,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
/* is attach_file set? */
if (!xs_is_null(attach_file) && xs_type(attach_file) == XSTYPE_LIST) {
- char *fn = xs_list_get(attach_file, 0);
+ const char *fn = xs_list_get(attach_file, 0);
if (*fn != '\0') {
char *ext = strrchr(fn, '.');
@@ -2899,7 +3015,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
int n;
for (n = 0; fields[n]; n++) {
- char *v = xs_dict_get(p_msg, fields[n]);
+ const char *v = xs_dict_get(p_msg, fields[n]);
msg = xs_dict_set(msg, fields[n], v);
}
@@ -2928,10 +3044,10 @@ int html_post_handler(const xs_dict *req, const char *q_path,
else
if (p_path && strcmp(p_path, "admin/action") == 0) { /** **/
/* action on an entry */
- char *id = xs_dict_get(p_vars, "id");
- char *actor = xs_dict_get(p_vars, "actor");
- char *action = xs_dict_get(p_vars, "action");
- char *group = xs_dict_get(p_vars, "group");
+ const char *id = xs_dict_get(p_vars, "id");
+ const char *actor = xs_dict_get(p_vars, "actor");
+ const char *action = xs_dict_get(p_vars, "action");
+ const char *group = xs_dict_get(p_vars, "group");
if (action == NULL)
return 404;
@@ -3055,7 +3171,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
}
else
if (strcmp(action, L("Delete")) == 0) { /** **/
- char *actor_form = xs_dict_get(p_vars, "actor-form");
+ const char *actor_form = xs_dict_get(p_vars, "actor-form");
if (actor_form != NULL) {
/* delete follower */
if (valid_status(follower_del(&snac, actor)))
@@ -3099,8 +3215,8 @@ int html_post_handler(const xs_dict *req, const char *q_path,
else
if (p_path && strcmp(p_path, "admin/user-setup") == 0) { /** **/
/* change of user data */
- char *v;
- char *p1, *p2;
+ const char *v;
+ const char *p1, *p2;
if ((v = xs_dict_get(p_vars, "name")) != NULL)
snac.config = xs_dict_set(snac.config, "name", v);
@@ -3145,7 +3261,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
xs_dict *md = xs_dict_new();
xs *l = xs_split(v, "\n");
xs_list *p = l;
- xs_str *kp;
+ const xs_str *kp;
while (xs_list_iter(&p, &kp)) {
xs *kpl = xs_split_n(kp, "=", 1);
@@ -3166,7 +3282,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
for (n = 0; uploads[n]; n++) {
xs *var_name = xs_fmt("%s_file", uploads[n]);
- xs_list *uploaded_file = xs_dict_get(p_vars, var_name);
+ const xs_list *uploaded_file = xs_dict_get(p_vars, var_name);
if (xs_type(uploaded_file) == XSTYPE_LIST) {
const char *fn = xs_list_get(uploaded_file, 0);
@@ -3231,7 +3347,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
}
else
if (p_path && strcmp(p_path, "admin/vote") == 0) { /** **/
- char *irt = xs_dict_get(p_vars, "irt");
+ const char *irt = xs_dict_get(p_vars, "irt");
const char *opt = xs_dict_get(p_vars, "question");
const char *actor = xs_dict_get(p_vars, "actor");
@@ -3246,7 +3362,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
}
xs_list *p = ls;
- xs_str *v;
+ const xs_str *v;
while (xs_list_iter(&p, &v)) {
xs *msg = msg_note(&snac, "", actor, irt, NULL, 1);
@@ -3261,11 +3377,30 @@ int html_post_handler(const xs_dict *req, const char *q_path,
timeline_add(&snac, xs_dict_get(msg, "id"), msg);
}
+ {
+ /* get the poll object */
+ xs *poll = NULL;
+
+ if (valid_status(object_get(irt, &poll))) {
+ const char *date = xs_dict_get(poll, "endTime");
+ if (xs_is_null(date))
+ date = xs_dict_get(poll, "closed");
+
+ if (!xs_is_null(date)) {
+ time_t t = xs_parse_iso_date(date, 0) - time(NULL);
+
+ /* request the poll when it's closed;
+ Pleroma does not send and update when the poll closes */
+ enqueue_object_request(&snac, irt, t + 2);
+ }
+ }
+ }
+
status = 303;
}
if (status == 303) {
- char *redir = xs_dict_get(p_vars, "redir");
+ const char *redir = xs_dict_get(p_vars, "redir");
if (xs_is_null(redir))
redir = "top";
@@ -3278,3 +3413,71 @@ int html_post_handler(const xs_dict *req, const char *q_path,
return status;
}
+
+
+xs_str *timeline_to_rss(snac *user, const xs_list *timeline, char *title, char *link, char *desc)
+/* converts a timeline to rss */
+{
+ xs_html *rss = xs_html_tag("rss",
+ xs_html_attr("version", "0.91"));
+
+ xs_html *channel = xs_html_tag("channel",
+ xs_html_tag("title",
+ xs_html_text(title)),
+ xs_html_tag("language",
+ xs_html_text("en")),
+ xs_html_tag("link",
+ xs_html_text(link)),
+ xs_html_tag("description",
+ xs_html_text(desc)));
+
+ xs_html_add(rss, channel);
+
+ int c = 0;
+ const char *v;
+
+ while (xs_list_next(timeline, &v, &c)) {
+ xs *msg = NULL;
+
+ if (user) {
+ if (!valid_status(timeline_get_by_md5(user, v, &msg)))
+ continue;
+ }
+ else {
+ if (!valid_status(object_get_by_md5(v, &msg)))
+ continue;
+ }
+
+ const char *id = xs_dict_get(msg, "id");
+ const char *content = xs_dict_get(msg, "content");
+
+ if (user && !xs_startswith(id, user->actor))
+ continue;
+
+ /* create a title with the first line of the content */
+ xs *title = xs_replace(content, "
", "\n");
+ title = xs_regex_replace_i(title, "<[^>]+>", " ");
+ title = xs_regex_replace_i(title, "&[^;]+;", " ");
+ int i;
+
+ for (i = 0; title[i] && title[i] != '\n' && i < 50; i++);
+
+ if (title[i] != '\0') {
+ title[i] = '\0';
+ title = xs_str_cat(title, "...");
+ }
+
+ title = xs_strip_i(title);
+
+ xs_html_add(channel,
+ xs_html_tag("item",
+ xs_html_tag("title",
+ xs_html_text(title)),
+ xs_html_tag("link",
+ xs_html_text(id)),
+ xs_html_tag("description",
+ xs_html_text(content))));
+ }
+
+ return xs_html_render_s(rss, "\n");
+}
diff --git a/http.c b/http.c
index 1b3d590..b21f1dc 100644
--- a/http.c
+++ b/http.c
@@ -12,7 +12,7 @@
xs_dict *http_signed_request_raw(const char *keyid, const char *seckey,
const char *method, const char *url,
- xs_dict *headers,
+ const xs_dict *headers,
const char *body, int b_size,
int *status, xs_str **payload, int *p_size,
int timeout)
@@ -24,15 +24,16 @@ xs_dict *http_signed_request_raw(const char *keyid, const char *seckey,
xs *s64 = NULL;
xs *signature = NULL;
xs *hdrs = NULL;
- char *host;
- char *target;
- char *k, *v;
+ const char *host;
+ const char *target;
+ const char *k, *v;
xs_dict *response;
date = xs_str_utctime(0, "%a, %d %b %Y %H:%M:%S GMT");
{
- xs *s = xs_replace_n(url, "https:/" "/", "", 1);
+ xs *s1 = xs_replace_n(url, "http:/" "/", "", 1);
+ xs *s = xs_replace_n(s1, "https:/" "/", "", 1);
l1 = xs_split_n(s, "/", 1);
}
@@ -105,13 +106,13 @@ xs_dict *http_signed_request_raw(const char *keyid, const char *seckey,
xs_dict *http_signed_request(snac *snac, const char *method, const char *url,
- xs_dict *headers,
+ const xs_dict *headers,
const char *body, int b_size,
int *status, xs_str **payload, int *p_size,
int timeout)
/* does a signed HTTP request */
{
- char *seckey = xs_dict_get(snac->key, "secret");
+ const char *seckey = xs_dict_get(snac->key, "secret");
xs_dict *response;
response = http_signed_request_raw(snac->actor, seckey, method, url,
@@ -121,17 +122,18 @@ xs_dict *http_signed_request(snac *snac, const char *method, const char *url,
}
-int check_signature(xs_dict *req, xs_str **err)
+int check_signature(const xs_dict *req, xs_str **err)
/* check the signature */
{
- char *sig_hdr = xs_dict_get(req, "signature");
+ const char *sig_hdr = xs_dict_get(req, "signature");
xs *keyId = NULL;
xs *headers = NULL;
xs *signature = NULL;
xs *created = NULL;
xs *expires = NULL;
- char *pubkey;
char *p;
+ const char *pubkey;
+ const char *k;
if (xs_is_null(sig_hdr)) {
*err = xs_fmt("missing 'signature' header");
@@ -141,10 +143,10 @@ int check_signature(xs_dict *req, xs_str **err)
{
/* extract the values */
xs *l = xs_split(sig_hdr, ",");
- xs_list *p = l;
- xs_val *v;
+ int c = 0;
+ const xs_val *v;
- while (xs_list_iter(&p, &v)) {
+ while (xs_list_next(l, &v, &c)) {
xs *kv = xs_split_n(v, "=", 1);
if (xs_list_len(kv) != 2)
@@ -191,8 +193,8 @@ int check_signature(xs_dict *req, xs_str **err)
return 0;
}
- if ((p = xs_dict_get(actor, "publicKey")) == NULL ||
- ((pubkey = xs_dict_get(p, "publicKeyPem")) == NULL)) {
+ if ((k = xs_dict_get(actor, "publicKey")) == NULL ||
+ ((pubkey = xs_dict_get(k, "publicKeyPem")) == NULL)) {
*err = xs_fmt("cannot get pubkey from %s", keyId);
return 0;
}
@@ -203,11 +205,11 @@ int check_signature(xs_dict *req, xs_str **err)
{
xs *l = xs_split(headers, " ");
xs_list *p;
- xs_val *v;
+ const xs_val *v;
p = l;
while (xs_list_iter(&p, &v)) {
- char *hc;
+ const char *hc;
xs *ss = NULL;
if (*sig_str != '\0')
diff --git a/httpd.c b/httpd.c
index e402e61..a7396e8 100644
--- a/httpd.c
+++ b/httpd.c
@@ -75,7 +75,7 @@ xs_str *nodeinfo_2_0(void)
int n_posts = 0;
xs *users = user_list();
xs_list *p = users;
- char *v;
+ const char *v;
double now = (double)time(NULL);
while (xs_list_iter(&p, &v)) {
@@ -125,10 +125,10 @@ static xs_str *greeting_html(void)
/* does it have a %userlist% mark? */
if (xs_str_in(s, "%userlist%") != -1) {
- char *host = xs_dict_get(srv_config, "host");
+ const char *host = xs_dict_get(srv_config, "host");
xs *list = user_list();
xs_list *p = list;
- xs_str *uid;
+ const xs_str *uid;
xs_html *ul = xs_html_tag("ul",
xs_html_attr("class", "snac-user-list"));
@@ -169,18 +169,16 @@ int server_get_handler(xs_dict *req, const char *q_path,
{
int status = 0;
- (void)req;
-
/* is it the server root? */
if (*q_path == '\0') {
- xs_dict *q_vars = xs_dict_get(req, "q_vars");
- char *t = NULL;
+ const xs_dict *q_vars = xs_dict_get(req, "q_vars");
+ const char *t = NULL;
if (xs_type(q_vars) == XSTYPE_DICT && (t = xs_dict_get(q_vars, "t"))) {
/** search by tag **/
int skip = 0;
int show = xs_number_get(xs_dict_get(srv_config, "max_timeline_entries"));
- char *v;
+ const char *v;
if ((v = xs_dict_get(q_vars, "skip")) != NULL)
skip = atoi(v);
@@ -195,13 +193,25 @@ int server_get_handler(xs_dict *req, const char *q_path,
more = 1;
}
- *body = html_timeline(NULL, tl, 0, skip, show, more, t, NULL, 0);
+ const char *accept = xs_dict_get(req, "accept");
+ if (!xs_is_null(accept) && strcmp(accept, "application/rss+xml") == 0) {
+ xs *link = xs_fmt("%s/?t=%s", srv_baseurl, t);
+
+ *body = timeline_to_rss(NULL, tl, link, link, link);
+ *ctype = "application/rss+xml; charset=utf-8";
+ }
+ else {
+ xs *page = xs_fmt("?t=%s", t);
+ xs *title = xs_fmt(L("Search results for tag #%s"), t);
+ *body = html_timeline(NULL, tl, 0, skip, show, more, title, page, 0);
+ }
}
else
if (xs_type(xs_dict_get(srv_config, "show_instance_timeline")) == XSTYPE_TRUE) {
/** instance timeline **/
xs *tl = timeline_instance_list(0, 30);
- *body = html_timeline(NULL, tl, 0, 0, 0, 0, NULL, NULL, 0);
+ *body = html_timeline(NULL, tl, 0, 0, 0, 0,
+ L("Recent posts by users in this instance"), NULL, 0);
}
else
*body = greeting_html();
@@ -258,7 +268,7 @@ void httpd_connection(FILE *f)
/* the connection processor */
{
xs *req;
- char *method;
+ const char *method;
int status = 0;
xs_str *body = NULL;
int b_size = 0;
@@ -268,7 +278,7 @@ void httpd_connection(FILE *f)
xs *payload = NULL;
xs *etag = NULL;
int p_size = 0;
- char *p;
+ const char *p;
int fcgi_id;
if (p_state->use_fcgi)
@@ -360,7 +370,7 @@ void httpd_connection(FILE *f)
#ifndef NO_MASTODON_API
if (status == 0)
status = mastoapi_delete_handler(req, q_path,
- &body, &b_size, &ctype);
+ payload, p_size, &body, &b_size, &ctype);
#endif
}
@@ -401,9 +411,9 @@ void httpd_connection(FILE *f)
headers = xs_dict_append(headers, "etag", etag);
/* if there are any additional headers, add them */
- xs_dict *more_headers = xs_dict_get(srv_config, "http_headers");
+ const xs_dict *more_headers = xs_dict_get(srv_config, "http_headers");
if (xs_type(more_headers) == XSTYPE_DICT) {
- char *k, *v;
+ const char *k, *v;
int c = 0;
while (xs_dict_next(more_headers, &k, &v, &c))
headers = xs_dict_set(headers, k, v);
@@ -580,7 +590,8 @@ static void *background_thread(void *arg)
{
xs *list = user_list();
- char *p, *uid;
+ char *p;
+ const char *uid;
/* process queues for all users */
p = list;
@@ -654,6 +665,13 @@ srv_state *srv_state_op(xs_str **fname, int op)
switch (op) {
case 0: /* open for writing */
+
+#ifdef WITHOUT_SHM
+
+ errno = ENOTSUP;
+
+#else
+
if ((fd = shm_open(*fname, O_CREAT | O_RDWR, 0666)) != -1) {
ftruncate(fd, sizeof(*ss));
@@ -664,6 +682,8 @@ srv_state *srv_state_op(xs_str **fname, int op)
close(fd);
}
+#endif
+
if (ss == NULL) {
/* shared memory error: just create a plain structure */
srv_log(xs_fmt("warning: shm object error (%s)", strerror(errno)));
@@ -677,6 +697,13 @@ srv_state *srv_state_op(xs_str **fname, int op)
break;
case 1: /* open for reading */
+
+#ifdef WITHOUT_SHM
+
+ errno = ENOTSUP;
+
+#else
+
if ((fd = shm_open(*fname, O_RDONLY, 0666)) != -1) {
if ((ss = mmap(0, sizeof(*ss), PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED)
ss = NULL;
@@ -684,6 +711,8 @@ srv_state *srv_state_op(xs_str **fname, int op)
close(fd);
}
+#endif
+
if (ss == NULL) {
/* shared memory error */
srv_log(xs_fmt("error: shm object error (%s) server not running?", strerror(errno)));
@@ -701,9 +730,14 @@ srv_state *srv_state_op(xs_str **fname, int op)
break;
case 2: /* unlink */
+
+#ifndef WITHOUT_SHM
+
if (*fname)
shm_unlink(*fname);
+#endif
+
break;
}
diff --git a/main.c b/main.c
index 06cae78..c88eebe 100644
--- a/main.c
+++ b/main.c
@@ -44,6 +44,7 @@ int usage(void)
printf("limit {basedir} {uid} {actor} Limits an actor (drops their announces)\n");
printf("unlimit {basedir} {uid} {actor} Unlimits an actor\n");
printf("verify_links {basedir} {uid} Verifies a user's links (in the metadata)\n");
+ printf("search {basedir} {uid} {regex} Searches posts by content\n");
return 1;
}
@@ -314,7 +315,7 @@ int main(int argc, char *argv[])
xs *msg = msg_follow(&snac, url);
if (msg != NULL) {
- char *actor = xs_dict_get(msg, "object");
+ const char *actor = xs_dict_get(msg, "object");
following_add(&snac, actor, msg);
@@ -374,6 +375,23 @@ int main(int argc, char *argv[])
return 0;
}
+ if (strcmp(cmd, "search") == 0) { /** **/
+ int to;
+
+ /* 'url' contains the regex */
+ xs *r = content_search(&snac, url, 1, 0, XS_ALL, 10, &to);
+
+ int c = 0;
+ const char *v;
+
+ /* print results as standalone links */
+ while (xs_list_next(r, &v, &c)) {
+ printf("%s/admin/p/%s\n", snac.actor, v);
+ }
+
+ return 0;
+ }
+
if (strcmp(cmd, "ping") == 0) { /** **/
xs *actor_o = NULL;
@@ -458,6 +476,12 @@ int main(int argc, char *argv[])
return 0;
}
+ if (strcmp(cmd, "request2") == 0) { /** **/
+ enqueue_object_request(&snac, url, 2);
+
+ return 0;
+ }
+
if (strcmp(cmd, "actor") == 0) { /** **/
int status;
xs *data = NULL;
diff --git a/mastoapi.c b/mastoapi.c
index 4d80f69..3936c2a 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -156,7 +156,7 @@ const char *login_page = ""
"\n"
"