mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2025-01-23 14:24:09 +01:00
Remove local account check in like and emoji_react inbound activity handling
This commit is contained in:
parent
7b63fd98c2
commit
16be9e975b
4 changed files with 5 additions and 6 deletions
|
@ -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).
|
- 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))
|
- 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).
|
- 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
|
## Previous differences now merged into glitch-soc
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,7 @@ class ActivityPub::Activity::EmojiReact < ActivityPub::Activity
|
||||||
def perform
|
def perform
|
||||||
original_status = status_from_uri(object_uri)
|
original_status = status_from_uri(object_uri)
|
||||||
name = @json['content']
|
name = @json['content']
|
||||||
return if original_status.nil? ||
|
return if original_status.nil? || delete_arrived_first?(@json['id'])
|
||||||
!original_status.account.local? ||
|
|
||||||
delete_arrived_first?(@json['id'])
|
|
||||||
|
|
||||||
if /^:.*:$/.match?(name)
|
if /^:.*:$/.match?(name)
|
||||||
name.delete! ':'
|
name.delete! ':'
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
class ActivityPub::Activity::Like < ActivityPub::Activity
|
class ActivityPub::Activity::Like < ActivityPub::Activity
|
||||||
def perform
|
def perform
|
||||||
original_status = status_from_uri(object_uri)
|
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
|
return if maybe_process_embedded_reaction
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ module Mastodon
|
||||||
end
|
end
|
||||||
|
|
||||||
def catstodon_revision
|
def catstodon_revision
|
||||||
'1.0.10'
|
'1.0.11'
|
||||||
end
|
end
|
||||||
|
|
||||||
def build_metadata
|
def build_metadata
|
||||||
|
|
Loading…
Reference in a new issue