Commit 3b13bb50 authored by mgabdev's avatar mgabdev

Updates to FanOutOnWriteService, FeedInsertWorker

• Updates:
- to FanOutOnWriteService, FeedInsertWorker
parent 06125bf8
......@@ -6,25 +6,10 @@ class FanOutOnWriteService < BaseService
def call(status)
raise GabSocial::RaceConditionError if status.visibility.nil?
render_anonymous_payload(status)
if status.direct_visibility?
deliver_to_own_conversation(status)
elsif status.limited_visibility?
deliver_to_mentioned_followers(status)
if status.direct_visibility? || status.limited_visibility?
#
else
deliver_to_self(status) if status.account.local?
deliver_to_followers(status)
deliver_to_lists(status)
end
return if status.account.silenced? || !status.public_visibility? || status.reblog?
return if status.reply? && status.in_reply_to_account_id != status.account_id
if status.account.is_pro || status.account.is_donor || status.account.is_investor || status.account.is_verified
deliver_to_pro(status)
end
end
......@@ -35,46 +20,4 @@ class FanOutOnWriteService < BaseService
FeedManager.instance.push_to_home(status.account, status)
end
def deliver_to_followers(status)
Rails.logger.debug "Delivering status #{status.id} to followers"
status.account.followers_for_local_distribution.select(:id).reorder(nil).find_in_batches do |followers|
FeedInsertWorker.push_bulk(followers) do |follower|
[status.id, follower.id, :home]
end
end
end
def deliver_to_lists(status)
Rails.logger.debug "Delivering status #{status.id} to lists"
status.account.lists_for_local_distribution.select(:id).reorder(nil).find_in_batches do |lists|
FeedInsertWorker.push_bulk(lists) do |list|
[status.id, list.id, :list]
end
end
end
def deliver_to_mentioned_followers(status)
Rails.logger.debug "Delivering status #{status.id} to limited followers"
FeedInsertWorker.push_bulk(status.mentions.includes(:account).map(&:account).select { |mentioned_account| mentioned_account.local? && mentioned_account.following?(status.account) }) do |follower|
[status.id, follower.id, :home]
end
end
def render_anonymous_payload(status)
@payload = InlineRenderer.render(status, nil, :status)
@payload = Oj.dump(event: :update, payload: @payload)
end
def deliver_to_pro(status)
Rails.logger.debug "Delivering status #{status.id} to pro timeline"
Redis.current.publish('timeline:pro', @payload)
end
def deliver_to_own_conversation(status)
AccountConversation.add_status(status.account, status)
end
end
......@@ -10,9 +10,6 @@ class FeedInsertWorker
case @type
when :home
@follower = Account.find(id)
when :list
@list = List.find(id)
@follower = @list.account
end
check_and_insert
......@@ -36,8 +33,6 @@ class FeedInsertWorker
case @type
when :home
FeedManager.instance.push_to_home(@follower, @status)
when :list
FeedManager.instance.push_to_list(@list, @status)
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment