Use default quote policy setting in the absence of API parameter (#36094)
Some checks failed
Check i18n / check-i18n (push) Waiting to run
Chromatic / Run Chromatic (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
CodeQL / Analyze (ruby) (push) Waiting to run
Crowdin / Upload translations / upload-translations (push) Waiting to run
Check formatting / lint (push) Waiting to run
JavaScript Linting / lint (push) Waiting to run
Ruby Linting / lint (push) Waiting to run
JavaScript Testing / test (push) Waiting to run
Historical data migration test / test (14-alpine) (push) Waiting to run
Historical data migration test / test (15-alpine) (push) Waiting to run
Historical data migration test / test (16-alpine) (push) Waiting to run
Historical data migration test / test (17-alpine) (push) Waiting to run
Ruby Testing / build (production) (push) Waiting to run
Ruby Testing / build (test) (push) Waiting to run
Ruby Testing / test (.ruby-version) (push) Blocked by required conditions
Ruby Testing / test (3.2) (push) Blocked by required conditions
Ruby Testing / test (3.3) (push) Blocked by required conditions
Ruby Testing / ImageMagick tests (.ruby-version) (push) Blocked by required conditions
Ruby Testing / ImageMagick tests (3.2) (push) Blocked by required conditions
Ruby Testing / ImageMagick tests (3.3) (push) Blocked by required conditions
Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions
Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions
Ruby Testing / End to End testing (3.3) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
CSS Linting / lint (push) Has been cancelled

This commit is contained in:
Claire 2025-09-15 17:53:21 +02:00 committed by GitHub
parent 38fa0102c1
commit 6c5a4702d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -4,8 +4,7 @@ module Api::InteractionPoliciesConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
def quote_approval_policy def quote_approval_policy
# TODO: handle `nil` separately return nil unless Mastodon::Feature.outgoing_quotes_enabled?
return nil unless Mastodon::Feature.outgoing_quotes_enabled? && status_params[:quote_approval_policy].present?
case status_params[:quote_approval_policy] case status_params[:quote_approval_policy]
when 'public' when 'public'
@ -14,6 +13,8 @@ module Api::InteractionPoliciesConcern
Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] << 16 Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] << 16
when 'nobody' when 'nobody'
0 0
when nil
current_user.setting_default_quote_policy
else else
# TODO: raise more useful message # TODO: raise more useful message
raise ActiveRecord::RecordInvalid raise ActiveRecord::RecordInvalid