diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-16 13:43:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 13:43:23 +0100 |
| commit | ab9082b3325dfd193d7130d6c880e85ab2781bc0 (patch) | |
| tree | 7593823272a7b35bbb2ea41206349e107d31cd26 /app/lib/activitypub/activity/announce.rb | |
| parent | 2769b5446681898e8332cb505f499dac2a6e5717 (diff) | |
| parent | 59fa38a4f6b9f19d674b3f9da97253b586814f94 (diff) | |
Merge pull request #916 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub/activity/announce.rb')
| -rw-r--r-- | app/lib/activitypub/activity/announce.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb index 34d1b7cbd..04afeea20 100644 --- a/app/lib/activitypub/activity/announce.rb +++ b/app/lib/activitypub/activity/announce.rb @@ -2,9 +2,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity def perform - original_status = status_from_uri(object_uri) - original_status ||= fetch_remote_original_status - + original_status = status_from_object return if original_status.nil? || delete_arrived_first?(@json['id']) || !announceable?(original_status) status = Status.find_by(account: @account, reblog: original_status) |