diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-17 16:00:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 16:00:24 +0100 |
| commit | 1aa87a1967b37e9f118b87ee643944798d3c90f4 (patch) | |
| tree | 370ceaf617e5b8449dcfd040c7d87d1548c62346 /app | |
| parent | ec18359c3d1996d3bb4676b826bceda88f5a535f (diff) | |
| parent | f6a4493a587ae7b5cf1bdf8805c973739b4411ea (diff) | |
Merge pull request #920 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app')
| -rw-r--r-- | app/lib/activitypub/activity.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index 8265810a0..11fa3363a 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -150,8 +150,7 @@ class ActivityPub::Activity end end - # If the status is not from the actor, try to fetch it - return fetch_remote_original_status if value_or_id(first_of_value(@json['attributedTo'])) == @account.uri + fetch_remote_original_status end def fetch_remote_original_status |