1 files changed, 355 insertions, 99 deletions

diff --git a/html.c b/html.c
index d5294cb..36d39c4 100644
--- a/html.c
+++ b/html.c
@@ -16,6 +16,7 @@
 #include "xs_url.h"
 #include "xs_random.h"
 #include "xs_http.h"
+#include "xs_list_tools.h"
 
 #include "snac.h"
 
@@ -161,6 +162,34 @@ xs_str *actor_name(xs_dict *actor, const char *proxy)
 }
 
 
+xs_str *actor_pronouns(xs_dict *actor)
+/* gets the actor name */
+{
+    const xs_list *attachment;
+    const xs_dict *d;
+    const char *v;
+    const char *pronouns = "";
+    xs_str *ret;
+
+    if (xs_is_list((attachment = xs_dict_get(actor, "attachment")))) {
+        xs_list_foreach(attachment, d) {
+            xs *prop = xs_utf8_to_lower(xs_dict_get(d, "name"));
+            /* make sure that we are reading the correct metadata */
+            if (strlen(prop) == 8 && strcmp(prop, "pronouns") == 0) {
+                /* safeguard from NULL values */
+                v = xs_dict_get(d, "value");
+                pronouns = v ? v : pronouns;
+                break;
+            }
+        }
+    }
+
+    /* strip all HTML tags */
+    ret = xs_regex_replace(pronouns, "</?[^>]+>", "");
+    return ret;
+}
+
+
 xs_str *format_text_with_emoji(snac *user, const char *text, int ems, const char *proxy)
 /* needed when we have local text with no tags attached */
 {
@@ -181,6 +210,41 @@ xs_str *format_text_with_emoji(snac *user, const char *text, int ems, const char
 }
 
 
+xs_str *html_date_label(snac *user, const char *date)
+{
+    time_t t;
+
+    /* check if a user has actually set a timezone */
+    if (user != NULL && xs_dict_get(user->config, "tz") != NULL &&
+        (t = xs_parse_iso_date(date, 0)) != 0) {
+        t += xs_tz_offset(user->tz);
+
+        time_t today = time(NULL);
+        if (today - t >= 3600 * 24 * 30 * 6) {
+            /* more than half a year ago */
+            return xs_str_utctime(t, "%Y-%m-%d %H:%M");
+        }
+
+        xs_str *date = xs_str_utctime(t, "%b%d %H:%M");
+
+        struct tm tm;
+        localtime_r(&t, &tm);
+
+        if (tm.tm_mon >= 0 && tm.tm_mon <= 11) {
+            /* copy the 3letter translated month name */
+            const char *m = L(months[tm.tm_mon]);
+
+            if (xs_is_string(m))
+                date = xs_replace_i(date, months[tm.tm_mon], m);
+        }
+
+        return date;
+    }
+
+    return xs_crop_i(xs_dup(date), 0, 10);
+}
+
+
 xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
                         const char *udate, const char *url, int scope,
                         int in_people, const char *proxy, const char *lang,
@@ -194,6 +258,7 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
     int fwer = 0;
 
     xs *name = actor_name(actor, proxy);
+    xs *pronouns = actor_pronouns(actor);
 
     /* get the avatar */
     if ((v = xs_dict_get(actor, "icon")) != NULL) {
@@ -209,6 +274,14 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
         avatar = xs_fmt("data:image/png;base64, %s", default_avatar_base64());
 
     const char *actor_id = xs_dict_get(actor, "id");
+    const char *html_url = xs_dict_get_def(actor, "url", actor_id);
+
+    if (xs_is_list(html_url))
+        html_url = xs_list_get(html_url, 0);
+
+    if (!xs_is_string(html_url))
+        html_url = actor_id;
+
     xs *href = NULL;
 
     if (user) {
@@ -217,16 +290,27 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
     }
 
     if (user && !in_people) {
-        /* if this actor is a follower or being followed, create an
-           anchored link to the people page instead of the actor url */
-        if (fwer || fwing) {
-            xs *md5 = xs_md5_hex(actor_id, strlen(actor_id));
-            href = xs_fmt("%s/people/%s", user->actor, md5);
-        }
+        xs *md5 = xs_md5_hex(actor_id, strlen(actor_id));
+        href = xs_fmt("%s/people/%s", user->actor, md5);
     }
 
     if (href == NULL)
-        href = xs_dup(actor_id);
+        href = xs_dup(html_url);
+
+    xs_html *name_link = xs_html_tag("a",
+            xs_html_attr("href",    href),
+            xs_html_attr("class",   "p-author h-card snac-author"),
+            xs_html_raw(name)); /* name is already html-escaped */
+
+    if (*pronouns) {
+        xs_html_add(name_link,
+            xs_html_text(" ["),
+            xs_html_tag("span",
+                xs_html_attr("class",   "snac-pronouns"),
+                xs_html_attr("title",   "user's pronouns"),
+                xs_html_raw(pronouns)),
+            xs_html_text("]"));
+    }
 
     xs_html_add(actor_icon,
         xs_html_sctag("img",
@@ -234,10 +318,7 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
             xs_html_attr("class",   "snac-avatar"),
             xs_html_attr("src",     avatar),
             xs_html_attr("alt",     "[?]")),
-        xs_html_tag("a",
-            xs_html_attr("href",    href),
-            xs_html_attr("class",   "p-author h-card snac-author"),
-            xs_html_raw(name))); /* name is already html-escaped */
+        name_link);
 
     if (!xs_is_null(url)) {
         xs *md5 = xs_md5_hex(url, strlen(url));
@@ -250,6 +331,7 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
                 xs_html_text("»")));
     }
 
