diff options
| author | Starfall <us@starfall.systems> | 2020-09-14 13:49:06 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-09-14 13:49:06 -0500 |
| commit | bc32e736fbd7c6afd59e619c885fa80ab637324a (patch) | |
| tree | afc04eaa04aeb45b56c378bdc474428d6fdcc813 /app/workers/unmerge_worker.rb | |
| parent | fd0b806603dbd632d259d06af789c7195c7264dc (diff) | |
| parent | afa753a890197b188ddf7ba6a8493d4fe361d956 (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/workers/unmerge_worker.rb')
| -rw-r--r-- | app/workers/unmerge_worker.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/unmerge_worker.rb b/app/workers/unmerge_worker.rb index ea6aacebf..1a23faae5 100644 --- a/app/workers/unmerge_worker.rb +++ b/app/workers/unmerge_worker.rb @@ -6,6 +6,8 @@ class UnmergeWorker sidekiq_options queue: 'pull' def perform(from_account_id, into_account_id) - FeedManager.instance.unmerge_from_timeline(Account.find(from_account_id), Account.find(into_account_id)) + FeedManager.instance.unmerge_from_home(Account.find(from_account_id), Account.find(into_account_id)) + rescue ActiveRecord::RecordNotFound + true end end |