mirror of https://github.com/tootsuite/mastodon
Fix not rejecting remote URIs when parsing out local IDs (#3012)
parent
2cc0d56652
commit
43d754eb42
|
@ -48,6 +48,7 @@ class TagManager
|
|||
end
|
||||
|
||||
def unique_tag_to_local_id(tag, expected_type)
|
||||
return nil unless local_id?(tag)
|
||||
matches = Regexp.new("objectId=([\\d]+):objectType=#{expected_type}").match(tag)
|
||||
return matches[1] unless matches.nil?
|
||||
end
|
||||
|
|
|
@ -123,7 +123,9 @@ class ProcessInteractionService < BaseService
|
|||
end
|
||||
|
||||
def status(xml)
|
||||
Status.find(TagManager.instance.unique_tag_to_local_id(activity_id(xml), 'Status'))
|
||||
uri = activity_id(xml)
|
||||
return nil unless TagManager.instance.local_id?(uri)
|
||||
Status.find(TagManager.instance.unique_tag_to_local_id(uri, 'Status'))
|
||||
end
|
||||
|
||||
def activity_id(xml)
|
||||
|
|
Loading…
Reference in New Issue