+
     if (strcmp(xs_dict_get(actor, "type"), "Service") == 0) {
         xs_html_add(actor_icon,
             xs_html_text(" "),
@@ -318,11 +400,11 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
             xs_html_raw("&nbsp;"));
     }
     else {
-        xs *date_label = xs_crop_i(xs_dup(date), 0, 10);
+        xs *date_label = html_date_label(user, date);
         xs *date_title = xs_dup(date);
 
         if (!xs_is_null(udate)) {
-            xs *sd = xs_crop_i(xs_dup(udate), 0, 10);
+            xs *sd = html_date_label(user, udate);
 
             date_label = xs_str_cat(date_label, " / ", sd);
 
@@ -379,7 +461,7 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
         xs_html_add(actor_icon,
             xs_html_sctag("br", NULL),
             xs_html_tag("a",
-                xs_html_attr("href",  xs_dict_get(actor, "id")),
+                xs_html_attr("href",  html_url),
                 xs_html_attr("class", "p-author-tag h-card snac-author-tag"),
                 xs_html_text(user)));
     }
@@ -401,9 +483,14 @@ xs_html *html_msg_icon(snac *user, const char *actor_id, const xs_dict *msg,
         const char *type = xs_dict_get(msg, "type");
         const int scope = get_msg_visibility(msg);
 
-        if (xs_match(type, POSTLIKE_OBJECT_TYPE))
-            url = xs_dict_get(msg, "id");
+        if (xs_match(type, POSTLIKE_OBJECT_TYPE)) {
+            url = xs_dict_get(msg, "url");
+            if (xs_is_list(url))
+                url = xs_list_get(url, 0);
 
+            if (!xs_is_string(url))
+                url = xs_dict_get(msg, "id");
+        }
 
         date  = xs_dict_get(msg, "published");
         udate = xs_dict_get(msg, "updated");
@@ -427,7 +514,7 @@ void html_note_render_visibility(snac* user, xs_html *form, const int scope)
 
     xs_html *paragraph = xs_html_tag("p", xs_html_text(L("Visibility: ")));
     const int* to_render = scopes[scope];
-    for( int i = 0; to_render[i] != -1; i++ ){
+    for( int i = 0; to_render[i] != -1; i++ ) {
         const int scope_i = to_render[i];
         const char* value = scopes_tags[scope_i];
         const char* name = scopes_names[scope_i];
@@ -735,13 +822,18 @@ xs_html *html_note(snac *user, const char *summary,
 
     /* add poll controls */
     if (poll) {
+        const xs_number *max_options = xs_dict_get(srv_config, "max_poll_options");
+        xs *poll_limit_str = xs_dup(L("Poll options (one per line, up to 8):"));
+        if (max_options != NULL)
+            poll_limit_str = xs_replace_i(poll_limit_str, "8", xs_number_str(max_options));
+
         xs_html_add(form,
             xs_html_tag("p", NULL),
             xs_html_tag("details",
                 xs_html_tag("summary",
                     xs_html_text(L("Poll..."))),
                 xs_html_tag("p",
-                    xs_html_text(L("Poll options (one per line, up to 8):")),
+                    xs_html_text(poll_limit_str),
                     xs_html_sctag("br", NULL),
                     xs_html_tag("textarea",
                         xs_html_attr("class",    "snac-textarea"),
@@ -769,7 +861,13 @@ xs_html *html_note(snac *user, const char *summary,
                         xs_html_text(L("End in 1 hour"))),
                     xs_html_tag("option",
                         xs_html_attr("value", "86400"),
-                        xs_html_text(L("End in 1 day"))))));
+                        xs_html_text(L("End in 1 day"))),
+                    xs_html_tag("option",
+                        xs_html_attr("value", "259200"),
+                        xs_html_text(L("End in 3 days"))),
+                    xs_html_tag("option",
+                        xs_html_attr("value", "31536000"),
+                        xs_html_text(L("End in 1 year"))))));
     }
 
     xs_html_add(form,
@@ -1346,6 +1444,20 @@ static xs_html *html_user_body(snac *user, int read_only)
 }
 
 
+xs_html *html_checkbox(const char *form_name, const char *label, int flag)
+/* helper for checkbox rendering */
+{
+    return xs_html_tag("p",
+        xs_html_sctag("input",
+            xs_html_attr("type",     "checkbox"),
+            xs_html_attr("name",     form_name),
+            xs_html_attr(flag ? "checked" : "", NULL)),
+        xs_html_tag("label",
+            xs_html_attr("for", form_name),
+            xs_html_text(label)));
+}
+
+
 xs_html *html_top_controls(snac *user)
 /* generates the top controls */
 {
@@ -1669,70 +1781,21 @@ xs_html *html_top_controls(snac *user)
                         xs_html_attr("type", "number"),
                         xs_html_attr("name", "purge_days"),
                         xs_html_attr("value", purge_days))),
-                xs_html_tag("p",
-                    xs_html_sctag("input",
-                        xs_html_attr("type", "checkbox"),
-                        xs_html_attr("name", "drop_dm_from_unknown"),
-                        xs_html_attr("id", "drop_dm_from_unknown"),
-                        xs_html_attr(xs_type(d_dm_f_u) == XSTYPE_TRUE ? "checked" : "", NULL)),
-                    xs_html_tag("label",
-                        xs_html_attr("for", "drop_dm_from_unknown"),
-                        xs_html_text(L("Drop direct messages from people you don't follow")))),
-                xs_html_tag("p",
-                    xs_html_sctag("input",
-                        xs_html_attr("type", "checkbox"),
-                        xs_html_attr("name", "bot"),
-                        xs_html_attr("id", "bot"),
-                        xs_html_attr(xs_type(bot) == XSTYPE_TRUE ? "checked" : "", NULL)),
-                    xs_html_tag("label",
-                        xs_html_attr("for", "bot"),
-                        xs_html_text(L("This account is a bot")))),
-                xs_html_tag("p",
-                    xs_html_sctag("input",
-                        xs_html_attr("type", "checkbox"),
-                        xs_html_attr("name", "auto_boost"),
-                        xs_html_attr("id", "auto_boost"),
-                        xs_html_attr(xs_is_true(auto_boost) ? "checked" : "", NULL)),
-                    xs_html_tag("label",
-                        xs_html_attr("for", "auto_boost"),
-                        xs_html_text(L("Auto-boost all mentions to this account")))),
-                xs_html_tag("p",
-                    xs_html_sctag("input",
-                        xs_html_attr("type", "checkbox"),
-                        xs_html_attr("name", "private"),
-                        xs_html_attr("id", "private"),
-                        xs_html_attr(xs_type(a_private) == XSTYPE_TRUE ? "checked" : "", NULL)),
-                    xs_html_tag("label",
-                        xs_html_attr("for", "private"),
-                        xs_html_text(L("This account is private "
-                            "(posts are not shown through the web)")))),
-                xs_html_tag("p",
-                    xs_html_sctag("input",
-                        xs_html_attr("type", "checkbox"),
-                        xs_html_attr("name", "collapse_threads"),
-                        xs_html_attr("id",   "collapse_threads"),
-                        xs_html_attr(xs_is_true(coll_thrds) ? "checked" : "", NULL)),
-                    xs_html_tag("label",
-                        xs_html_attr("for", "collapse_threads"),
-                        xs_html_text(L("Collapse top threads by default")))),
-                xs_html_tag("p",
-                    xs_html_sctag("input",
-                        xs_html_attr("type", "checkbox"),
-                        xs_html_attr("name", "approve_followers"),
-                        xs_html_attr("id",   "approve_followers"),
-                        xs_html_attr(xs_is_true(pending) ? "checked" : "", NULL)),
-                    xs_html_tag("label",
-                        xs_html_attr("for", "approve_followers"),
-                        xs_html_text(L("Follow requests must be approved")))),
-                xs_html_tag("p",
-                    xs_html_sctag("input",
-                        xs_html_attr("type", "checkbox"),
-                        xs_html_attr("name", "show_contact_metrics"),
-                        xs_html_attr("id",   "show_contact_metrics"),
-                        xs_html_attr(xs_is_true(show_foll) ? "checked" : "", NULL)),
-                    xs_html_tag("label",
-                        xs_html_attr("for", "show_contact_metrics"),
-                        xs_html_text(L("Publish follower and following metrics")))),
+                html_checkbox("drop_dm_from_unknown", L("Drop direct messages from people you don't follow"),
+                        xs_is_true(d_dm_f_u)),
+                html_checkbox("bot", L("This account is a bot"),
+                        xs_is_true(bot)),
+                html_checkbox("auto_boost", L("Auto-boost all mentions to this account"),
+                        xs_is_true(auto_boost)),
+                html_checkbox("private", L("This account is private "
+                        "(posts are not shown through the web)"),
+                        xs_is_true(a_private)),
+                html_checkbox("collapse_threads", L("Collapse top threads by default"),
+                        xs_is_true(coll_thrds)),
+                html_checkbox("approve_followers", L("Follow requests must be approved"),
+                        xs_is_true(pending)),
+                html_checkbox("show_contact_metrics", L("Publish follower and following metrics"),
+                        xs_is_true(show_foll)),
                 xs_html_tag("p",
                     xs_html_text(L("Current location:")),
                     xs_html_sctag("br", NULL),
@@ -1864,6 +1927,38 @@ xs_html *html_top_controls(snac *user)
                     xs_html_attr("class", "button"),
                     xs_html_attr("value", L("Update hashtags")))))));
 
