diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-09 12:11:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 12:11:14 +0200 |
| commit | 4134a10549a833ad5ab18b3c579304919d594ce1 (patch) | |
| tree | 696f4b453ad029ffda3d0925c484c11b27b95cc6 /app/services/mute_service.rb | |
| parent | d0b1369a853dc2e5b7934c148547f71f8d103859 (diff) | |
| parent | b368d3c15ddfca983e89ff2858f7f03eb7147d83 (diff) | |
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |