Fix posts when omitting quote policy and default policy is nobody (#36158)
Some checks are pending
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
Check formatting / lint (push) Waiting to run
CSS Linting / 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

This commit is contained in:
Claire 2025-09-17 21:16:36 +02:00 committed by GitHub
parent 085e9ea676
commit 90765342a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 3 deletions

View File

@ -6,15 +6,13 @@ module Api::InteractionPoliciesConcern
def quote_approval_policy def quote_approval_policy
return nil unless Mastodon::Feature.outgoing_quotes_enabled? return nil unless Mastodon::Feature.outgoing_quotes_enabled?
case status_params[:quote_approval_policy] case status_params[:quote_approval_policy].presence || current_user.setting_default_quote_policy
when 'public' when 'public'
Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16 Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16
when 'followers' when 'followers'
Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] << 16 Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] << 16
when 'nobody' when 'nobody'
0 0
when nil
Status::QUOTE_APPROVAL_POLICY_FLAGS[current_user.setting_default_quote_policy&.to_sym] << 16
else else
# TODO: raise more useful message # TODO: raise more useful message
raise ActiveRecord::RecordInvalid raise ActiveRecord::RecordInvalid

View File

@ -180,6 +180,28 @@ RSpec.describe '/api/v1/statuses' do
end end
end end
context 'without a quote policy and the user defaults to nobody', feature: :outgoing_quotes do
let(:user) do
Fabricate(:user, settings: { default_quote_policy: 'nobody' })
end
it 'returns post with user default quote policy, as well as rate limit headers', :aggregate_failures do
subject
expect(user.setting_default_quote_policy).to eq 'nobody'
expect(response).to have_http_status(200)
expect(response.content_type)
.to start_with('application/json')
expect(response.parsed_body[:quote_approval]).to include({
automatic: [],
manual: [],
current_user: 'automatic',
})
expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
end
end
context 'with a quote policy', feature: :outgoing_quotes do context 'with a quote policy', feature: :outgoing_quotes do
let(:quoted_status) { Fabricate(:status, account: user.account) } let(:quoted_status) { Fabricate(:status, account: user.account) }
let(:params) do let(:params) do