tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2017-12-13 18:17:16 +00:00
parent 65d083338d 72314d26ae
commit 82236a3703
59 changed files with 855 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/lib/provider_discovery.rb
View File

@@ -2,13 +2,26 @@
class ProviderDiscovery < OEmbed::ProviderDiscovery
class << self
def get(url, **options)
provider = discover_provider(url, options)
options.delete(:html)
provider.get(url, options)
end
def discover_provider(url, **options)
res = Request.new(:get, url).perform
format = options[:format]
raise OEmbed::NotFound, url if res.code != 200 || res.mime_type != 'text/html'
if options[:html]
html = Nokogiri::HTML(options[:html])
else
res = Request.new(:get, url).perform
html = Nokogiri::HTML(res.to_s)
raise OEmbed::NotFound, url if res.code != 200 || res.mime_type != 'text/html'
html = Nokogiri::HTML(res.to_s)
end
if format.nil? || format == :json
provider_endpoint ||= html.at_xpath('//link[@type="application/json+oembed"]')&.attribute('href')&.value