]> cat aescling's git repositories - mastodon.git/commitdiff
Account.find_remote should be raise ActiveRecord::RecordNotFound (#3476)
authoralpaca-tc <alpaca-tc@alpaca.tc>
Wed, 31 May 2017 13:10:26 +0000 (22:10 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 31 May 2017 13:10:26 +0000 (15:10 +0200)
app/models/account.rb

index f5ac8925784f64a5cc24034fa3fb970babe5a308..cb116dbaf612745dd3adbb299dbccdf7a25d4893 100644 (file)
@@ -167,7 +167,7 @@ class Account < ApplicationRecord
     end
 
     def find_remote!(username, domain)
-      return if username.blank?
+      raise ActiveRecord::RecordNotFound if username.blank?
       where('lower(accounts.username) = ?', username.downcase).where(domain.nil? ? { domain: nil } : 'lower(accounts.domain) = ?', domain&.downcase).take!
     end