commit 836b663

Use webfinger_request_fake() in export_csv().

 1@@ -605,13 +605,9 @@ void export_csv(snac *user)
 2 
 3         xs_list_foreach(l, actor) {
 4             xs *uid = NULL;
 5-            int status;
 6 
 7-            if (valid_status((status = webfinger_request(actor, NULL, &uid)))) {
 8-                fprintf(f, "%s\n", uid);
 9-            }
10-            else
11-                snac_log(user, xs_fmt("Error resolving muted user %s %d", actor, status));
12+            webfinger_request_fake(actor, NULL, &uid);
13+            fprintf(f, "%s\n", uid);
14         }
15 
16         fclose(f);
17@@ -639,12 +635,9 @@ void export_csv(snac *user)
18                 if (valid_status(object_get_by_md5(md5, &actor))) {
19                     const char *id = xs_dict_get(actor, "id");
20                     xs *uid = NULL;
21-                    int status;
22 
23-                    if (valid_status((status = webfinger_request(id, NULL, &uid))))
24-                        fprintf(f, "%s,%s\n", ltitle, uid);
25-                    else
26-                        snac_log(user, xs_fmt("Error resolving list member %s %d", id, status));
27+                    webfinger_request_fake(id, NULL, &uid);
28+                    fprintf(f, "%s,%s\n", ltitle, uid);
29                 }
30             }
31         }
32@@ -665,13 +658,9 @@ void export_csv(snac *user)
33 
34         xs_list_foreach(fwing, actor) {
35             xs *uid = NULL;
36-            int status;
37 
38-            if (valid_status((status = webfinger_request(actor, NULL, &uid)))) {
39-                fprintf(f, "%s,%s,false,\n", uid, limited(user, actor, 0) ? "false" : "true");
40-            }
41-            else
42-                snac_log(user, xs_fmt("Error resolving followed account %s %d", actor, status));
43+            webfinger_request_fake(actor, NULL, &uid);
44+            fprintf(f, "%s,%s,false,\n", uid, limited(user, actor, 0) ? "false" : "true");
45         }
46 
47         fclose(f);

 1@@ -133,9 +133,11 @@ int webfinger_request_fake(const char *qs, xs_str **actor, xs_str **user)
 2         if (xs_startswith(qs, "https:/") || xs_startswith(qs, "http:/")) {
 3             xs *l = xs_split(qs, "/");
 4 
 5-            /* i'll end up in hell for this */
 6-            *user = xs_fmt("%s@%s", xs_list_get(l, 2), xs_list_get(l, -1));
 7-            status = HTTP_STATUS_RESET_CONTENT;
 8+            if (xs_list_len(l) > 3) {
 9+                /* i'll end up in hell for this */
10+                *user = xs_fmt("%s@%s", xs_list_get(l, -1), xs_list_get(l, 2));
11+                status = HTTP_STATUS_RESET_CONTENT;
12+            }
13         }
14     }
15