Support JSON-LD named graph (mastodon#31288)

nileane · Aug 6, 2024 · e9e63ed · e9e63ed
1 parent 135493c
commit e9e63ed
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
@@ -101,7 +101,9 @@ def root_array(root)
     end
 
     def json
-      @json ||= root_array(Oj.load(@data)).compact.find { |obj| SUPPORTED_TYPES.include?(obj['@type']) } || {}
+      @json ||= root_array(Oj.load(@data))
+                .map { |node| JSON::LD::API.compact(node, 'https://schema.org') }
+                .find { |node| SUPPORTED_TYPES.include?(node['type']) } || {}
     end
   end
 

diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
@@ -79,6 +79,16 @@
         },
       }.to_json
     end
+    let(:html) { <<~HTML }
+      <!doctype html>
+      <html>
+      <body>
+        <script type="application/ld+json">
+          #{ld_json}
+        </script>
+      </body>
+      </html>
+    HTML
 
     shared_examples 'structured data' do
       it 'extracts the expected values from structured data' do
@@ -224,21 +234,27 @@
           },
         }.to_json
       end
-      let(:html) { <<~HTML }
-        <!doctype html>
-        <html>
-        <body>
-          <script type="application/ld+json">
-            #{ld_json}
-          </script>
-        </body>
-        </html>
-      HTML
 
       it 'joins author names' do
         expect(subject.author_name).to eq 'Author 1, Author 2'
       end
     end
+
+    context 'with named graph' do
+      let(:ld_json) do
+        {
+          '@context' => 'https://schema.org',
+          '@graph' => [
+            '@type' => 'NewsArticle',
+            'headline' => "What's in a name",
+          ],
+        }.to_json
+      end
+
+      it 'descends into @graph node' do
+        expect(subject.title).to eq "What's in a name"
+      end
+    end
   end
 
   context 'when Open Graph protocol data is present' do