mastofe

commit: 95fe20b78ada8612108f8e44294cc36fdaf9cef8
parent: 3283868e28794d7abe217c525aadf5e7b9e2fa66
Author: ThibG <thib@sitedethib.com>
Date:   Fri, 13 Oct 2017 12:58:13 +0200

Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372)

Remote ActivityPub users that have never been known as OStatus users
(whether or not they support it) will not have a “remote_url” attribute
set. In case they reside on an instance with WEB_DOMAIN ≠ LOCAL_DOMAIN,
the current check did rely on “remote_url” to verify the user's domain.
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).normalized_host).zero?
+    account.domain.nil? || domain.casecmp(account.domain).zero? || domain.casecmp(Addressable::URI.parse(account.remote_url || account.uri).normalized_host).zero?
   end
 end