Use a redis-cached feed for the DM timeline
This commit is contained in:
@@ -107,9 +107,9 @@ class BatchedRemoveStatusService < BaseService
|
||||
payload = @json_payloads[status.id]
|
||||
redis.pipelined do
|
||||
@mentions[status.id].each do |mention|
|
||||
redis.publish("timeline:direct:#{mention.account.id}", payload) if mention.account.local?
|
||||
FeedManager.instance.unpush_from_direct(mention.account, status) if mention.account.local?
|
||||
end
|
||||
redis.publish("timeline:direct:#{status.account.id}", payload) if status.account.local?
|
||||
FeedManager.instance.unpush_from_direct(status.account, status) if status.account.local?
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@ class FanOutOnWriteService < BaseService
|
||||
def deliver_to_self(status)
|
||||
Rails.logger.debug "Delivering status #{status.id} to author"
|
||||
FeedManager.instance.push_to_home(status.account, status)
|
||||
FeedManager.instance.push_to_direct(status.account, status) if status.direct_visibility?
|
||||
end
|
||||
|
||||
def deliver_to_followers(status)
|
||||
@@ -98,11 +99,9 @@ class FanOutOnWriteService < BaseService
|
||||
def deliver_to_direct_timelines(status)
|
||||
Rails.logger.debug "Delivering status #{status.id} to direct timelines"
|
||||
|
||||
status.mentions.includes(:account).each do |mention|
|
||||
Redis.current.publish("timeline:direct:#{mention.account.id}", @payload) if mention.account.local?
|
||||
FeedInsertWorker.push_bulk(status.mentions.includes(:account).map(&:account).select { |mentioned_account| mentioned_account.local? }) do |account|
|
||||
[status.id, account.id, :direct]
|
||||
end
|
||||
|
||||
Redis.current.publish("timeline:direct:#{status.account.id}", @payload) if status.account.local?
|
||||
end
|
||||
|
||||
def deliver_to_own_conversation(status)
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
class PrecomputeFeedService < BaseService
|
||||
def call(account)
|
||||
FeedManager.instance.populate_feed(account)
|
||||
FeedManager.instance.populate_direct_feed(account)
|
||||
ensure
|
||||
Redis.current.del("account:#{account.id}:regeneration")
|
||||
end
|
||||
|
||||
@@ -48,6 +48,7 @@ class RemoveStatusService < BaseService
|
||||
|
||||
def remove_from_self
|
||||
FeedManager.instance.unpush_from_home(@account, @status)
|
||||
FeedManager.instance.unpush_from_direct(@account, @status) if @status.direct_visibility?
|
||||
end
|
||||
|
||||
def remove_from_followers
|
||||
@@ -159,9 +160,8 @@ class RemoveStatusService < BaseService
|
||||
|
||||
def remove_from_direct
|
||||
@mentions.each do |mention|
|
||||
Redis.current.publish("timeline:direct:#{mention.account.id}", @payload) if mention.account.local?
|
||||
FeedManager.instance.unpush_from_direct(mention.account, @status) if mention.account.local?
|
||||
end
|
||||
Redis.current.publish("timeline:direct:#{@account.id}", @payload) if @account.local?
|
||||
end
|
||||
|
||||
def lock_options
|
||||
|
||||
Reference in New Issue
Block a user