mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-28 22:15:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix list error messages (#33082)

Browse Source
This commit is contained in:
Eugen Rochko 2024-11-28 11:13:06 +01:00 committed by GitHub
parent fa3577e04b
commit 48f3ed738f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/list_account.rb
View File

@ -25,17 +25,16 @@ class ListAccount < ApplicationRecord
private
def set_follow
self.follow = Follow.find_by!(account_id: list.account_id, target_account_id: account.id)
rescue ActiveRecord::RecordNotFound
self.follow_request = FollowRequest.find_by!(account_id: list.account_id, target_account_id: account.id)
self.follow = Follow.find_by(account_id: list.account_id, target_account_id: account.id)
self.follow_request = FollowRequest.find_by(account_id: list.account_id, target_account_id: account.id) if follow.nil?
end
def validate_relationship
return if list.account_id == account_id
return if list_owner_account_is_account?
errors.add(:account_id, 'follow relationship missing') if follow_id.nil? && follow_request_id.nil?
errors.add(:follow, 'mismatched accounts') if follow_id.present? && follow.target_account_id != account_id
errors.add(:follow_request, 'mismatched accounts') if follow_request_id.present? && follow_request.target_account_id != account_id
errors.add(:account_id, :must_be_following) if follow_id.nil? && follow_request_id.nil?
errors.add(:follow, :invalid) if follow_id.present? && follow.target_account_id != account_id
errors.add(:follow_request, :invalid) if follow_request_id.present? && follow_request.target_account_id != account_id
end
def list_owner_account_is_account?

5
config/locales/activerecord.en.yml
View File

@ -39,6 +39,11 @@ en:
attributes:
data:
malformed: is malformed
list_account:
attributes:
account_id:
taken: is already on the list
must_be_following: must be a followed account
status:
attributes:
reblog:

2
spec/requests/api/v1/lists/accounts_spec.rb
View File

@ -95,7 +95,7 @@ RSpec.describe 'Accounts' do
it 'does not add the account to the list', :aggregate_failures do
subject
expect(response).to have_http_status(404)
expect(response).to have_http_status(422)
expect(response.content_type)
.to start_with('application/json')
expect(list.accounts).to_not include(bob)