diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 13:51:33 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 13:51:33 +0200 |
| commit | d17844e6d1ad700df0f704972e2ce16e8693d33b (patch) | |
| tree | ada49442558fb14c6cf97e79fb6e2dcaa237c7a6 /app/services/mute_service.rb | |
| parent | 96c3d26870d4c8db1978c86b259e85d060d6f271 (diff) | |
| parent | 4c4ff05a461eddafbf38c603b1bf2029be36a0b9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/services/mute_service.rb')
| -rw-r--r-- | app/services/mute_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/mute_service.rb b/app/services/mute_service.rb index c6122a152..676804cb9 100644 --- a/app/services/mute_service.rb +++ b/app/services/mute_service.rb @@ -5,11 +5,13 @@ class MuteService < BaseService return if account.id == target_account.id mute = account.mute!(target_account, notifications: notifications) + if mute.hide_notifications? BlockWorker.perform_async(account.id, target_account.id) else - FeedManager.instance.clear_from_timeline(account, target_account) + MuteWorker.perform_async(account.id, target_account.id) end + mute end end |