github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 19:01:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1514 from cfstras/youtube-https

Browse Source 
YoutubeOnebox: FIX HTTP-specific URLs
This commit is contained in:
Neil Lalonde 2013-10-09 12:33:49 -07:00
commit 43fc772a53
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/oneboxer/base_onebox.rb
View File

@ -32,6 +32,11 @@ module Oneboxer
URI.escape(val, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")) URI.escape(val, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
end end
# Replace any occurence of a HTTP or HTTPS URL in the string with the protocol-agnostic variant
def replace_agnostic(var)
var.gsub! /https?:\/\//, '//' if var.is_a? String
end
end end
def initialize(url, opts={}) def initialize(url, opts={})

5
lib/oneboxer/youtube_onebox.rb
View File

@ -6,5 +6,10 @@ module Oneboxer
def oembed_endpoint def oembed_endpoint
"http://www.youtube.com/oembed?url=#{BaseOnebox.uriencode(@url.sub('https://', 'http://'))}&format=json" "http://www.youtube.com/oembed?url=#{BaseOnebox.uriencode(@url.sub('https://', 'http://'))}&format=json"
end end
def onebox
# Youtube allows HTTP and HTTPS, so replace them with the protocol-agnostic variant
super.each { |entry| BaseOnebox.replace_agnostic entry }
end
end end
end end