Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00
parent f0a2a6c875 476e79b8e3
commit 8d6b9ba494
322 changed files with 8478 additions and 2587 deletions
--- a/app/services/mute_service.rb
+++ b/app/services/mute_service.rb
@@ -3,7 +3,8 @@
 class MuteService < BaseService
  def call(account, target_account, notifications: nil)
    return if account.id == target_account.id
-    FeedManager.instance.clear_from_timeline(account, target_account)
    account.mute!(target_account, notifications: notifications)
+    BlockWorker.perform_async(account.id, target_account.id)
+    mute
  end
 end