Revert "Merge branch 'onebox-safety' of git://github.com/tms/discourse"

This reverts commit 7ca57db97afda4d1c130269061f0db3cb9d0dd42, reversing
changes made to b7e027cfd1590365ac9c85141ff2b02c25e900fb.
This commit is contained in:
Robin Ward
2013-02-19 14:22:13 -05:00
parent d05706f774
commit ba238f92c2
12 changed files with 88 additions and 125 deletions

View File

@ -36,14 +36,12 @@ module Oneboxer
if page_html.present?
doc = Nokogiri::HTML(page_html)
if Whitelist.oembed_allowed?(url)
# See if if it has an oembed thing we can use
(doc/"link[@type='application/json+oembed']").each do |oembed|
return OembedOnebox.new(oembed[:href]).onebox
end
(doc/"link[@type='text/json+oembed']").each do |oembed|
return OembedOnebox.new(oembed[:href]).onebox
end
# See if if it has an oembed thing we can use
(doc/"link[@type='application/json+oembed']").each do |oembed|
return OembedOnebox.new(oembed[:href]).onebox
end
(doc/"link[@type='text/json+oembed']").each do |oembed|
return OembedOnebox.new(oembed[:href]).onebox
end
# Check for opengraph