mastofe

commit: fe180f18ff38a01007842ccff293a84a63336aae
parent: 1486fd64cc73d1efb713ad3801cb8ae7acc0de1f
Author: Renato "Lond" Cerqueira <renato@lond.com.br>
Date:   Tue, 12 Dec 2017 15:11:13 +0100

Change conditional to avoid nil into string error in sidekiq (#5987)

* Change conditional to avoid nil into string error in sidekiq
When obtaining information about users with mastodon in a different
subdomain, sidekiq was giving out a 'no implicit conversion of nil into String'

* Use presence instead of blank? with ternary.
Following suggestion on PR

Diffstat:
M
app/services/fetch_remote_status_service.rb
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb
@@ -40,6 +40,6 @@ class FetchRemoteStatusService < BaseService
   end
 
   def confirmed_domain?(domain, account)
-    account.domain.nil? || domain.casecmp(account.domain).zero? || domain.casecmp(Addressable::URI.parse(account.remote_url || account.uri).normalized_host).zero?
+    account.domain.nil? || domain.casecmp(account.domain).zero? || domain.casecmp(Addressable::URI.parse(account.remote_url.presence || account.uri).normalized_host).zero?
   end
 end