+    xs *muted_words_action = xs_fmt("%s/admin/muted-words", user->actor);
+    xs *muted_words = xs_join(xs_dict_get_def(user->config,
+                        "muted_words", xs_stock(XSTYPE_LIST)), "\n");
+
+    xs_html_add(top_controls,
+        xs_html_tag("details",
+        xs_html_tag("summary",
+            xs_html_text(L("Muted words..."))),
+        xs_html_tag("p",
+            xs_html_text(L("One word per line, partial matches count"))),
+        xs_html_tag("div",
+            xs_html_attr("class", "snac-muted-words"),
+            xs_html_tag("form",
+                xs_html_attr("autocomplete", "off"),
+                xs_html_attr("method", "post"),
+                xs_html_attr("action", muted_words_action),
+                xs_html_attr("enctype", "multipart/form-data"),
+
+                xs_html_tag("textarea",
+                    xs_html_attr("name", "muted_words"),
+                    xs_html_attr("cols", "40"),
+                    xs_html_attr("rows", "4"),
+                    xs_html_attr("placeholder", "nascar\nsuperbowl\nFIFA"),
+                    xs_html_text(muted_words)),
+
+                xs_html_tag("br", NULL),
+
+                xs_html_sctag("input",
+                    xs_html_attr("type", "submit"),
+                    xs_html_attr("class", "button"),
+                    xs_html_attr("value", L("Update muted words")))))));
+
     return top_controls;
 }
 
