Merge branch 'main' into glitch-soc/merge-upstream

2022-04-14 14:21:14 +02:00
parent d353bb5ee3 9b7387d917
commit e06b0234df
112 changed files with 515 additions and 346 deletions
--- a/app/services/activitypub/fetch_featured_collection_service.rb
+++ b/app/services/activitypub/fetch_featured_collection_service.rb
@@ -27,7 +27,7 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService
      next if ActivityPub::TagManager.instance.local_uri?(uri)

      status = ActivityPub::FetchRemoteStatusService.new.call(uri, on_behalf_of: local_follower)
-      next unless status.account_id == @account.id
+      next unless status&.account_id == @account.id

      status.id
    rescue ActiveRecord::RecordInvalid => e