1 files changed, 43 insertions, 12 deletions

diff --git a/utils.c b/utils.c
index df3b55d..0740d4d 100644
--- a/utils.c
+++ b/utils.c
@@ -446,7 +446,8 @@ int deluser(snac *user)
 void verify_links(snac *user)
 /* verifies a user's links */
 {
-    const xs_dict *p = xs_dict_get(user->config, "metadata");
+    xs *metadata = NULL;
+    const xs_dict *md = xs_dict_get(user->config, "metadata");
     const char *k, *v;
     int changed = 0;
 
@@ -454,8 +455,30 @@ void verify_links(snac *user)
     headers = xs_dict_append(headers, "accept", "text/html");
     headers = xs_dict_append(headers, "user-agent", USER_AGENT " (link verify)");
 
+    if (xs_type(md) == XSTYPE_DICT)
+        metadata = xs_dup(md);
+    else
+    if (xs_type(md) == XSTYPE_STRING) {
+        /* convert to dict for easier iteration */
+        metadata = xs_dict_new();
+        xs *l = xs_split(md, "\n");
+        const char *ll;
+
+        xs_list_foreach(l, ll) {
+            xs *kv = xs_split_n(ll, "=", 1);
+            const char *k = xs_list_get(kv, 0);
+            const char *v = xs_list_get(kv, 1);
+
+            if (k && v) {
+                xs *kk = xs_strip_i(xs_dup(k));
+                xs *vv = xs_strip_i(xs_dup(v));
+                metadata = xs_dict_set(metadata, kk, vv);
+            }
+        }
+    }
+
     int c = 0;
-    while (p && xs_dict_next(p, &k, &v, &c)) {
+    while (metadata && xs_dict_next(metadata, &k, &v, &c)) {
         /* not an https link? skip */
         if (!xs_startswith(v, "https:/" "/"))
             continue;
@@ -571,9 +594,9 @@ void export_csv(snac *user)
 /* exports user data to current directory in a way that pleases Mastodon */
 {
     FILE *f;
-    const char *fn;
+    xs *fn = NULL;
 
-    fn = "bookmarks.csv";
+    fn = xs_fmt("%s/export/bookmarks.csv", user->basedir);
     if ((f = fopen(fn, "w")) != NULL) {
         snac_log(user, xs_fmt("Creating %s...", fn));
 
@@ -596,7 +619,8 @@ void export_csv(snac *user)
     else
         snac_log(user, xs_fmt("Cannot create file %s", fn));
 
-    fn = "blocked_accounts.csv";
+    xs_free(fn);
+    fn = xs_fmt("%s/export/blocked_accounts.csv", user->basedir);
     if ((f = fopen(fn, "w")) != NULL) {
         snac_log(user, xs_fmt("Creating %s...", fn));
 
@@ -615,7 +639,8 @@ void export_csv(snac *user)
     else
         snac_log(user, xs_fmt("Cannot create file %s", fn));
 
-    fn = "lists.csv";
+    xs_free(fn);
+    fn = xs_fmt("%s/export/lists.csv", user->basedir);
     if ((f = fopen(fn, "w")) != NULL) {
         snac_log(user, xs_fmt("Creating %s...", fn));
 
@@ -647,7 +672,8 @@ void export_csv(snac *user)
     else
         snac_log(user, xs_fmt("Cannot create file %s", fn));
 
-    fn = "following_accounts.csv";
+    xs_free(fn);
+    fn = xs_fmt("%s/export/following_accounts.csv", user->basedir);
     if ((f = fopen(fn, "w")) != NULL) {
         snac_log(user, xs_fmt("Creating %s...", fn));
 
@@ -670,10 +696,12 @@ void export_csv(snac *user)
 }
 
 
-void import_blocked_accounts_csv(snac *user, const char *fn)
+void import_blocked_accounts_csv(snac *user, const char *ifn)
 /* imports a Mastodon CSV file of blocked accounts */
 {
     FILE *f;
+    xs *l = xs_split(ifn, "/");
+    xs *fn = xs_fmt("%s/import/%s", user->basedir, xs_list_get(l, -1));
 
     if ((f = fopen(fn, "r")) != NULL) {
         snac_log(user, xs_fmt("Importing from %s...", fn));
@@ -705,10 +733,12 @@ void import_blocked_accounts_csv(snac *user, const char *fn)
 }
 
 
-void import_following_accounts_csv(snac *user, const char *fn)
+void import_following_accounts_csv(snac *user, const char *ifn)
 /* imports a Mastodon CSV file of accounts to follow */
 {
     FILE *f;
+    xs *l = xs_split(ifn, "/");
+    xs *fn = xs_fmt("%s/import/%s", user->basedir, xs_list_get(l, -1));
 
     if ((f = fopen(fn, "r")) != NULL) {
         snac_log(user, xs_fmt("Importing from %s...", fn));
@@ -764,10 +794,12 @@ void import_following_accounts_csv(snac *user, const char *fn)
 }
 
 
-void import_list_csv(snac *user, const char *fn)
+void import_list_csv(snac *user, const char *ifn)
 /* imports a Mastodon CSV file list */
 {
     FILE *f;
+    xs *l = xs_split(ifn, "/");
+    xs *fn = xs_fmt("%s/import/%s", user->basedir, xs_list_get(l, -1));
 
     if ((f = fopen(fn, "r")) != NULL) {
         snac_log(user, xs_fmt("Importing from %s...", fn));
@@ -825,7 +857,6 @@ void import_csv(snac *user)
 /* import CSV files from Mastodon */
 {
     FILE *f;
-    const char *fn;
 
     import_blocked_accounts_csv(user, "blocked_accounts.csv");
 
@@ -833,7 +864,7 @@ void import_csv(snac *user)
 
     import_list_csv(user, "lists.csv");
 
-    fn = "bookmarks.csv";
+    xs *fn = xs_fmt("%s/import/bookmarks.csv", user->basedir);
     if ((f = fopen(fn, "r")) != NULL) {
         snac_log(user, xs_fmt("Importing from %s...", fn));