Skip to content
Snippets Groups Projects
Unverified Commit 3825e194 authored by ThibG's avatar ThibG Committed by GitHub
Browse files

Fix confusing error when failing to add an alias to an unknown account (#13480)

Follow-up to #13452, fixing broken `uri.nil?` test.

Also remove the separate check for `uri` presence, as that would result
in a “Please review 2 errors below” while only one would be listed.
parent 5edff327
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,6 @@ class AccountAlias < ApplicationRecord
belongs_to :account
validates :acct, presence: true, domain: { acct: true }
validates :uri, presence: true
validates :uri, uniqueness: { scope: :account_id }
validate :validate_target_account
......@@ -47,7 +46,7 @@ class AccountAlias < ApplicationRecord
end
def validate_target_account
if uri.nil?
if uri.blank?
errors.add(:acct, I18n.t('migrations.errors.not_found'))
elsif ActivityPub::TagManager.instance.uri_for(account) == uri
errors.add(:acct, I18n.t('migrations.errors.move_to_self'))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment