djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-27 10:30:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Be more lenient with OEmbed detection and validation (#22533)

Browse Source
This commit is contained in:
Effy Elden 2023-01-05 23:36:24 +11:00 committed by GitHub
parent 70b3207e33
commit 4dc9152b3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/fetch_oembed_service.rb
View File

@ -28,7 +28,7 @@ class FetchOEmbedService
page = Nokogiri::HTML(html)
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
end
@ -100,7 +100,7 @@ class FetchOEmbedService
end
def validate(oembed)
oembed if oembed[:version] == '1.0' && oembed[:type].present?
oembed if oembed[:version].to_s == '1.0' && oembed[:type].present?
end
def html