zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Revert "Support JSON-LD named graph (#31288)" (#31355)

This commit is contained in:
Claire 2024-08-09 15:48:54 +02:00 committed by GitHub
parent cbdd8edf68
commit 8a5b57f668
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/link_details_extractor.rb
View File

@ -101,9 +101,7 @@ class LinkDetailsExtractor
end end
def json def json
@json ||= root_array(Oj.load(@data)) @json ||= root_array(Oj.load(@data)).compact.find { |obj| SUPPORTED_TYPES.include?(obj['@type']) } || {}
.map { |node| JSON::LD::API.compact(node, 'https://schema.org') }
.find { |node| SUPPORTED_TYPES.include?(node['type']) } || {}
end end
end end

36
spec/lib/link_details_extractor_spec.rb
View File

@ -79,16 +79,6 @@ RSpec.describe LinkDetailsExtractor do
}, },
}.to_json }.to_json
end end
let(:html) { <<~HTML }
<!doctype html>
<html>
<body>
<script type="application/ld+json">
#{ld_json}
</script>
</body>
</html>
HTML
shared_examples 'structured data' do shared_examples 'structured data' do
it 'extracts the expected values from structured data' do it 'extracts the expected values from structured data' do
@ -234,27 +224,21 @@ RSpec.describe LinkDetailsExtractor do
}, },
}.to_json }.to_json
end end
let(:html) { <<~HTML }
<!doctype html>
<html>
<body>
<script type="application/ld+json">
#{ld_json}
</script>
</body>
</html>
HTML
it 'joins author names' do it 'joins author names' do
expect(subject.author_name).to eq 'Author 1, Author 2' expect(subject.author_name).to eq 'Author 1, Author 2'
end end
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 end
context 'when Open Graph protocol data is present' do context 'when Open Graph protocol data is present' do