astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
pull/5961/merge
Renato "Lond" Cerqueira 2017-12-12 15:11:13 +01:00 committed by Eugen Rochko
parent 1486fd64cc
commit fe180f18ff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/fetch_remote_status_service.rb
View File

@ -40,6 +40,6 @@ class FetchRemoteStatusService < BaseService
end end
def confirmed_domain?(domain, account) 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
end end