tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests 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
1 changed files with 2 additions and 2 deletions
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) 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