From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 13 Nov 2021 22:07:13 +0000 (+0100)
Subject: Fix no link previews being generated for pages with invalid structured data (#16979)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5d7c852283b1afd603f169e9ace80bf1714795d0;p=mastodon.git

Fix no link previews being generated for pages with invalid structured data (#16979)

Fix #16955
---

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index 3876173e0..8b38e8d0c 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -59,7 +59,7 @@ class LinkDetailsExtractor
     end
 
     def json
-      @json ||= Oj.load(@data)
+      @json ||= first_of_value(Oj.load(@data))
     end
   end
 
@@ -178,6 +178,8 @@ class LinkDetailsExtractor
     @structured_data ||= begin
       json_ld = document.xpath('//script[@type="application/ld+json"]').map(&:content).first
       json_ld.present? ? StructuredData.new(json_ld) : nil
+    rescue Oj::ParseError
+      nil
     end
   end