From bebb2c7439ecdef0266f47dc4b05ab093259e63b Mon Sep 17 00:00:00 2001 From: Stefano Marinelli Date: Tue, 21 Oct 2025 12:29:56 +0200 Subject: Instead of comparing the output status with == 200, it's better to check using valid_status() --- activitypub.c | 6 +++--- mastoapi.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/activitypub.c b/activitypub.c index 117bbc9..2d53cbe 100644 --- a/activitypub.c +++ b/activitypub.c @@ -141,7 +141,7 @@ static xs_dict *actor_get_collections(snac *user, xs_dict *actor, int throttle) /* only fetch followers count if not already present */ if (xs_type(existing_followers) != XSTYPE_NUMBER && !xs_is_null(followers_url)) { xs *followers_coll = NULL; - if (activitypub_request(user, followers_url, &followers_coll) == 200) { + if (valid_status(activitypub_request(user, followers_url, &followers_coll))) { const xs_number *total = xs_dict_get(followers_coll, "totalItems"); if (xs_type(total) == XSTYPE_NUMBER) { xs *total_copy = xs_dup(total); @@ -156,7 +156,7 @@ static xs_dict *actor_get_collections(snac *user, xs_dict *actor, int throttle) /* only fetch following count if not already present */ if (xs_type(existing_following) != XSTYPE_NUMBER && !xs_is_null(following_url)) { xs *following_coll = NULL; - if (activitypub_request(user, following_url, &following_coll) == 200) { + if (valid_status(activitypub_request(user, following_url, &following_coll))) { const xs_number *total = xs_dict_get(following_coll, "totalItems"); if (xs_type(total) == XSTYPE_NUMBER) { xs *total_copy = xs_dup(total); @@ -171,7 +171,7 @@ static xs_dict *actor_get_collections(snac *user, xs_dict *actor, int throttle) /* only fetch statuses count if not already present */ if (xs_type(existing_statuses) != XSTYPE_NUMBER && !xs_is_null(outbox_url)) { xs *outbox_coll = NULL; - if (activitypub_request(user, outbox_url, &outbox_coll) == 200) { + if (valid_status(activitypub_request(user, outbox_url, &outbox_coll))) { const xs_number *total = xs_dict_get(outbox_coll, "totalItems"); if (xs_type(total) == XSTYPE_NUMBER) { xs *total_copy = xs_dup(total); diff --git a/mastoapi.c b/mastoapi.c index 119a715..94912f1 100644 --- a/mastoapi.c +++ b/mastoapi.c @@ -569,7 +569,7 @@ static const xs_list *get_collection_items(snac *snac, const char *collection_ur const xs_list *items = NULL; xs_dict *collection = NULL; - if (activitypub_request(snac, collection_url, &collection) == 200) { + if (valid_status(activitypub_request(snac, collection_url, &collection))) { /* check if items are directly embedded */ items = xs_dict_get(collection, "orderedItems"); if (xs_is_null(items)) @@ -586,7 +586,7 @@ static const xs_list *get_collection_items(snac *snac, const char *collection_ur const char *first_url = xs_dict_get(collection, "first"); if (!xs_is_null(first_url)) { xs_dict *first_page = NULL; - if (activitypub_request(snac, first_url, &first_page) == 200) { + if (valid_status(activitypub_request(snac, first_url, &first_page))) { items = xs_dict_get(first_page, "orderedItems"); if (xs_is_null(items)) items = xs_dict_get(first_page, "items"); -- cgit v1.2.3