Handle featured collections without items (mastodon#27581)

smooshy · Oct 27, 2023 · 8f998cd · 8f998cd
1 parent fa7e64d
commit 8f998cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/app/services/activitypub/fetch_featured_collection_service.rb b/app/services/activitypub/fetch_featured_collection_service.rb
@@ -37,6 +37,8 @@ def fetch_collection(collection_or_uri)
  end
 
  def process_items(items)
+ return if items.nil?
+
  process_note_items(items) if @options[:note]
  process_hashtag_items(items) if @options[:hashtag]
  end

diff --git a/spec/services/activitypub/fetch_featured_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
@@ -42,12 +42,22 @@
  }
  end
 
+ let(:featured_with_null) do
+ {
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ id: 'https://example.com/account/collections/featured',
+ totalItems: 0,
+ type: 'OrderedCollection',
+ }
+ end
+
  let(:items) do
  [
  'https://example.com/account/pinned/known', # known
  status_json_pinned_unknown_inlined, # unknown inlined
  'https://example.com/account/pinned/unknown-unreachable', # unknown unreachable
  'https://example.com/account/pinned/unknown-reachable', # unknown reachable
+ 'https://example.com/account/collections/featured', # featured with null
  ]
  end
 
@@ -66,6 +76,7 @@
  stub_request(:get, 'https://example.com/account/pinned/unknown-inlined').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_inlined))
  stub_request(:get, 'https://example.com/account/pinned/unknown-unreachable').to_return(status: 404)
  stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_unreachable))
+ stub_request(:get, 'https://example.com/account/collections/featured').to_return(status: 200, body: Oj.dump(featured_with_null))
 
  subject.call(actor, note: true, hashtag: false)
  end