diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:01:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-17 10:01:02 +0100 |
| commit | 430d4427916b44e6a7c16db1899dfef2eec140fc (patch) | |
| tree | e53417f50f9e4ab4b95bf0e9fbb18b0e00b0ce7e /app/lib/activitypub/activity/add.rb | |
| parent | a85912b0d6d2ee68aa35794fbb51c5358768c092 (diff) | |
| parent | 77dd4ab8f5d09b128db1e0227b2afcf73d8531e7 (diff) | |
Merge pull request #1661 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub/activity/add.rb')
| -rw-r--r-- | app/lib/activitypub/activity/add.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/add.rb b/app/lib/activitypub/activity/add.rb index 688ab00b3..845eeaef7 100644 --- a/app/lib/activitypub/activity/add.rb +++ b/app/lib/activitypub/activity/add.rb @@ -4,8 +4,7 @@ class ActivityPub::Activity::Add < ActivityPub::Activity def perform return unless @json['target'].present? && value_or_id(@json['target']) == @account.featured_collection_url - status = status_from_uri(object_uri) - status ||= fetch_remote_original_status + status = status_from_object return unless !status.nil? && status.account_id == @account.id && !@account.pinned?(status) |