Fix trends returning less results per page when filtered in REST API (#17996)
- Change filtering and pagination to occur in SQL instead of Redis - Change rank/score displayed on trends in admin UI to be locale-specific
This commit is contained in:
parent
6b72641641
commit
fd9a9b07c2
|
@ -37,12 +37,12 @@ class Trends::Base
|
||||||
Trends::Query.new(key_prefix, klass)
|
Trends::Query.new(key_prefix, klass)
|
||||||
end
|
end
|
||||||
|
|
||||||
def score(id)
|
def score(id, locale: nil)
|
||||||
redis.zscore("#{key_prefix}:all", id) || 0
|
redis.zscore([key_prefix, 'all', locale].compact.join(':'), id) || 0
|
||||||
end
|
end
|
||||||
|
|
||||||
def rank(id)
|
def rank(id, locale: nil)
|
||||||
redis.zrevrank("#{key_prefix}:allowed", id)
|
redis.zrevrank([key_prefix, 'allowed', locale].compact.join(':'), id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def currently_trending_ids(allowed, limit)
|
def currently_trending_ids(allowed, limit)
|
||||||
|
|
|
@ -14,8 +14,8 @@ class Trends::Query
|
||||||
@records = []
|
@records = []
|
||||||
@loaded = false
|
@loaded = false
|
||||||
@allowed = false
|
@allowed = false
|
||||||
@limit = -1
|
@limit = nil
|
||||||
@offset = 0
|
@offset = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def allowed!
|
def allowed!
|
||||||
|
@ -73,7 +73,10 @@ class Trends::Query
|
||||||
if tmp_ids.empty?
|
if tmp_ids.empty?
|
||||||
klass.none
|
klass.none
|
||||||
else
|
else
|
||||||
klass.joins("join unnest(array[#{tmp_ids.join(',')}]) with ordinality as x (id, ordering) on #{klass.table_name}.id = x.id").reorder('x.ordering')
|
scope = klass.joins("join unnest(array[#{tmp_ids.join(',')}]) with ordinality as x (id, ordering) on #{klass.table_name}.id = x.id").reorder('x.ordering')
|
||||||
|
scope = scope.offset(@offset) if @offset.present?
|
||||||
|
scope = scope.limit(@limit) if @limit.present?
|
||||||
|
scope
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -93,7 +96,7 @@ class Trends::Query
|
||||||
end
|
end
|
||||||
|
|
||||||
def ids
|
def ids
|
||||||
redis.zrevrange(key, @offset, @limit.positive? ? @limit - 1 : @limit).map(&:to_i)
|
redis.zrevrange(key, 0, -1).map(&:to_i)
|
||||||
end
|
end
|
||||||
|
|
||||||
def perform_queries
|
def perform_queries
|
||||||
|
|
|
@ -22,25 +22,11 @@ class Trends::Statuses < Trends::Base
|
||||||
private
|
private
|
||||||
|
|
||||||
def apply_scopes(scope)
|
def apply_scopes(scope)
|
||||||
scope.includes(:account)
|
if @account.nil?
|
||||||
end
|
scope
|
||||||
|
else
|
||||||
def perform_queries
|
scope.not_excluded_by_account(@account).not_domain_blocked_by_account(@account)
|
||||||
return super if @account.nil?
|
end
|
||||||
|
|
||||||
statuses = super
|
|
||||||
account_ids = statuses.map(&:account_id)
|
|
||||||
account_domains = statuses.map(&:account_domain)
|
|
||||||
|
|
||||||
preloaded_relations = {
|
|
||||||
blocking: Account.blocking_map(account_ids, @account.id),
|
|
||||||
blocked_by: Account.blocked_by_map(account_ids, @account.id),
|
|
||||||
muting: Account.muting_map(account_ids, @account.id),
|
|
||||||
following: Account.following_map(account_ids, @account.id),
|
|
||||||
domain_blocking_by_domain: Account.domain_blocking_map_by_domain(account_domains, @account.id),
|
|
||||||
}
|
|
||||||
|
|
||||||
statuses.reject { |status| StatusFilter.new(status, @account, preloaded_relations).filtered? }
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -18,9 +18,9 @@
|
||||||
|
|
||||||
= t('admin.trends.links.shared_by_over_week', count: preview_card.history.reduce(0) { |sum, day| sum + day.accounts })
|
= t('admin.trends.links.shared_by_over_week', count: preview_card.history.reduce(0) { |sum, day| sum + day.accounts })
|
||||||
|
|
||||||
- if preview_card.trendable? && (rank = Trends.links.rank(preview_card.id))
|
- if preview_card.trendable? && (rank = Trends.links.rank(preview_card.id, locale: params[:locale].presence))
|
||||||
•
|
•
|
||||||
%abbr{ title: t('admin.trends.tags.current_score', score: Trends.links.score(preview_card.id)) }= t('admin.trends.tags.trending_rank', rank: rank + 1)
|
%abbr{ title: t('admin.trends.tags.current_score', score: Trends.links.score(preview_card.id, locale: params[:locale].presence)) }= t('admin.trends.tags.trending_rank', rank: rank + 1)
|
||||||
|
|
||||||
- if preview_card.decaying?
|
- if preview_card.decaying?
|
||||||
•
|
•
|
||||||
|
|
|
@ -25,9 +25,9 @@
|
||||||
- if status.trendable? && !status.account.discoverable?
|
- if status.trendable? && !status.account.discoverable?
|
||||||
•
|
•
|
||||||
= t('admin.trends.statuses.not_discoverable')
|
= t('admin.trends.statuses.not_discoverable')
|
||||||
- if status.trendable? && (rank = Trends.statuses.rank(status.id))
|
- if status.trendable? && (rank = Trends.statuses.rank(status.id, locale: params[:locale].presence))
|
||||||
•
|
•
|
||||||
%abbr{ title: t('admin.trends.tags.current_score', score: Trends.statuses.score(status.id)) }= t('admin.trends.tags.trending_rank', rank: rank + 1)
|
%abbr{ title: t('admin.trends.tags.current_score', score: Trends.statuses.score(status.id, locale: params[:locale].presence)) }= t('admin.trends.tags.trending_rank', rank: rank + 1)
|
||||||
- elsif status.requires_review?
|
- elsif status.requires_review?
|
||||||
•
|
•
|
||||||
= t('admin.trends.pending_review')
|
= t('admin.trends.pending_review')
|
||||||
|
|
Loading…
Reference in New Issue