diff options
author | ThibG <thib@sitedethib.com> | 2019-04-04 15:13:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-04 15:13:18 +0200 |
commit | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (patch) | |
tree | e6022023d42dde628bb44880659104a87f985039 /app/workers/import | |
parent | 14bad3f472b2d9887db701409db93e511e9c6f50 (diff) | |
parent | be6885eb93c088699465d1c50e49e8ba6d9fa3a7 (diff) |
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers/import')
-rw-r--r-- | app/workers/import/relationship_worker.rb | 4 |
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 |