diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-14 14:45:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-14 14:45:58 +0200 |
| commit | 126f1e36b8b9db8e51e0d723484ba9c2c3221c05 (patch) | |
| tree | 1d67b1f2ce69a5ef841242dc1aba1b69698f7ae3 /app/services | |
| parent | d353bb5ee395bbf65da608b2c5427e655786fb97 (diff) | |
| parent | e06b0234dfedae02c5fa1725575a97c04beb9a7f (diff) | |
Merge pull request #1743 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/activitypub/fetch_featured_collection_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/activitypub/fetch_featured_collection_service.rb b/app/services/activitypub/fetch_featured_collection_service.rb index 66234b711..07a9fe039 100644 --- 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 |