diff options
author | Eugen <eugen@zeonfederated.com> | 2017-01-24 21:56:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-24 21:56:06 +0100 |
commit | f8da0dd4907490f57cb14b052b767c66c95c4db3 (patch) | |
tree | 871a1b902872d22d0c28e96dbc733533d33ac397 /app/services/block_service.rb | |
parent | bf0f6eb62d0f5bd1f0d8e4e2a6e9e8fd3b297b6c (diff) | |
parent | 8a880a3d464daf486a10d85b8ee49305aa6b1e5b (diff) |
Merge branch 'master' into master
Diffstat (limited to 'app/services/block_service.rb')
-rw-r--r-- | app/services/block_service.rb | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/app/services/block_service.rb b/app/services/block_service.rb index b08cf8ca8..e04b6cc39 100644 --- a/app/services/block_service.rb +++ b/app/services/block_service.rb @@ -9,32 +9,7 @@ class BlockService < BaseService block = account.block!(target_account) - clear_timelines(account, target_account) - clear_notifications(account, target_account) - + BlockWorker.perform_async(account.id, target_account.id) NotificationWorker.perform_async(block.stream_entry.id, target_account.id) unless target_account.local? end - - private - - def clear_timelines(account, target_account) - mentions_key = FeedManager.instance.key(:mentions, account.id) - home_key = FeedManager.instance.key(:home, account.id) - - target_account.statuses.select('id').find_each do |status| - redis.zrem(mentions_key, status.id) - redis.zrem(home_key, status.id) - end - end - - def clear_notifications(account, target_account) - Notification.where(account: account).joins(:follow).where(activity_type: 'Follow', follows: { account_id: target_account.id }).destroy_all - Notification.where(account: account).joins(mention: :status).where(activity_type: 'Mention', statuses: { account_id: target_account.id }).destroy_all - Notification.where(account: account).joins(:favourite).where(activity_type: 'Favourite', favourites: { account_id: target_account.id }).destroy_all - Notification.where(account: account).joins(:status).where(activity_type: 'Status', statuses: { account_id: target_account.id }).destroy_all - end - - def redis - Redis.current - end end |