From 3825e1943f3e870ffe967f01d6ca4345d69f1a12 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Wed, 15 Apr 2020 20:33:53 +0200
Subject: [PATCH] Fix confusing error when failing to add an alias to an
unknown account (#13480)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app/models/account_alias.rb b/app/models/account_alias.rb
index 3d0b5d188..792e9e8d4 100644
--- a/app/models/account_alias.rb
+++ b/app/models/account_alias.rb
@@ -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'))