diff options
| author | pluralcafe-docker <docker@plural.cafe> | 2018-08-30 05:23:58 +0000 |
|---|---|---|
| committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-30 05:23:58 +0000 |
| commit | cc7437e25597e24b9a5f06f7991861506d9abe5c (patch) | |
| tree | e627d32df29ef7ae30a67607caf3ecdc1ae333a9 /app/workers/maintenance | |
| parent | 395164add468b1079669699dfe8eeaab73f69c15 (diff) | |
| parent | 5ce67276691c37baad149f2f89f765543f70e6f9 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/workers/maintenance')
| -rw-r--r-- | app/workers/maintenance/destroy_media_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/maintenance/redownload_account_media_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/maintenance/uncache_media_worker.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/workers/maintenance/destroy_media_worker.rb b/app/workers/maintenance/destroy_media_worker.rb index 5f052983b..cde33d6d7 100644 --- a/app/workers/maintenance/destroy_media_worker.rb +++ b/app/workers/maintenance/destroy_media_worker.rb @@ -6,7 +6,7 @@ class Maintenance::DestroyMediaWorker sidekiq_options queue: 'pull' def perform(media_attachment_id) - media = MediaAttachment.find(media_attachment_id) + media = media_attachment_id.is_a?(MediaAttachment) ? media_attachment_id : MediaAttachment.find(media_attachment_id) media.destroy rescue ActiveRecord::RecordNotFound true diff --git a/app/workers/maintenance/redownload_account_media_worker.rb b/app/workers/maintenance/redownload_account_media_worker.rb index fc26815f2..6afbe6e19 100644 --- a/app/workers/maintenance/redownload_account_media_worker.rb +++ b/app/workers/maintenance/redownload_account_media_worker.rb @@ -6,7 +6,7 @@ class Maintenance::RedownloadAccountMediaWorker sidekiq_options queue: 'pull', retry: false def perform(account_id) - account = Account.find(account_id) + account = account_id.is_a?(Account) ? account_id : Account.find(account_id) account.reset_avatar! account.reset_header! account.save diff --git a/app/workers/maintenance/uncache_media_worker.rb b/app/workers/maintenance/uncache_media_worker.rb index 2d1a670a7..4bc62ef75 100644 --- a/app/workers/maintenance/uncache_media_worker.rb +++ b/app/workers/maintenance/uncache_media_worker.rb @@ -6,7 +6,7 @@ class Maintenance::UncacheMediaWorker sidekiq_options queue: 'pull' def perform(media_attachment_id) - media = MediaAttachment.find(media_attachment_id) + media = media_attachment_id.is_a?(MediaAttachment) ? media_attachment_id : MediaAttachment.find(media_attachment_id) return if media.file.blank? |