hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
signup-info-prompt
ThibG 2017-10-13 12:58:13 +02:00 committed by Eugen Rochko
parent 3283868e28
commit 95fe20b78a
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).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
end end