commit 3e1944a

default  ·  2023-05-15 09:38:29 +0000 UTC
parent 40fa322
Deleted repeated code.
1 files changed,  +5, -4
+5, -4
 1@@ -500,23 +500,24 @@ xs_str *mastoapi_id(const xs_dict *msg)
 2 xs_dict *mastoapi_account(const xs_dict *actor)
 3 /* converts an ActivityPub actor to a Mastodon account */
 4 {
 5-    xs_dict *acct = xs_dict_new();
 6+    xs_dict *acct     = xs_dict_new();
 7+    const char *prefu = xs_dict_get(actor, "preferredUsername");
 8 
 9     const char *display_name = xs_dict_get(actor, "name");
10     if (xs_is_null(display_name) || *display_name == '\0')
11-        display_name = xs_dict_get(actor, "preferredUsername");
12+        display_name = prefu;
13 
14     const char *id  = xs_dict_get(actor, "id");
15     const char *pub = xs_dict_get(actor, "published");
16     xs *acct_md5 = xs_md5_hex(id, strlen(id));
17     acct = xs_dict_append(acct, "id",           acct_md5);
18-    acct = xs_dict_append(acct, "username",     xs_dict_get(actor, "preferredUsername"));
19+    acct = xs_dict_append(acct, "username",     prefu);
20     acct = xs_dict_append(acct, "display_name", display_name);
21 
22     {
23         /* create the acct field as user@host */
24         xs *l     = xs_split(id, "/");
25-        xs *fquid = xs_fmt("%s@%s", xs_dict_get(actor, "preferredUsername"), xs_list_get(l, 2));
26+        xs *fquid = xs_fmt("%s@%s", prefu, xs_list_get(l, 2));
27         acct      = xs_dict_append(acct, "acct", fquid);
28     }
29