diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-13 18:17:16 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-13 18:17:16 +0000 |
| commit | 82236a37039043d134efb3ddbdd2a3e04e714e2c (patch) | |
| tree | c00cd712a172ac3d5865e94bc505590fa211ecd5 /app/services/fetch_remote_status_service.rb | |
| parent | 65d083338debc256360fd6052ec43b98c442320c (diff) | |
| parent | 72314d26aeef0b225401d3f0ad97ea948c66f423 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/services/fetch_remote_status_service.rb')
| -rw-r--r-- | app/services/fetch_remote_status_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb index 9c009335b..9c3008035 100644 --- 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 |