1 files changed, 13 insertions, 6 deletions

diff --git a/html.c b/html.c
index dda387a..b7461c1 100644
--- a/html.c
+++ b/html.c
@@ -1451,6 +1451,7 @@ xs_html *html_checkbox(const char *form_name, const char *label, int flag)
         xs_html_sctag("input",
             xs_html_attr("type",     "checkbox"),
             xs_html_attr("name",     form_name),
+            xs_html_attr("id",       form_name),
             xs_html_attr(flag ? "checked" : "", NULL)),
         xs_html_tag("label",
             xs_html_attr("for", form_name),
@@ -2801,10 +2802,12 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
             xs *quoted_post = NULL;
 
             if (valid_status(object_get(quoted_id, &quoted_post))) {
+                xs *md5 = xs_md5_hex(quoted_id, strlen(quoted_id));
+
                 xs_html_add(snac_content,
                     xs_html_tag("blockquote",
                         xs_html_attr("class", "snac-quoted-post"),
-                        html_entry(user, quoted_post, 1, level + 1, NULL, 1)));
+                        html_entry(user, quoted_post, 1, level + 1, md5, 1)));
             }
             else
             if (user)
@@ -3149,7 +3152,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
             else
             if (!xs_is_null(latitude) && !xs_is_null(longitude)) {
                 xs *url = xs_fmt("https://openstreetmap.org/search/?query=%s,%s",
-                    xs_number_str(latitude), xs_number_str(longitude));
+                    xs_or(xs_number_str(latitude), latitude), xs_or(xs_number_str(longitude), longitude));
 
                 xs_html_add(snac_content_wrap,
                     xs_html_tag("p",
@@ -4111,7 +4114,7 @@ void notify_filter(snac *user, const xs_dict *p_vars)
     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();
+    xs *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));
@@ -4122,6 +4125,7 @@ void notify_filter(snac *user, const xs_dict *p_vars)
     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);
+    user->tz = xs_dict_get_def(user->config, "tz", "UTC"); // previous line invalidates user->tz
 }
 
 xs_str *html_notifications(snac *user, int skip, int show)
@@ -4137,7 +4141,9 @@ xs_str *html_notifications(snac *user, int skip, int show)
     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());
+        xs *filter = xs_dict_new();
+        user->config = xs_dict_set(user->config, "notify_filter", filter);
+        user->tz = xs_dict_get_def(user->config, "tz", "UTC"); // previous line invalidates user->tz
         n_filter = xs_dict_get(user->config, "notify_filter");
     }
     xs *n_list = notify_filter_list(user, n_list_unfilt);
@@ -4158,6 +4164,7 @@ xs_str *html_notifications(snac *user, int skip, int show)
         body);
 
     xs *filter_notifs_action = xs_fmt("%s/admin/filter-notifications", user->actor);
+    xs *notifs_action = xs_fmt("%s/notifications", user->actor);
     xs_html *notifs_form = xs_html_tag("form",
         xs_html_attr("autocomplete", "off"),
         xs_html_attr("method",       "post"),
@@ -4167,7 +4174,7 @@ xs_str *html_notifications(snac *user, int skip, int show)
         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))),
+            xs_html_attr("value",   notifs_action)),
         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),
@@ -5568,7 +5575,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
 
             eid = xs_strip_chars_i(eid, ":");
 
-            const xs_dict *ret = msg_emoji_init(&snac, id, eid);
+            xs *ret = msg_emoji_init(&snac, id, eid);
             /* fails if either invalid or already reacted */
             if (!ret)
                 ret = msg_emoji_unreact(&snac, id, eid);