commit a0d1d13

Changed some migration terminology.

 1@@ -1242,7 +1242,7 @@ xs_dict *msg_actor(snac *snac)
 2     }
 3 
 4     /* does this user have an aka? */
 5-    const char *aka = xs_dict_get(snac->config, "aka");
 6+    const char *aka = xs_dict_get(snac->config, "alias");
 7     if (xs_type(aka) == XSTYPE_STRING && *aka) {
 8         xs *loaka = xs_list_append(xs_list_new(), aka);
 9 
10@@ -2669,10 +2669,10 @@ int process_queue(void)
11 int migrate_account(snac *user)
12 /* migrates this account to a new one (stored in the 'aka' user field) */
13 {
14-    const char *new_account = xs_dict_get(user->config, "aka");
15+    const char *new_account = xs_dict_get(user->config, "alias");
16 
17     if (xs_type(new_account) != XSTYPE_STRING) {
18-        snac_log(user, xs_fmt("Cannot migrate: 'aka' (new account) not defined"));
19+        snac_log(user, xs_fmt("Cannot migrate: alias (destination account) not set"));
20         return 1;
21     }
22 

 1@@ -25,7 +25,7 @@ int usage(void)
 2     printf("httpd {basedir}                      Starts the HTTPD daemon\n");
 3     printf("purge {basedir}                      Purges old data\n");
 4     printf("state {basedir}                      Prints server state\n");
 5-    printf("webfinger {basedir} {actor}          Queries about an actor (@user@host or actor url)\n");
 6+    printf("webfinger {basedir} {account}        Queries about an account (@user@host or actor url)\n");
 7     printf("queue {basedir} {uid}                Processes a user queue\n");
 8     printf("follow {basedir} {uid} {actor}       Follows an actor\n");
 9     printf("unfollow {basedir} {uid} {actor}     Unfollows an actor\n");
10@@ -36,7 +36,7 @@ int usage(void)
11     printf("unboost {basedir} {uid} {url}        Unboosts a post\n");
12     printf("resetpwd {basedir} {uid}             Resets the password of a user\n");
13     printf("ping {basedir} {uid} {actor}         Pings an actor\n");
14-    printf("webfinger_s {basedir} {uid} {actor}  Queries about an actor (@user@host or actor url)\n");
15+    printf("webfinger_s {basedir} {uid} {account} Queries about an account (@user@host or actor url)\n");
16     printf("pin {basedir} {uid} {msg_url}        Pins a message\n");
17     printf("unpin {basedir} {uid} {msg_url}      Unpins a message\n");
18     printf("bookmark {basedir} {uid} {msg_url}   Bookmarks a message\n");
19@@ -47,9 +47,9 @@ int usage(void)
20     printf("unlimit {basedir} {uid} {actor}      Unlimits an actor\n");
21     printf("verify_links {basedir} {uid}         Verifies a user's links (in the metadata)\n");
22     printf("search {basedir} {uid} {regex}       Searches posts by content\n");
23-    printf("aka {basedir} {uid} {actor}          Sets actor (@user@host or url) as the a.k.a.\n");
24+    printf("alias {basedir} {uid} {account}      Sets account (@user@host or actor url) as an alias\n");
25     printf("export_csv {basedir} {uid}           Exports data as CSV files into current directory\n");
26-    printf("migrate {basedir} {uid}              Migrates the account to the one set as the a.k.a.\n");
27+    printf("migrate {basedir} {uid}              Migrates to the account defined as the alias\n");
28 
29     return 1;
30 }
31@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
32     if ((url = GET_ARGV()) == NULL)
33         return usage();
34 
35-    if (strcmp(cmd, "aka") == 0) { /** **/
36+    if (strcmp(cmd, "alias") == 0) { /** **/
37         xs *actor = NULL;
38         xs *uid = NULL;
39         int status = HTTP_STATUS_OK;
40@@ -292,7 +292,7 @@ int main(int argc, char *argv[])
41             status = webfinger_request(url, &actor, &uid);
42 
43         if (valid_status(status)) {
44-            snac.config = xs_dict_set(snac.config, "aka", actor);
45+            snac.config = xs_dict_set(snac.config, "alias", actor);
46 
47             user_persist(&snac, 1);
48         }