diff options
| author | 2023-05-15 11:38:29 +0200 | |
|---|---|---|
| committer | 2023-05-15 11:38:29 +0200 | |
| commit | 3e1944abbfcdec47469d6fad162ea8533d0ad5b8 (patch) | |
| tree | 50772dab45e52077f675d0ab7feaa0877b9b660a /mastoapi.c | |
| parent | mastoapi_account() returns the acct field as user@host. (diff) | |
| download | snac2-3e1944abbfcdec47469d6fad162ea8533d0ad5b8.tar.gz snac2-3e1944abbfcdec47469d6fad162ea8533d0ad5b8.tar.xz snac2-3e1944abbfcdec47469d6fad162ea8533d0ad5b8.zip | |
Deleted repeated code.
Diffstat (limited to 'mastoapi.c')
| -rw-r--r-- | mastoapi.c | 9 |
1 files changed, 5 insertions, 4 deletions
| @@ -500,23 +500,24 @@ xs_str *mastoapi_id(const xs_dict *msg) | |||
| 500 | xs_dict *mastoapi_account(const xs_dict *actor) | 500 | xs_dict *mastoapi_account(const xs_dict *actor) |
| 501 | /* converts an ActivityPub actor to a Mastodon account */ | 501 | /* converts an ActivityPub actor to a Mastodon account */ |
| 502 | { | 502 | { |
| 503 | xs_dict *acct = xs_dict_new(); | 503 | xs_dict *acct = xs_dict_new(); |
| 504 | const char *prefu = xs_dict_get(actor, "preferredUsername"); | ||
| 504 | 505 | ||
| 505 | const char *display_name = xs_dict_get(actor, "name"); | 506 | const char *display_name = xs_dict_get(actor, "name"); |
| 506 | if (xs_is_null(display_name) || *display_name == '\0') | 507 | if (xs_is_null(display_name) || *display_name == '\0') |
| 507 | display_name = xs_dict_get(actor, "preferredUsername"); | 508 | display_name = prefu; |
| 508 | 509 | ||
| 509 | const char *id = xs_dict_get(actor, "id"); | 510 | const char *id = xs_dict_get(actor, "id"); |
| 510 | const char *pub = xs_dict_get(actor, "published"); | 511 | const char *pub = xs_dict_get(actor, "published"); |
| 511 | xs *acct_md5 = xs_md5_hex(id, strlen(id)); | 512 | xs *acct_md5 = xs_md5_hex(id, strlen(id)); |
| 512 | acct = xs_dict_append(acct, "id", acct_md5); | 513 | acct = xs_dict_append(acct, "id", acct_md5); |
| 513 | acct = xs_dict_append(acct, "username", xs_dict_get(actor, "preferredUsername")); | 514 | acct = xs_dict_append(acct, "username", prefu); |
| 514 | acct = xs_dict_append(acct, "display_name", display_name); | 515 | acct = xs_dict_append(acct, "display_name", display_name); |
| 515 | 516 | ||
| 516 | { | 517 | { |
| 517 | /* create the acct field as user@host */ | 518 | /* create the acct field as user@host */ |
| 518 | xs *l = xs_split(id, "/"); | 519 | xs *l = xs_split(id, "/"); |
| 519 | xs *fquid = xs_fmt("%s@%s", xs_dict_get(actor, "preferredUsername"), xs_list_get(l, 2)); | 520 | xs *fquid = xs_fmt("%s@%s", prefu, xs_list_get(l, 2)); |
| 520 | acct = xs_dict_append(acct, "acct", fquid); | 521 | acct = xs_dict_append(acct, "acct", fquid); |
| 521 | } | 522 | } |
| 522 | 523 | ||