diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-15 18:02:45 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-15 18:02:45 +0100 |
| commit | 06cc04fd239896d294210b8bbaadb7c611aaffe5 (patch) | |
| tree | 1868711bbe9ee79b25ff10a585457cfa0f9ac121 /app/lib/activitypub/activity/announce.rb | |
| parent | 2769b5446681898e8332cb505f499dac2a6e5717 (diff) | |
| parent | 8ef50706a11e115e8b4aa31b30de93738bc7e754 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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) |