about summary refs log tree commit diff
path: root/app/workers/import
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-04-03 18:17:43 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-04-03 18:17:43 +0200
commitd4882aa64a7a483ec30ca61a507c2a6f5d3294f5 (patch)
tree4b72c4c44feafa772ba322b0a46f3eb524297138 /app/workers/import
parentdaab45d4ae000a208f251ce96334df47d894dba3 (diff)
Export and import `hide_notifications` alongside user mutes (#10335)
* Export hide_notifications along with user mutes

* Import hide_notifications along with muted users list

* Add headers for CSV exports
Diffstat (limited to 'app/workers/import')
-rw-r--r--app/workers/import/relationship_worker.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/import/relationship_worker.rb b/app/workers/import/relationship_worker.rb
index e9db20a46..43ec09ea2 100644
--- a/app/workers/import/relationship_worker.rb
+++ b/app/workers/import/relationship_worker.rb
@@ -5,7 +5,7 @@ class Import::RelationshipWorker
 
   sidekiq_options queue: 'pull', retry: 8, dead: false
 
-  def perform(account_id, target_account_uri, relationship)
+  def perform(account_id, target_account_uri, relationship, extra = nil)
     from_account   = Account.find(account_id)
     target_account = ResolveAccountService.new.call(target_account_uri)
 
@@ -21,7 +21,7 @@ class Import::RelationshipWorker
     when 'unblock'
       UnblockService.new.call(from_account, target_account)
     when 'mute'
-      MuteService.new.call(from_account, target_account)
+      MuteService.new.call(from_account, target_account, notifications: extra)
     when 'unmute'
       UnmuteService.new.call(from_account, target_account)
     end