diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-09 20:11:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-09 20:11:48 -0400 |
| commit | 3dff74eecf5387b92b862893248710d2efb90eec (patch) | |
| tree | 0d29d8c952a0c62e7de4348a1d63963fd5eca237 /app/lib/ostatus/activity/deletion.rb | |
| parent | e18ed4bbc7ab4e258d05a3e2a5db0790f67a8f37 (diff) | |
| parent | 14e1fb8d36763e5255e7b8e440ecaf02208db004 (diff) | |
Merge pull request #141 from yipdw/sync/upstream
Sync with upstream @ v1.6.0rc3 ohhhhhhhhhhh heck here we go
Diffstat (limited to 'app/lib/ostatus/activity/deletion.rb')
| -rw-r--r-- | app/lib/ostatus/activity/deletion.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/lib/ostatus/activity/deletion.rb b/app/lib/ostatus/activity/deletion.rb index 860faf501..c98f5ee0a 100644 --- a/app/lib/ostatus/activity/deletion.rb +++ b/app/lib/ostatus/activity/deletion.rb @@ -3,7 +3,9 @@ class OStatus::Activity::Deletion < OStatus::Activity::Base def perform Rails.logger.debug "Deleting remote status #{id}" - status = Status.find_by(uri: id, account: @account) + + status = Status.find_by(uri: id, account: @account) + status ||= Status.find_by(uri: activitypub_uri, account: @account) if activitypub_uri? if status.nil? redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id) |