* Error message for avatar image that's too large. #9204 * Code climate/formatting * Removed avatar error message * Moved valid image dimentions check to update service * removed unnescessary begin block * code climate formatting * code climate indent fix
		
			
				
	
	
		
			35 lines
		
	
	
	
		
			992 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			35 lines
		
	
	
	
		
			992 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class UpdateAccountService < BaseService
 | |
|   def call(account, params, raise_error: false)
 | |
|     was_locked    = account.locked
 | |
|     update_method = raise_error ? :update! : :update
 | |
| 
 | |
|     account.send(update_method, params).tap do |ret|
 | |
|       next unless ret
 | |
| 
 | |
|       authorize_all_follow_requests(account) if was_locked && !account.locked
 | |
|       check_links(account)
 | |
|       process_hashtags(account)
 | |
|     end
 | |
|   rescue Mastodon::DimensionsValidationError => de
 | |
|     account.errors.add(:avatar, de.message)
 | |
|     false
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def authorize_all_follow_requests(account)
 | |
|     AuthorizeFollowWorker.push_bulk(FollowRequest.where(target_account: account).select(:account_id, :target_account_id)) do |req|
 | |
|       [req.account_id, req.target_account_id]
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   def check_links(account)
 | |
|     VerifyAccountLinksWorker.perform_async(account.id)
 | |
|   end
 | |
| 
 | |
|   def process_hashtags(account)
 | |
|     account.tags_as_strings = Extractor.extract_hashtags(account.note)
 | |
|   end
 | |
| end
 |