diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
commit | 3f60b096b51b000905290d69ea05b874b60fa9e0 (patch) | |
tree | 0b8c7011810b4a97523c2c63816735e519f0682c /app/services/after_block_domain_from_account_service.rb | |
parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
parent | d9cad44ca54374cafa0c97775083bb1bc0a5a3ce (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.
Diffstat (limited to 'app/services/after_block_domain_from_account_service.rb')
-rw-r--r-- | app/services/after_block_domain_from_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/after_block_domain_from_account_service.rb b/app/services/after_block_domain_from_account_service.rb index f50bde261..89d007c1c 100644 --- a/app/services/after_block_domain_from_account_service.rb +++ b/app/services/after_block_domain_from_account_service.rb @@ -19,7 +19,7 @@ class AfterBlockDomainFromAccountService < BaseService private def remove_follows! - @account.active_relationships.where(account: Account.where(domain: @domain)).includes(:target_account).reorder(nil).find_each do |follow| + @account.active_relationships.where(target_account: Account.where(domain: @domain)).includes(:target_account).reorder(nil).find_each do |follow| UnfollowService.new.call(@account, follow.target_account) end end |