]> cat aescling's git repositories - mastodon.git/commitdiff
Fix confusing error when failing to add an alias to an unknown account (#13480)
authorThibG <thib@sitedethib.com>
Wed, 15 Apr 2020 18:33:53 +0000 (20:33 +0200)
committerGitHub <noreply@github.com>
Wed, 15 Apr 2020 18:33:53 +0000 (20:33 +0200)
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.

app/models/account_alias.rb

index 3d0b5d188fd2b8ec594ca0d48cc0a6d167b3d725..792e9e8d4da7574bd2e7acdd079fe6488d9f02fb 100644 (file)
@@ -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'))