@@ -2144,6 +2239,29 @@ xs_html *html_entry_controls(snac *user, const char *actor,
 }
 
 
+static const xs_str* words_in_content(const xs_list *words, const xs_val *content)
+/* returns a word that matches any of the words in content */
+{
+    if (!xs_is_list(words) || !xs_is_string(content)) {
+        return NULL;
+    }
+    xs *c = xs_split(content, " ");
+    xs *sc = xs_list_sort(c, NULL);
+
+    const xs_str *wv;
+    const xs_str *cv;
+    xs_list_foreach(words, wv) {
+        xs_list_foreach(sc, cv) {
+            xs_tolower_i((xs_str*)cv);
+            if(xs_str_in(cv, wv) != -1)
+                return wv;
+        }
+    }
+
+    return NULL;
+}
+
+
 xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
                    int level, const char *md5, int hide_children)
 {
@@ -2438,6 +2556,17 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
                 xs_html_text(v),
                 xs_html_text(L(" [SENSITIVE CONTENT]"))));
     }
+    else
+    if (user &&
+        /* muted_words is all lowercase and sorted for performance */
+        (v = words_in_content(xs_dict_get(user->config, "muted_words"),
+                              xs_dict_get(msg, "content"))) != NULL) {
+        snac_debug(user, 1, xs_fmt("word %s muted by user preferences: %s", v, id));
+        snac_content = xs_html_tag("details",
+            xs_html_tag("summary",
+                xs_html_text(L("Muted: ")),
+                xs_html_text(v)));
+    }
     else {
         snac_content = xs_html_tag("div", NULL);
     }
@@ -2675,7 +2804,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
                 xs_html_add(snac_content,
                     xs_html_tag("blockquote",
                         xs_html_attr("class", "snac-quoted-post"),
-                        html_entry(user, quoted_post, 1, 1, NULL, 1)));
+                        html_entry(user, quoted_post, 1, level + 1, NULL, 1)));
             }
             else
             if (user)
@@ -3491,7 +3620,7 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
             continue;
 
         const int scope = get_msg_visibility(msg);
-        if (user != NULL && scope != SCOPE_PUBLIC){
+        if (user != NULL && scope != SCOPE_PUBLIC && !is_msg_mine(user, xs_dict_get(msg, "id"))) {
             /* is this message a non-public reply? */
             const char *irt = get_in_reply_to(msg);
 
@@ -3508,13 +3637,11 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
             }
         }
         /* hide non-public posts from /instance view */
-        if (page != NULL && strcmp(page, "/instance") == 0 && scope != SCOPE_PUBLIC){
+        if (page != NULL && strcmp(page, "/instance") == 0 && scope != SCOPE_PUBLIC)
             continue;
-        }
         /* hide non-public posts viewed from outside */
-        if (read_only && (scope != SCOPE_PUBLIC && scope != SCOPE_UNLISTED)) {
+        if (read_only && (scope != SCOPE_PUBLIC && scope != SCOPE_UNLISTED))
             continue;
-        }
 
         xs_html *entry = html_entry(user, msg, read_only, 0, v, (user && !hide_children) ? 0 : 1);
 
@@ -3597,13 +3724,19 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
 }
 
 
