Move merging/unmerging of timelines into background. Move blocking into

background as well since it's a computationally expensive
This commit is contained in:
Eugen Rochko 2017-01-23 21:29:34 +01:00
parent f392030ab8
commit cca82bf0a2
7 changed files with 45 additions and 19 deletions

View File

@ -65,8 +65,13 @@ class Api::V1::AccountsController < ApiController
end end
def block def block
BlockService.new.call(current_user.account, @account) BlockWorker.perform_async(current_user.account_id, @account.id)
set_relationship
@following = { @account.id => false }
@followed_by = { @account.id => false }
@blocking = { @account.id => true }
@requested = { @account.id => false }
render action: :relationship render action: :relationship
end end

View File

@ -50,6 +50,15 @@ class FeedManager
trim(:home, into_account.id) trim(:home, into_account.id)
end end
def unmerge_from_timeline(from_account, into_account)
timeline_key = key(:home, into_account.id)
from_account.statuses.select('id').find_each do |status|
redis.zrem(timeline_key, status.id)
redis.zremrangebyscore(timeline_key, status.id, status.id)
end
end
def inline_render(target_account, template, object) def inline_render(target_account, template, object)
rabl_scope = Class.new do rabl_scope = Class.new do
include RoutingHelper include RoutingHelper

View File

@ -38,7 +38,7 @@ class FollowService < BaseService
NotificationWorker.perform_async(follow.stream_entry.id, target_account.id) NotificationWorker.perform_async(follow.stream_entry.id, target_account.id)
end end
FeedManager.instance.merge_into_timeline(target_account, source_account) MergeWorker.perform_async(target_account.id, source_account.id)
Pubsubhubbub::DistributionWorker.perform_async(follow.stream_entry.id) Pubsubhubbub::DistributionWorker.perform_async(follow.stream_entry.id)
follow follow

View File

@ -7,21 +7,6 @@ class UnfollowService < BaseService
def call(source_account, target_account) def call(source_account, target_account)
follow = source_account.unfollow!(target_account) follow = source_account.unfollow!(target_account)
NotificationWorker.perform_async(follow.stream_entry.id, target_account.id) unless target_account.local? NotificationWorker.perform_async(follow.stream_entry.id, target_account.id) unless target_account.local?
unmerge_from_timeline(target_account, source_account) UnmergeWorker.perform_async(target_account.id, source_account.id)
end
private
def unmerge_from_timeline(from_account, into_account)
timeline_key = FeedManager.instance.key(:home, into_account.id)
from_account.statuses.select('id').find_each do |status|
redis.zrem(timeline_key, status.id)
redis.zremrangebyscore(timeline_key, status.id, status.id)
end
end
def redis
Redis.current
end end
end end

View File

@ -0,0 +1,9 @@
# frozen_string_literal: true
class BlockWorker
include Sidekiq::Worker
def perform(account_id, target_account_id)
BlockService.new.call(Account.find(account_id), Account.find(target_account_id))
end
end

View File

@ -0,0 +1,9 @@
# frozen_string_literal: true
class MergeWorker
include Sidekiq::Worker
def perform(from_account_id, into_account_id)
FeedManager.instance.merge_into_timeline(Account.find(from_account_id), Account.find(into_account_id))
end
end

View File

@ -0,0 +1,9 @@
# frozen_string_literal: true
class UnmergeWorker
include Sidekiq::Worker
def perform(from_account_id, into_account_id)
FeedManager.instance.unmerge_from_timeline(Account.find(from_account_id), Account.find(into_account_id))
end
end