luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-29 01:53:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix RemoteFollow behavior (#3868)

Browse source 
* Invalid acct is an error. not "2 errors".
* Empty input should be different error from invalid acct
This commit is contained in:
unarist 2017-06-21 03:40:56 +09:00 committed by Eugen Rochko
parent 356df7ae6b
commit a20cf3b64e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/remote_follow.rb
View file

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