From 16be9e975b495c43035cda4e82ead2cb5374f700 Mon Sep 17 00:00:00 2001 From: Jeremy Kescher Date: Thu, 18 Jan 2024 19:39:59 +0100 Subject: [PATCH] Remove local account check in like and emoji_react inbound activity handling --- README.md | 3 ++- app/lib/activitypub/activity/emoji_react.rb | 4 +--- app/lib/activitypub/activity/like.rb | 2 +- lib/mastodon/version.rb | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a0095dd93e..48ef5f0b9a 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,8 @@ instead, use merge (fast-forward, if possible, with merge commit otherwise). - Allow posting polls with only one poll option (if `MIN_POLL_OPTIONS` is set to 1 on your instance). - Added oatstodon flavour (taken from [types.pl fork](https://github.com/ralsei/types.pl), by [@oat@hellsite.site](https://hellsite.site/@oat)) - Emoji reactions on statuses (with both Unicode and custom emojis, same as for announcements), a feature originally developed for [Nyastodon](https://git.bsd.gay/fef/nyastodon). - Ended up as a Catstodon-maintained patch after its initial two Pull Requests to glitch-soc, and is now pending [its third attempt of merging into glitch-soc](https://github.com/glitch-soc/mastodon/pull/2221). + Ended up as a Catstodon-maintained patch after its initial two Pull Requests to glitch-soc, but was handed over to [Essem's fork, Chuckya](https://github.com/TheEssem/mastodon) and is now pending [its fourth attempt of merging into glitch-soc](https://github.com/glitch-soc/mastodon/pull/2462). +- Lifts the "only federate local favourites" restriction on favourites/likes and emoji reactions. ## Previous differences now merged into glitch-soc diff --git a/app/lib/activitypub/activity/emoji_react.rb b/app/lib/activitypub/activity/emoji_react.rb index c9d88bc51c..cd70d021ca 100644 --- a/app/lib/activitypub/activity/emoji_react.rb +++ b/app/lib/activitypub/activity/emoji_react.rb @@ -4,9 +4,7 @@ class ActivityPub::Activity::EmojiReact < ActivityPub::Activity def perform original_status = status_from_uri(object_uri) name = @json['content'] - return if original_status.nil? || - !original_status.account.local? || - delete_arrived_first?(@json['id']) + return if original_status.nil? || delete_arrived_first?(@json['id']) if /^:.*:$/.match?(name) name.delete! ':' diff --git a/app/lib/activitypub/activity/like.rb b/app/lib/activitypub/activity/like.rb index 0063820825..b0f8d7ba09 100644 --- a/app/lib/activitypub/activity/like.rb +++ b/app/lib/activitypub/activity/like.rb @@ -3,7 +3,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity def perform original_status = status_from_uri(object_uri) - return if original_status.nil? || !original_status.account.local? || delete_arrived_first?(@json['id']) + return if original_status.nil? || delete_arrived_first?(@json['id']) return if maybe_process_embedded_reaction diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 3b50dfdaa4..1b564e3775 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -25,7 +25,7 @@ module Mastodon end def catstodon_revision - '1.0.10' + '1.0.11' end def build_metadata