about summary refs log tree commit diff
path: root/app/services/fetch_oembed_service.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-01-05 18:44:15 +0100
committerGitHub <noreply@github.com>2023-01-05 18:44:15 +0100
commitad17e1944aa4c01c5637199b464c9d78b7e54af2 (patch)
treedee9d23334a0d23fbc3737e3c17033727805a141 /app/services/fetch_oembed_service.rb
parent7e9d5bdbb9125197afb5b3df69ce49a79451d697 (diff)
parentc4649ae9d4ef34cc0bad9d5df0da8e8b6c729522 (diff)
Merge pull request #2071 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/fetch_oembed_service.rb')
-rw-r--r--app/services/fetch_oembed_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/fetch_oembed_service.rb b/app/services/fetch_oembed_service.rb
index 4cbaa04c6..7d0879c79 100644
--- a/app/services/fetch_oembed_service.rb
+++ b/app/services/fetch_oembed_service.rb
@@ -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