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

Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2025-09-15 18:39:09 +02:00
parent 85f414da8a 38fa0102c1
commit cc52833296
63 changed files with 490 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ class ActivityPub::Parser::StatusParser
# @param [Hash] json
# @param [Hash] options
# @option options [String] :followers_collection
# @option options [String] :following_collection
# @option options [String] :actor_uri
# @option options [Hash] :object
def initialize(json, **options)
@@ -148,8 +149,7 @@ class ActivityPub::Parser::StatusParser
flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] if allowed_actors.delete('as:Public') || allowed_actors.delete('Public') || allowed_actors.delete('https://www.w3.org/ns/activitystreams#Public')
flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] if allowed_actors.delete(@options[:followers_collection])
# TODO: we don't actually store that collection URI
# flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:followed]
flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:following] if allowed_actors.delete(@options[:following_collection])
# Remove the special-meaning actor URI
allowed_actors.delete(@options[:actor_uri])