diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-07 23:44:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-07 23:44:58 +0200 |
| commit | 774ac473736cbf348827cf6d861e7fbbb72d7623 (patch) | |
| tree | c8ce87b43cd8fa58f7124a8a6baf93a71cb274e8 /app/services/mute_service.rb | |
| parent | 25744d43b0c9ae58227e1e46ac9e2b33a7944925 (diff) | |
Add conversations API (#8832)
* Add conversations API * Add web UI for conversations * Add test for conversations API * Add tests for ConversationAccount * Improve web UI * Rename ConversationAccount to AccountConversation * Remove conversations on block and mute * Change last_status_id to be a denormalization of status_ids * Add optimistic locking
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 |