IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Be more selective about when we allow oembed discovery

Browse Source
This commit is contained in:
tms
2013-02-19 11:46:36 -05:00
parent a7a2dcebac
commit 2e230d2661
2 changed files with 107 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/oneboxer.rb
View File

@@ -30,18 +30,22 @@ module Oneboxer
def self.onebox_nocache(url)
oneboxer = onebox_for_url(url)
return oneboxer.onebox if oneboxer.present?
whitelist_entry = Whitelist.entry_for_url(url)
if Whitelist.allowed?(url)
if whitelist_entry.present?
page_html = open(url).read
if page_html.present?
doc = Nokogiri::HTML(page_html)
# 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
if whitelist_entry.allows_oembed?
# 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
end
# Check for opengraph