luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-28 17:43:27 +00:00
Code Issues Projects Releases Wiki Activity

Improve feed regeneration

Browse source
This commit is contained in:
Eugen Rochko 2016-11-08 02:08:32 +01:00
parent 096bfbad96
commit bb4d1eb2e8
5 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/lib/feed_manager.rb
View file

@ -76,8 +76,8 @@ class FeedManager
end end
def filter_from_mentions?(status, receiver) def filter_from_mentions?(status, receiver)
should_filter = false should_filter = receiver.id == status.account_id # Filter if I'm mentioning myself
should_filter = receiver.blocking?(status.account) # Filter if it's from someone I blocked should_filter = should_filter || receiver.blocking?(status.account) # or it's from someone I blocked
should_filter should_filter
end end
end end

3
app/models/feed.rb
View file

@ -11,7 +11,8 @@ class Feed
# If we're after most recent items and none are there, we need to precompute the feed # If we're after most recent items and none are there, we need to precompute the feed
if unhydrated.empty? && max_id == '+inf' && since_id == '-inf' if unhydrated.empty? && max_id == '+inf' && since_id == '-inf'
PrecomputeFeedService.new.call(@type, @account, limit) RegenerationWorker.perform_async(@account.id, @type)
Status.send("as_#{@type}_timeline", @account).paginate_by_max_id(limit, nil, nil)
else else
status_map = Status.where(id: unhydrated).with_includes.with_counters.map { |status| [status.id, status] }.to_h status_map = Status.where(id: unhydrated).with_includes.with_counters.map { |status| [status.id, status] }.to_h
unhydrated.map { |id| status_map[id] }.compact unhydrated.map { |id| status_map[id] }.compact

2
app/services/fan_out_on_write_service.rb
View file

@ -33,7 +33,7 @@ class FanOutOnWriteService < BaseService
status.mentions.includes(:account).each do |mention| status.mentions.includes(:account).each do |mention|
mentioned_account = mention.account mentioned_account = mention.account
next if !mentioned_account.local? || mentioned_account.id == status.account_id || FeedManager.instance.filter?(:mentions, status, mentioned_account) next if !mentioned_account.local? || FeedManager.instance.filter?(:mentions, status, mentioned_account)
FeedManager.instance.push(:mentions, mentioned_account, status) FeedManager.instance.push(:mentions, mentioned_account, status)
end end
end end

10
app/services/precompute_feed_service.rb
View file

@ -2,17 +2,13 @@ class PrecomputeFeedService < BaseService
# Fill up a user's home/mentions feed from DB and return a subset # Fill up a user's home/mentions feed from DB and return a subset
# @param [Symbol] type :home or :mentions # @param [Symbol] type :home or :mentions
# @param [Account] account # @param [Account] account
# @return [Array] def call(type, account)
def call(type, account, limit)
instant_return = [] instant_return = []
Status.send("as_#{type}_timeline", account).order('id desc').limit(FeedManager::MAX_ITEMS).find_each do |status| Status.send("as_#{type}_timeline", account).limit(FeedManager::MAX_ITEMS).each do |status|
next if FeedManager.instance.filter?(type, status, account) next if FeedManager.instance.filter?(type, status, account)
redis.zadd(FeedManager.instance.key(type, account.id), status.id, status.id) redis.zadd(FeedManager.instance.key(type, account.id), status.id, status.reblog? ? status.reblog_of_id : status.id)
instant_return << status unless instant_return.size > limit
end end
instant_return
end end
private private

7
app/workers/regeneration_worker.rb Normal file
View file

@ -0,0 +1,7 @@
class RegenerationWorker
include Sidekiq::Worker
def perform(account_id, timeline_type)
PrecomputeFeedService.new.call(timeline_type, Account.find(account_id))
end
end