1 files changed, 90 insertions, 10 deletions

diff --git a/data.c b/data.c
index 22ea7b0..1aac759 100644
--- a/data.c
+++ b/data.c
@@ -41,6 +41,20 @@ int srv_open(const char *basedir, int auto_upgrade)
     FILE *f;
     xs_str *error = NULL;
 
+    /* MUST be three letters */
+    months[0] = LL("Jan");
+    months[1] = LL("Feb");
+    months[2] = LL("Mar");
+    months[3] = LL("Apr");
+    months[4] = LL("May");
+    months[5] = LL("Jun");
+    months[6] = LL("Jul");
+    months[7] = LL("Aug");
+    months[8] = LL("Sep");
+    months[9] = LL("Oct");
+    months[10] = LL("Nov");
+    months[11] = LL("Dec");
+
     pthread_mutex_init(&data_mutex, NULL);
 
     srv_basedir = xs_str_new(basedir);
@@ -86,12 +100,12 @@ int srv_open(const char *basedir, int auto_upgrade)
 
                 if (auto_upgrade)
                     ret = snac_upgrade(&error);
-                else {
-                    if (xs_number_get(xs_dict_get(srv_config, "layout")) < disk_layout)
-                        error = xs_fmt("ERROR: disk layout changed - execute 'snac upgrade' first");
-                    else
-                        ret = 1;
-                }
+                else if (xs_number_get(xs_dict_get(srv_config, "layout")) < disk_layout)
+                    error = xs_fmt("ERROR: disk layout changed - execute 'snac upgrade' first");
+                else if (!check_strip_tool())
+                    error = xs_fmt("ERROR: strip_exif enabled but commands not found or working");
+                else
+                    ret = 1;
             }
 
         }
@@ -2368,9 +2382,9 @@ void tag_index(const char *id, const xs_dict *obj)
                 if (*name == '\0')
                     continue;
 
-                name = xs_utf8_to_lower((xs_str *)name);
+                xs* name_cased = xs_utf8_to_lower((xs_str *)name);
 
-                xs *md5_tag   = xs_md5_hex(name, strlen(name));
+                xs *md5_tag   = xs_md5_hex(name_cased, strlen(name_cased));
                 xs *tag_dir   = xs_fmt("%s/%c%c", g_tag_dir, md5_tag[0], md5_tag[1]);
                 mkdirx(tag_dir);
 
@@ -2382,7 +2396,7 @@ void tag_index(const char *id, const xs_dict *obj)
                 FILE *f;
                 xs *g_tag_name = xs_replace(g_tag_idx, ".idx", ".tag");
                 if ((f = fopen(g_tag_name, "w")) != NULL) {
-                    fprintf(f, "%s\n", name);
+                    fprintf(f, "%s\n", name_cased);
                     fclose(f);
                 }
 
@@ -2710,6 +2724,8 @@ void static_put(snac *snac, const char *id, const char *data, int size)
     if (fn && (f = fopen(fn, "wb")) != NULL) {
         fwrite(data, size, 1, f);
         fclose(f);
+
+        strip_media(fn);
     }
 }
 
@@ -3494,11 +3510,75 @@ xs_list *notify_list(snac *snac, int skip, int show)
 }
 
 
+xs_list *notify_filter_list(snac *snac, xs_list *notifs)
+/* apply user-defined notification filter to IDs */
+{
+    const xs_dict *n_filter = xs_dict_get(snac->config, "notify_filter");
+    if (!n_filter) {
+        return xs_dup(notifs);
+    }
+    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));
+
+    const xs_str *v;
+    xs_list *flt = xs_list_new();
+
+    xs_list_foreach(notifs, v) {
+        xs *noti = notify_get(snac, v);
+
+        if (noti == NULL)
+            continue;
+
+        const char *type  = xs_dict_get(noti, "type");
+        const char *utype = xs_dict_get(noti, "utype");
+        const char *actor_id = xs_dict_get(noti, "actor");
+        if (strcmp(type, "EmojiReact") == 0 && xs_is_true(xs_dict_get(srv_config, "disable_emojireact")))
+            continue;
+        if (strcmp(type, "Create") == 0 && !n_ments_on)
+            continue;
+        if (strcmp(type, "Update") == 0 && strcmp(utype, "Question") == 0 && !n_polls_on)
+            continue;
+        if (strcmp(type, "Undo") == 0 && strcmp(utype, "Follow") == 0 && !n_unfol_on)
+            continue;
+        if (strcmp(type, "EmojiReact") == 0 || strcmp(type, "Like") == 0) {
+            if (strcmp(type, "Like") == 0 && !n_likes_on)
+                continue;
+            if (strcmp(type, "EmojiReact") == 0 && !n_reacts_on)
+                continue;
+        }
+        if (strcmp(type, "Follow") == 0) {
+            if (pending_check(snac, actor_id)) {
+                if (!n_folreq_on)
+                    continue;
+            }
+            else
+            if (!n_fol_on)
+                continue;
+        }
+        if (strcmp(type, "Block") == 0 && !n_blocks_on)
+            continue;
+        if (strcmp(type, "Announce") == 0 && !n_ann_on)
+            continue;
+        flt = xs_list_append(flt, v);
+    }
+    return flt;
+}
+
+
 int notify_new_num(snac *snac)
 /* counts the number of new notifications */
 {
     xs *t = notify_check_time(snac, 0);
-    xs *lst = notify_list(snac, 0, XS_ALL);
+    xs *lst_unfilt = notify_list(snac, 0, XS_ALL);
+    xs *lst = notify_filter_list(snac, lst_unfilt);
     int cnt = 0;
 
     xs_list *p = lst;