forked from cybrespace/mastodon
		
	Fix RemoteFollow behavior (#3868)
* Invalid acct is an error. not "2 errors". * Empty input should be different error from invalid acct
This commit is contained in:
		
							parent
							
								
									356df7ae6b
								
							
						
					
					
						commit
						a20cf3b64e
					
				
					 1 changed files with 4 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue