mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-10 17:02:11 -05:00
Add --skip-filled-timeline
option to tootctl feed build
to skip half-filled feeds (#33844)
This commit is contained in:
parent
a9643cb7e7
commit
9e164c532f
@ -32,6 +32,15 @@ class FeedManager
|
|||||||
"feed:#{type}:#{id}:#{subtype}"
|
"feed:#{type}:#{id}:#{subtype}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# The number of items in the given timeline
|
||||||
|
# @param [Symbol] type
|
||||||
|
# @param [Integer] id
|
||||||
|
# @param [Symbol] subtype
|
||||||
|
# @return [Integer]
|
||||||
|
def timeline_size(type, id, subtype = nil)
|
||||||
|
redis.zcard(key(type, id, subtype))
|
||||||
|
end
|
||||||
|
|
||||||
# The filter result of the status to a particular feed
|
# The filter result of the status to a particular feed
|
||||||
# @param [Symbol] timeline_type
|
# @param [Symbol] timeline_type
|
||||||
# @param [Status] status
|
# @param [Status] status
|
||||||
|
@ -3,13 +3,21 @@
|
|||||||
class PrecomputeFeedService < BaseService
|
class PrecomputeFeedService < BaseService
|
||||||
include Redisable
|
include Redisable
|
||||||
|
|
||||||
def call(account)
|
def call(account, skip_filled_timelines: false)
|
||||||
FeedManager.instance.populate_home(account)
|
@skip_filled_timelines = skip_filled_timelines
|
||||||
|
|
||||||
|
FeedManager.instance.populate_home(account) unless skip_timeline?(:home, account.id)
|
||||||
|
|
||||||
account.owned_lists.each do |list|
|
account.owned_lists.each do |list|
|
||||||
FeedManager.instance.populate_list(list)
|
FeedManager.instance.populate_list(list) unless skip_timeline?(:list, list.id)
|
||||||
end
|
end
|
||||||
ensure
|
ensure
|
||||||
redis.del("account:#{account.id}:regeneration")
|
redis.del("account:#{account.id}:regeneration")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def skip_timeline?(type, id)
|
||||||
|
@skip_filled_timelines && FeedManager.instance.timeline_size(type, id) * 2 > FeedManager::MAX_ITEMS
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
@ -11,17 +11,21 @@ module Mastodon::CLI
|
|||||||
option :concurrency, type: :numeric, default: 5, aliases: [:c]
|
option :concurrency, type: :numeric, default: 5, aliases: [:c]
|
||||||
option :verbose, type: :boolean, aliases: [:v]
|
option :verbose, type: :boolean, aliases: [:v]
|
||||||
option :dry_run, type: :boolean, default: false
|
option :dry_run, type: :boolean, default: false
|
||||||
|
option :skip_filled_timelines
|
||||||
desc 'build [USERNAME]', 'Build home and list feeds for one or all users'
|
desc 'build [USERNAME]', 'Build home and list feeds for one or all users'
|
||||||
long_desc <<-LONG_DESC
|
long_desc <<-LONG_DESC
|
||||||
Build home and list feeds that are stored in Redis from the database.
|
Build home and list feeds that are stored in Redis from the database.
|
||||||
|
|
||||||
|
With the --skip-filled-timelines, timelines which contain more than half
|
||||||
|
the maximum number of posts will be skipped.
|
||||||
|
|
||||||
With the --all option, all active users will be processed.
|
With the --all option, all active users will be processed.
|
||||||
Otherwise, a single user specified by USERNAME.
|
Otherwise, a single user specified by USERNAME.
|
||||||
LONG_DESC
|
LONG_DESC
|
||||||
def build(username = nil)
|
def build(username = nil)
|
||||||
if options[:all] || username.nil?
|
if options[:all] || username.nil?
|
||||||
processed, = parallelize_with_progress(active_user_accounts) do |account|
|
processed, = parallelize_with_progress(active_user_accounts) do |account|
|
||||||
PrecomputeFeedService.new.call(account) unless dry_run?
|
PrecomputeFeedService.new.call(account, skip_filled_timelines: options[:skip_filled_timelines]) unless dry_run?
|
||||||
end
|
end
|
||||||
|
|
||||||
say("Regenerated feeds for #{processed} accounts #{dry_run_mode_suffix}", :green, true)
|
say("Regenerated feeds for #{processed} accounts #{dry_run_mode_suffix}", :green, true)
|
||||||
@ -30,7 +34,7 @@ module Mastodon::CLI
|
|||||||
|
|
||||||
fail_with_message 'No such account' if account.nil?
|
fail_with_message 'No such account' if account.nil?
|
||||||
|
|
||||||
PrecomputeFeedService.new.call(account) unless dry_run?
|
PrecomputeFeedService.new.call(account, skip_filled_timelines: options[:skip_filled_timelines]) unless dry_run?
|
||||||
|
|
||||||
say("OK #{dry_run_mode_suffix}", :green, true)
|
say("OK #{dry_run_mode_suffix}", :green, true)
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user