From: unarist <m.unarist@gmail.com>
Date: Tue, 20 Jun 2017 18:40:56 +0000 (+0900)
Subject: Fix RemoteFollow behavior (#3868)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a20cf3b64e93d764f1dfe88ecdb39f3fd4eefe03;p=mastodon.git

Fix RemoteFollow behavior (#3868)

* Invalid acct is an error. not "2 errors".
* Empty input should be different error from invalid acct
---

diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb
index 3da3ba0ae..8366d43c5 100644
--- a/app/models/remote_follow.rb
+++ b/app/models/remote_follow.rb
@@ -5,11 +5,15 @@ class RemoteFollow
 
   attr_accessor :acct, :addressable_template
 
+  validates :acct, presence: true
+
   def initialize(attrs = {})
     @acct = attrs[:acct].gsub(/\A@/, '').strip unless attrs[:acct].nil?
   end
 
   def valid?
+    return false unless super
+
     populate_template
     errors.empty?
   end
@@ -39,7 +43,6 @@ class RemoteFollow
   def acct_resource
     @_acct_resource ||= Goldfinger.finger("acct:#{acct}")
   rescue Goldfinger::Error
-    missing_resource_error
     nil
   end