Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-19 12:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4

Browse Source 
Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.
This commit is contained in:
Claire
2025-08-04 21:48:37 +02:00
parent 5e639d7384 208cb8276a
commit fcb7917344
15 changed files with 70 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/lib/activitypub/parser/status_parser.rb
View File

@@ -154,9 +154,6 @@ class ActivityPub::Parser::StatusParser
# Remove the special-meaning actor URI
allowed_actors.delete(@options[:actor_uri])
# Tagged users are always allowed, so remove them
allowed_actors -= as_array(@object['tag']).filter_map { |tag| tag['href'] if equals_or_includes?(tag['type'], 'Mention') }
# Any unrecognized actor is marked as unknown
flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:unknown] unless allowed_actors.empty?