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

Fix weekly usage not being displayed correctly in hashtag admin UI (#11524)

Browse Source 
Fix percentages in usage breakdown having too many digits

Change trending hashtags to only ask for review if a hashtag enters
the top 3 position in the set, since it's the only items shown in
the default web UI
This commit is contained in:
Eugen Rochko 2019-08-08 23:03:28 +02:00 committed by GitHub
parent 41aac1ba3a
commit 898dacf83e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/tags_controller.rb
View File

@ -71,7 +71,7 @@ module Admin
now = Time.now.utc.beginning_of_day.to_date now = Time.now.utc.beginning_of_day.to_date
(Date.commercial(now.cwyear, now.cweek)..now).map do |date| (Date.commercial(now.cwyear, now.cweek)..now).map do |date|
date.to_time.utc.beginning_of_day.to_i date.to_time(:utc).beginning_of_day.to_i
end end
end end
end end

3
app/models/trending_tags.rb
View File

@ -6,6 +6,7 @@ class TrendingTags
EXPIRE_TRENDS_AFTER = 1.day.seconds EXPIRE_TRENDS_AFTER = 1.day.seconds
THRESHOLD = 5 THRESHOLD = 5
LIMIT = 10 LIMIT = 10
REVIEW_THRESHOLD = 3
class << self class << self
include Redisable include Redisable
@ -60,7 +61,7 @@ class TrendingTags
old_rank = redis.zrevrank(key, tag.id) old_rank = redis.zrevrank(key, tag.id)
redis.zadd(key, score, tag.id) redis.zadd(key, score, tag.id)
request_review!(tag) if (old_rank.nil? || old_rank > LIMIT) && redis.zrevrank(key, tag.id) <= LIMIT && !tag.trendable? && tag.requires_review? && !tag.requested_review? request_review!(tag) if (old_rank.nil? || old_rank > REVIEW_THRESHOLD) && redis.zrevrank(key, tag.id) <= REVIEW_THRESHOLD && !tag.trendable? && tag.requires_review? && !tag.requested_review?
end end
redis.expire(key, EXPIRE_TRENDS_AFTER) redis.expire(key, EXPIRE_TRENDS_AFTER)

2
app/views/admin/tags/show.html.haml
View File

@ -41,5 +41,5 @@
- @usage_by_domain.each do |(domain, count)| - @usage_by_domain.each do |(domain, count)|
%tr %tr
%th= domain || site_hostname %th= domain || site_hostname
%td= "#{number_with_delimiter((count.to_f / @tag.history[0][:uses].to_f) * 100)}%" %td= number_to_percentage((count / @tag.history[0][:uses].to_f) * 100)
%td= number_with_delimiter count %td= number_with_delimiter count