summaryrefslogtreecommitdiff
path: root/mastoapi.c
diff options
context:
space:
mode:
Diffstat (limited to 'mastoapi.c')
-rw-r--r--mastoapi.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/mastoapi.c b/mastoapi.c
index d8f6ccc..a81e86e 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -494,16 +494,20 @@ xs_str *mastoapi_id(const xs_dict *msg)
xs_dict *mastoapi_account(const xs_dict *actor)
/* converts an ActivityPub actor to a Mastodon account */
{
- xs_dict *acct = xs_dict_new();
+ const char *id = xs_dict_get(actor, "id");
+ const char *pub = xs_dict_get(actor, "published");
+
+ if (xs_type(id) != XSTYPE_STRING)
+ return NULL;
+
const char *prefu = xs_dict_get(actor, "preferredUsername");
const char *display_name = xs_dict_get(actor, "name");
if (xs_is_null(display_name) || *display_name == '\0')
display_name = prefu;
- const char *id = xs_dict_get(actor, "id");
- const char *pub = xs_dict_get(actor, "published");
- xs *acct_md5 = xs_md5_hex(id, strlen(id));
+ xs_dict *acct = xs_dict_new();
+ xs *acct_md5 = xs_md5_hex(id, strlen(id));
acct = xs_dict_append(acct, "id", acct_md5);
acct = xs_dict_append(acct, "username", prefu);
acct = xs_dict_append(acct, "display_name", display_name);
@@ -711,6 +715,8 @@ xs_dict *mastoapi_status(snac *snac, const xs_dict *msg)
return NULL;
xs *acct = mastoapi_account(actor);
+ if (acct == NULL)
+ return NULL;
xs *idx = NULL;
xs *ixc = NULL;