1 files changed, 17 insertions, 0 deletions

diff --git a/data.c b/data.c
index eb4c9d5..0fd3528 100644
--- a/data.c
+++ b/data.c
@@ -136,6 +136,18 @@ int srv_open(const char *basedir, int auto_upgrade)
         srv_proxy_token_seed = xs_hex_enc(rnd, sizeof(rnd));
     }
 
+    /* ensure user directories include important subdirectories */
+    xs *users = user_list();
+    const char *uid;
+
+    xs_list_foreach(users, uid) {
+        xs *impdir = xs_fmt("%s/user/%s/import", srv_basedir, uid);
+        xs *expdir = xs_fmt("%s/user/%s/export", srv_basedir, uid);
+
+        mkdirx(impdir);
+        mkdirx(expdir);
+    }
+
     return ret;
 }
 
@@ -2705,6 +2717,11 @@ xs_list *content_search(snac *user, const char *regex,
         if (id == NULL || is_hidden(user, id))
             continue;
 
+        /* recalculate the md5 id to be sure it's not repeated
+           (it may have been searched by the "url" field instead of "id") */
+        xs *new_md5 = xs_md5_hex(id, strlen(id));
+        md5 = new_md5;
+
         /* test for the post URL */
         if (strcmp(id, regex) == 0) {
             if (xs_set_add(&seen, md5) == 1)