diff options
| author | Oliver <zen@noreply.codeberg.org> | 2025-03-21 17:14:58 +0000 |
|---|---|---|
| committer | Oliver <zen@noreply.codeberg.org> | 2025-03-21 17:14:58 +0000 |
| commit | 83c8218f71a7d901609f10df6612bf457c30f35a (patch) | |
| tree | a08b014ced2dd68b20e498195d4c2c6064225dab /activitypub.c | |
| parent | c9a6cb8bb0047a1976e390bb1f3e09e58d70b9f5 (diff) | |
| parent | d68d2f51df95dde970fbc8972c49276c52d5a7d6 (diff) | |
Merge pull request 'v2.74' (#4) from grunfink/snac2:master into master
Reviewed-on: https://codeberg.org/zen/snac2/pulls/4
Diffstat (limited to 'activitypub.c')
| -rw-r--r-- | activitypub.c | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/activitypub.c b/activitypub.c index c9f700f..c00c371 100644 --- a/activitypub.c +++ b/activitypub.c @@ -2180,25 +2180,32 @@ int process_input_message(snac *snac, const xs_dict *msg, const xs_dict *req) if (strcmp(type, "Undo") == 0) { /** **/ const char *id = xs_dict_get(object, "object"); - if (xs_type(object) != XSTYPE_DICT) + if (xs_type(object) != XSTYPE_DICT) { + snac_debug(snac, 1, xs_fmt("undo: overriding utype %s | %s | %s", + utype, id, actor)); utype = "Follow"; + } if (strcmp(utype, "Follow") == 0) { /** **/ - if (id && strcmp(id, snac->actor) != 0) + if (!id) { + snac_log(snac, xs_fmt("no id (msg.object.object) when " + "handling follow: %s", actor)); + return 1; + } + if (strcmp(id, snac->actor) != 0) snac_debug(snac, 1, xs_fmt("Undo + Follow from %s not for us (%s)", actor, id)); - else { - if (valid_status(follower_del(snac, actor))) { - snac_log(snac, xs_fmt("no longer following us %s", actor)); - do_notify = 1; - } - else - if (pending_check(snac, actor)) { - pending_del(snac, actor); - snac_log(snac, xs_fmt("cancelled pending follow from %s", actor)); - } - else - snac_log(snac, xs_fmt("error deleting follower %s", actor)); + else + if (valid_status(follower_del(snac, actor))) { + snac_log(snac, xs_fmt("no longer following us %s", actor)); + do_notify = 1; } + else + if (pending_check(snac, actor)) { + pending_del(snac, actor); + snac_log(snac, xs_fmt("cancelled pending follow from %s", actor)); + } + else + snac_log(snac, xs_fmt("error deleting follower %s", actor)); } else if (strcmp(utype, "Like") == 0 || strcmp(utype, "EmojiReact") == 0) { /** **/ |