hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix link crawler not specifying accepted content-type (#12646) 

The link crawler expects HTML documents, so set the `Accept`
header accordingly.

Fixes #12618
signup-info-prompt
ThibG 2019-12-18 16:56:06 +01:00 committed by Eugen Rochko
parent 68070e82cc
commit b364175e1b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/fetch_link_card_service.rb
View File

@ -45,7 +45,7 @@ class FetchLinkCardService < BaseService
def html def html
return @html if defined?(@html) return @html if defined?(@html)
Request.new(:get, @url).perform do |res| Request.new(:get, @url).add_headers('Accept' => 'text/html').perform do |res|
if res.code == 200 && res.mime_type == 'text/html' if res.code == 200 && res.mime_type == 'text/html'
@html = res.body_with_limit @html = res.body_with_limit
@html_charset = res.charset @html_charset = res.charset

2
app/services/fetch_oembed_service.rb
View File

@ -93,7 +93,7 @@ class FetchOEmbedService
def html def html
return @html if defined?(@html) return @html if defined?(@html)
@html = @options[:html] || Request.new(:get, @url).perform do |res| @html = @options[:html] || Request.new(:get, @url).add_headers('Accept' => 'text/html').perform do |res|
res.code != 200 || res.mime_type != 'text/html' ? nil : res.body_with_limit res.code != 200 || res.mime_type != 'text/html' ? nil : res.body_with_limit
end end
end end