tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix trends returning less results per page when filtered in REST API (#17996)

Browse Source 
- 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:
Eugen Rochko
2022-04-08 17:10:53 +02:00
committed by GitHub
parent 6b72641641
commit fd9a9b07c2
5 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/admin/trends/links/_preview_card.html.haml
View File

@ -18,9 +18,9 @@
= 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?
•

4
app/views/admin/trends/statuses/_status.html.haml
View File

@ -25,9 +25,9 @@
- if status.trendable? && !status.account.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?
•
= t('admin.trends.pending_review')