AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

Fix dangling language-specific trends (#17997)

Browse source 
- Change score half-life for trending statuses from 2 to 6 hours
- Change score threshold for trimming old items from 1 to 0.3
This commit is contained in:
Eugen Rochko 2022-04-08 19:35:31 +02:00 committed by GitHub
parent a39bf04fe6
commit 68273a7c6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/trends/base.rb
View file

@ -65,8 +65,8 @@ class Trends::Base
end end
def trim_older_items def trim_older_items
redis.zremrangebyscore("#{key_prefix}:all", '-inf', '(1') redis.zremrangebyscore("#{key_prefix}:all", '-inf', '(0.3')
redis.zremrangebyscore("#{key_prefix}:allowed", '-inf', '(1') redis.zremrangebyscore("#{key_prefix}:allowed", '-inf', '(0.3')
end end
def score_at_rank(rank) def score_at_rank(rank)

5
app/models/trends/links.rb
View file

@ -30,7 +30,6 @@ class Trends::Links < Trends::Base
def refresh(at_time = Time.now.utc) def refresh(at_time = Time.now.utc)
preview_cards = PreviewCard.where(id: (recently_used_ids(at_time) + currently_trending_ids(false, -1)).uniq) preview_cards = PreviewCard.where(id: (recently_used_ids(at_time) + currently_trending_ids(false, -1)).uniq)
calculate_scores(preview_cards, at_time) calculate_scores(preview_cards, at_time)
trim_older_items
end end
def request_review def request_review
@ -101,6 +100,8 @@ class Trends::Links < Trends::Base
}) })
end end
trim_older_items
# Clean up localized sets by calculating the intersection with the main # Clean up localized sets by calculating the intersection with the main
# set. We do this instead of just deleting the localized sets to avoid # set. We do this instead of just deleting the localized sets to avoid
# having moments where the API returns empty results # having moments where the API returns empty results
@ -108,7 +109,7 @@ class Trends::Links < Trends::Base
redis.pipelined do redis.pipelined do
Trends.available_locales.each do |locale| Trends.available_locales.each do |locale|
redis.zinterstore("#{key_prefix}:all:#{locale}", ["#{key_prefix}:all:#{locale}", "#{key_prefix}:all"], aggregate: 'max') redis.zinterstore("#{key_prefix}:all:#{locale}", ["#{key_prefix}:all:#{locale}", "#{key_prefix}:all"], aggregate: 'max')
redis.zinterstore("#{key_prefix}:allowed:#{locale}", ["#{key_prefix}:allowed:#{locale}", "#{key_prefix}:all"], aggregate: 'max') redis.zinterstore("#{key_prefix}:allowed:#{locale}", ["#{key_prefix}:allowed:#{locale}", "#{key_prefix}:allowed"], aggregate: 'max')
end end
end end
end end

7
app/models/trends/statuses.rb
View file

@ -6,7 +6,7 @@ class Trends::Statuses < Trends::Base
self.default_options = { self.default_options = {
threshold: 5, threshold: 5,
review_threshold: 3, review_threshold: 3,
score_halflife: 2.hours.freeze, score_halflife: 6.hours.freeze,
} }
class Query < Trends::Query class Query < Trends::Query
@ -48,7 +48,6 @@ class Trends::Statuses < Trends::Base
def refresh(at_time = Time.now.utc) def refresh(at_time = Time.now.utc)
statuses = Status.where(id: (recently_used_ids(at_time) + currently_trending_ids(false, -1)).uniq).includes(:account, :media_attachments) statuses = Status.where(id: (recently_used_ids(at_time) + currently_trending_ids(false, -1)).uniq).includes(:account, :media_attachments)
calculate_scores(statuses, at_time) calculate_scores(statuses, at_time)
trim_older_items
end end
def request_review def request_review
@ -111,13 +110,15 @@ class Trends::Statuses < Trends::Base
}) })
end end
trim_older_items
# Clean up localized sets by calculating the intersection with the main # Clean up localized sets by calculating the intersection with the main
# set. We do this instead of just deleting the localized sets to avoid # set. We do this instead of just deleting the localized sets to avoid
# having moments where the API returns empty results # having moments where the API returns empty results
Trends.available_locales.each do |locale| Trends.available_locales.each do |locale|
redis.zinterstore("#{key_prefix}:all:#{locale}", ["#{key_prefix}:all:#{locale}", "#{key_prefix}:all"], aggregate: 'max') redis.zinterstore("#{key_prefix}:all:#{locale}", ["#{key_prefix}:all:#{locale}", "#{key_prefix}:all"], aggregate: 'max')
redis.zinterstore("#{key_prefix}:allowed:#{locale}", ["#{key_prefix}:allowed:#{locale}", "#{key_prefix}:all"], aggregate: 'max') redis.zinterstore("#{key_prefix}:allowed:#{locale}", ["#{key_prefix}:allowed:#{locale}", "#{key_prefix}:allowed"], aggregate: 'max')
end end
end end
end end