mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-30 04:14:36 +00:00
Be more lenient with OEmbed detection and validation (#22533)
This commit is contained in:
parent
70b3207e33
commit
4dc9152b3e
|
@ -28,7 +28,7 @@ class FetchOEmbedService
|
||||||
page = Nokogiri::HTML(html)
|
page = Nokogiri::HTML(html)
|
||||||
|
|
||||||
if @format.nil? || @format == :json
|
if @format.nil? || @format == :json
|
||||||
@endpoint_url ||= page.at_xpath('//link[@type="application/json+oembed"]')&.attribute('href')&.value
|
@endpoint_url ||= page.at_xpath('//link[@type="application/json+oembed"]|//link[@type="text/json+oembed"]')&.attribute('href')&.value
|
||||||
@format ||= :json if @endpoint_url
|
@format ||= :json if @endpoint_url
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ class FetchOEmbedService
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate(oembed)
|
def validate(oembed)
|
||||||
oembed if oembed[:version] == '1.0' && oembed[:type].present?
|
oembed if oembed[:version].to_s == '1.0' && oembed[:type].present?
|
||||||
end
|
end
|
||||||
|
|
||||||
def html
|
def html
|
||||||
|
|
Loading…
Reference in a new issue