From 4fa203e69ebde6e8f142158800d90e5daacc87fe Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 29 Aug 2025 15:50:37 +0200 Subject: [PATCH] Rename `unknown` quote policy value to `unsupported_policy` (#35955) --- app/javascript/mastodon/api_types/quotes.ts | 6 +++++- app/lib/activitypub/parser/status_parser.rb | 4 ++-- app/models/concerns/status/interaction_policy_concern.rb | 4 ++-- .../concerns/status/interaction_policy_concern_spec.rb | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/javascript/mastodon/api_types/quotes.ts b/app/javascript/mastodon/api_types/quotes.ts index 58cce1e257..b4fe380d52 100644 --- a/app/javascript/mastodon/api_types/quotes.ts +++ b/app/javascript/mastodon/api_types/quotes.ts @@ -1,7 +1,11 @@ import type { ApiStatusJSON } from './statuses'; export type ApiQuoteState = 'accepted' | 'pending' | 'revoked' | 'unauthorized'; -export type ApiQuotePolicy = 'public' | 'followers' | 'nobody' | 'unknown'; +export type ApiQuotePolicy = + | 'public' + | 'followers' + | 'nobody' + | 'unsupported_policy'; export type ApiUserQuotePolicy = 'automatic' | 'manual' | 'denied' | 'unknown'; interface ApiQuoteEmptyJSON { diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb index 5a434ed915..e1f11c20f3 100644 --- a/app/lib/activitypub/parser/status_parser.rb +++ b/app/lib/activitypub/parser/status_parser.rb @@ -152,8 +152,8 @@ class ActivityPub::Parser::StatusParser # Remove the special-meaning actor URI allowed_actors.delete(@options[:actor_uri]) - # Any unrecognized actor is marked as unknown - flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:unknown] unless allowed_actors.empty? + # Any unrecognized actor is marked as unsupported + flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:unsupported_policy] unless allowed_actors.empty? flags end diff --git a/app/models/concerns/status/interaction_policy_concern.rb b/app/models/concerns/status/interaction_policy_concern.rb index 1f57ccd6bb..2f8c75e740 100644 --- a/app/models/concerns/status/interaction_policy_concern.rb +++ b/app/models/concerns/status/interaction_policy_concern.rb @@ -4,7 +4,7 @@ module Status::InteractionPolicyConcern extend ActiveSupport::Concern QUOTE_APPROVAL_POLICY_FLAGS = { - unknown: (1 << 0), + unsupported_policy: (1 << 0), public: (1 << 1), followers: (1 << 2), followed: (1 << 3), @@ -52,7 +52,7 @@ module Status::InteractionPolicyConcern return :manual if following_author end - return :unknown if (automatic_policy | manual_policy).anybits?(QUOTE_APPROVAL_POLICY_FLAGS[:unknown]) + return :unknown if (automatic_policy | manual_policy).anybits?(QUOTE_APPROVAL_POLICY_FLAGS[:unsupported_policy]) :denied end diff --git a/spec/models/concerns/status/interaction_policy_concern_spec.rb b/spec/models/concerns/status/interaction_policy_concern_spec.rb index af42f2bba3..b59a1186d9 100644 --- a/spec/models/concerns/status/interaction_policy_concern_spec.rb +++ b/spec/models/concerns/status/interaction_policy_concern_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Status::InteractionPolicyConcern do describe '#quote_policy_as_keys' do it 'returns the expected values' do - expect(status.quote_policy_as_keys(:automatic)).to eq ['unknown', 'followers'] + expect(status.quote_policy_as_keys(:automatic)).to eq ['unsupported_policy', 'followers'] expect(status.quote_policy_as_keys(:manual)).to eq ['public'] end end