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

Make ActivityPub::TagManager#local_uri? recognize local URIs with ports (#4628)

rebase/4.0.0rc2
Eugen Rochko 2017-08-18 03:21:59 +02:00 committed by GitHub
parent 10489b4e4a
commit 4edf9d849f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/activitypub/tag_manager.rb
View File

@ -70,7 +70,10 @@ class ActivityPub::TagManager
end end
def local_uri?(uri) def local_uri?(uri)
host = Addressable::URI.parse(uri).normalized_host uri = Addressable::URI.parse(uri)
host = uri.normalized_host
host = "#{host}:#{uri.port}" if uri.port
!host.nil? && (::TagManager.instance.local_domain?(host) || ::TagManager.instance.web_domain?(host)) !host.nil? && (::TagManager.instance.local_domain?(host) || ::TagManager.instance.web_domain?(host))
end end