-xs_html *html_people_list(snac *user, xs_list *list, const char *header, const char *t, const char *proxy)
+xs_html *html_people_list(snac *user, xs_list *list, const char *header, const char *t, const char *proxy, int count)
 {
     xs_html *snac_posts;
+    xs *header_cnt;
+    if (count > -1)
+        header_cnt = xs_fmt("%s - %d\n", header, count);
+    else
+        header_cnt = xs_fmt("%s\n", header);
+
     xs_html *people = xs_html_tag("div",
         xs_html_tag("h2",
             xs_html_attr("class", "snac-header"),
-            xs_html_text(header)),
+            xs_html_text(header_cnt)),
         snac_posts = xs_html_tag("details",
                 xs_html_attr("open", NULL),
                 xs_html_tag("summary",
@@ -3844,12 +3977,12 @@ xs_str *html_people(snac *user)
 
     if (xs_list_len(pending) || xs_is_true(xs_dict_get(user->config, "approve_followers"))) {
         xs_html_add(lists,
-            html_people_list(user, pending, L("Pending follow confirmations"), "p", proxy));
+            html_people_list(user, pending, L("Pending follow confirmations"), "p", proxy, xs_list_len(pending)));
     }
 
     xs_html_add(lists,
-        html_people_list(user, wing, L("People you follow"), "i", proxy),
-        html_people_list(user, wers, L("People that follow you"), "e", proxy));
+        html_people_list(user, wing, L("People you follow"), "i", proxy, following_list_len(user)),
+        html_people_list(user, wers, L("People that follow you"), "e", proxy, xs_list_len(wers)));
 
     xs_html *html = xs_html_tag("html",
         html_user_head(user, NULL, NULL),
@@ -3869,6 +4002,8 @@ xs_str *html_people_one(snac *user, const char *actor, const xs_list *list,
     xs_list *p = (xs_list *)list;
     const char *v;
 
+    enqueue_actor_refresh(user, actor, 0);
+
     if (xs_is_true(xs_dict_get(srv_config, "proxy_media")))
         proxy = user->actor;
 
@@ -3880,7 +4015,7 @@ xs_str *html_people_one(snac *user, const char *actor, const xs_list *list,
     xs *foll = xs_list_append(xs_list_new(), actor);
 
     xs_html_add(lists,
-        html_people_list(user, foll, L("Contact's posts"), "p", proxy));
+        html_people_list(user, foll, L("Contact's posts"), "p", proxy, -1));
 
     xs_html_add(body, lists);
 
@@ -3963,6 +4098,32 @@ xs_str *html_people_one(snac *user, const char *actor, const xs_list *list,
     return xs_html_render_s(html, "<!DOCTYPE html>\n");
 }
 
+void notify_filter(snac *user, const xs_dict *p_vars)
+/* sets filter for notifications */
+{
+    const char *v;
+    int likes_on  = (v = xs_dict_get(p_vars, "likes_on")) ? strcmp(v, "on") == 0 : 0;
+    int reacts_on = (v = xs_dict_get(p_vars, "reacts_on")) ? strcmp(v, "on") == 0 : 0;
+    int ments_on  = (v = xs_dict_get(p_vars, "mentions_on")) ? strcmp(v, "on") == 0 : 0;
+    int ann_on    = (v = xs_dict_get(p_vars, "announces_on")) ? strcmp(v, "on") == 0 : 0;
+    int foll_on   = (v = xs_dict_get(p_vars, "follows_on")) ? strcmp(v, "on") == 0 : 0;
+    int unfoll_on = (v = xs_dict_get(p_vars, "unfollows_on")) ? strcmp(v, "on") == 0 : 0;
+    int folreq_on = (v = xs_dict_get(p_vars, "folreqs_on")) ? strcmp(v, "on") == 0 : 0;
+    int blocks_on = (v = xs_dict_get(p_vars, "blocks_on")) ? strcmp(v, "on") == 0 : 0;
+    int polls_on  = (v = xs_dict_get(p_vars, "polls_on")) ? strcmp(v, "on") == 0 : 0;
+    xs_dict *filter = xs_dict_new();
+    filter = xs_dict_set(filter, "likes", xs_stock(likes_on ? XSTYPE_TRUE : XSTYPE_FALSE));
+    filter = xs_dict_set(filter, "reacts", xs_stock(reacts_on ? XSTYPE_TRUE : XSTYPE_FALSE));
+    filter = xs_dict_set(filter, "mentions", xs_stock(ments_on ? XSTYPE_TRUE : XSTYPE_FALSE));
+    filter = xs_dict_set(filter, "announces", xs_stock(ann_on ? XSTYPE_TRUE : XSTYPE_FALSE));
+    filter = xs_dict_set(filter, "follows", xs_stock(foll_on ? XSTYPE_TRUE : XSTYPE_FALSE));
+    filter = xs_dict_set(filter, "unfollows", xs_stock(unfoll_on ? XSTYPE_TRUE : XSTYPE_FALSE));
+    filter = xs_dict_set(filter, "folreqs", xs_stock(folreq_on ? XSTYPE_TRUE : XSTYPE_FALSE));
+    filter = xs_dict_set(filter, "blocks", xs_stock(blocks_on ? XSTYPE_TRUE : XSTYPE_FALSE));
+    filter = xs_dict_set(filter, "polls", xs_stock(polls_on ? XSTYPE_TRUE : XSTYPE_FALSE));
+    user->config = xs_dict_set(user->config, "notify_filter", filter);
+}
+
 xs_str *html_notifications(snac *user, int skip, int show)
 {
     const char *proxy = NULL;
@@ -3970,15 +4131,66 @@ xs_str *html_notifications(snac *user, int skip, int show)
     if (xs_is_true(xs_dict_get(srv_config, "proxy_media")))
         proxy = user->actor;
 
-    xs *n_list = notify_list(user, skip, show);
+    xs *n_list_unfilt = notify_list(user, skip, show);
     xs *n_time = notify_check_time(user, 0);
 
     xs_html *body = html_user_body(user, 0);
+    const xs_dict *n_filter = xs_dict_get(user->config, "notify_filter");
+    if (!n_filter) {
+        user->config = xs_dict_set(user->config, "notify_filter", xs_dict_new());
+        n_filter = xs_dict_get(user->config, "notify_filter");
+    }
+    xs *n_list = notify_filter_list(user, n_list_unfilt);
+    /* all filters are true by default */
+    const xs_val *n_def = xs_stock( XSTYPE_TRUE );
+    int n_likes_on  = xs_is_true(xs_dict_get_def(n_filter, "likes", n_def));
+    int n_reacts_on = xs_is_true(xs_dict_get_def(n_filter, "reacts", n_def));
+    int n_ments_on  = xs_is_true(xs_dict_get_def(n_filter, "mentions", n_def));
+    int n_ann_on    = xs_is_true(xs_dict_get_def(n_filter, "announces", n_def));
+    int n_fol_on    = xs_is_true(xs_dict_get_def(n_filter, "follows", n_def));
+    int n_unfol_on  = xs_is_true(xs_dict_get_def(n_filter, "unfollows", n_def));
+    int n_folreq_on = xs_is_true(xs_dict_get_def(n_filter, "folreqs", n_def));
+    int n_blocks_on = xs_is_true(xs_dict_get_def(n_filter, "blocks", n_def));
+    int n_polls_on  = xs_is_true(xs_dict_get_def(n_filter, "polls", n_def));
 
     xs_html *html = xs_html_tag("html",
         html_user_head(user, NULL, NULL),
         body);
 
+    xs *filter_notifs_action = xs_fmt("%s/admin/filter-notifications", user->actor);
+    xs_html *notifs_form = xs_html_tag("form",
+        xs_html_attr("autocomplete", "off"),
+        xs_html_attr("method",       "post"),
+        xs_html_attr("action",       filter_notifs_action),
+        xs_html_attr("enctype",      "multipart/form-data"),
+        xs_html_attr("id",           "filter"),
+        xs_html_sctag("input",
+            xs_html_attr("type",    "hidden"),
+            xs_html_attr("name",    "hard-redir"),
+            xs_html_attr("value",   xs_fmt("%s/notifications", user->actor))),
+        html_checkbox("likes_on", L("Likes"), n_likes_on),
+        html_checkbox("reacts_on", L("Emoji reacts"), n_reacts_on),
+        html_checkbox("mentions_on", L("Mentions"), n_ments_on),
+        html_checkbox("announces_on", L("Announces"), n_ann_on),
+        html_checkbox("follows_on", L("Follows"), n_fol_on),
+        html_checkbox("unfollows_on", L("Unfollows"), n_unfol_on),
+        html_checkbox("folreqs_on", L("Follow requests"), n_folreq_on),
+        html_checkbox("blocks_on", L("Blocks"), n_blocks_on),
+        html_checkbox("polls_on", L("Polls"), n_polls_on),
+        xs_html_sctag("input",
+            xs_html_attr("type",     "submit"),
+            xs_html_attr("class",    "button"),
+            xs_html_attr("value",    L("Save"))));
+
+    xs_html_add(body,
+        xs_html_tag("p",
+            xs_html_tag("div",
+                xs_html_attr("class", "snac-notify-filter"),
+                xs_html_tag("details",
+                    xs_html_tag("summary",
+                        xs_html_text(L("Notifications filter..."))),
+                    notifs_form))));
+
     xs *clear_all_action = xs_fmt("%s/admin/clear-notifications", user->actor);
 
     xs_html_add(body,
@@ -4053,6 +4265,14 @@ xs_str *html_notifications(snac *user, int skip, int show)
             enqueue_actor_refresh(user, actor_id, 0);
         }
 
+        const char *html_url = xs_dict_get_def(actor, "url", actor_id);
+
+        if (xs_is_list(html_url))
+            html_url = xs_list_get(html_url, 0);
+
+        if (!xs_is_string(html_url))
+            html_url = actor_id;
+
         xs *label_sanitized = sanitize(type);
         const char *label = label_sanitized;
 
@@ -4078,6 +4298,8 @@ xs_str *html_notifications(snac *user, int skip, int show)
                 isEmoji = 1;
 
             if (xs_type(content) == XSTYPE_STRING) {
+                if (!isEmoji && !n_likes_on)
+                    continue;
                 xs *emoji = replace_shortnames(xs_dup(content), xs_dict_get_path(noti, "msg.tag"), 1, proxy);
                 wrk = xs_fmt("%s (%s&#xFE0F;)", isEmoji ? "EmojiReact" : "Like", emoji);
                 label = wrk;
@@ -4087,14 +4309,14 @@ xs_str *html_notifications(snac *user, int skip, int show)
         if (strcmp(type, "Follow") == 0 && pending_check(user, actor_id))
             label = L("Follow Request");
 
-        xs *s_date = xs_crop_i(xs_dup(date), 0, 10);
+        xs *s_date = html_date_label(user, date);
 
         xs_html *this_html_label = xs_html_container(
                 xs_html_tag("b",
                     xs_html_raw(label),
                     xs_html_text(" by "),
                     xs_html_tag("a",
-                        xs_html_attr("href", actor_id),
+                        xs_html_attr("href", html_url),
                         xs_html_raw(a_name))), /* a_name is already sanitized */
                 xs_html_text(" "),
                 xs_html_tag("time",
@@ -4534,7 +4756,7 @@ int html_get_handler(const xs_dict *req, const char *q_path,
 
                             xs *title = xs_fmt(L("Search results for account %s"), q);
 
-                            page = html_people_list(&snac, l, title, "wf", NULL);
+                            page = html_people_list(&snac, l, title, "wf", NULL, 1);
                         }
                     }
 
@@ -5243,6 +5465,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
                 if (valid_status(object_get(edit_id, &p_msg))) {
                     /* copy relevant fields from previous version */
                     char *fields[] = { "id", "context", "url",
+                                       "cc", "attributedTo",
                                        "to", "inReplyTo", NULL };
                     int n;
 
@@ -5685,6 +5908,12 @@ int html_post_handler(const xs_dict *req, const char *q_path,
         status = HTTP_STATUS_SEE_OTHER;
     }
     else
+    if (p_path && strcmp(p_path, "admin/filter-notifications") == 0) { /** **/
+        notify_filter(&snac, p_vars);
+        user_persist(&snac, 0);
+        status = HTTP_STATUS_SEE_OTHER;
+    }
+    else
     if (p_path && strcmp(p_path, "admin/clear-notifications") == 0) { /** **/
         notify_clear(&snac);
         timeline_touch(&snac);
@@ -5813,6 +6042,33 @@ int html_post_handler(const xs_dict *req, const char *q_path,
 
         status = HTTP_STATUS_SEE_OTHER;
     }
+    else
+    if (p_path && strcmp(p_path, "admin/muted-words") == 0) {
+        const char *words = xs_dict_get(p_vars, "muted_words");
+
+        if (xs_is_string(words)) {
+            xs *new_words = xs_list_new();
+            xs *l = xs_split(words, "\n");
+            const char *v;
+
+            xs_list_foreach(l, v) {
+                xs *s1 = xs_strip_i(xs_dup(v));
+                s1 = xs_replace_i(s1, " ", "");
+
+                if (*s1 == '\0')
+                    continue;
+
+                xs *s2 = xs_utf8_to_lower(s1);
+
+                new_words = xs_list_insert_sorted(new_words, s2);
+            }
+
+            snac.config = xs_dict_set(snac.config, "muted_words", new_words);
+            user_persist(&snac, 0);
+        }
+
+        status = HTTP_STATUS_SEE_OTHER;
+    }
 
     if (status == HTTP_STATUS_SEE_OTHER) {
         const char *hard_redir = xs_dict_get(p_vars, "hard-redir");