Browse Source

Fix wrong percentages in admin UI for hashtag usage breakdown (#11714)

master
Eugen Rochko 5 years ago
committed by GitHub
parent
commit
47584180d8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
  1. +2
    -1
      app/controllers/admin/tags_controller.rb
  2. +3
    -1
      app/views/admin/tags/show.html.haml

+ 2
- 1
app/controllers/admin/tags_controller.rb View File

@ -37,7 +37,8 @@ module Admin
def set_usage_by_domain
@usage_by_domain = @tag.statuses
.where(visibility: :public)
.with_public_visibility
.excluding_silenced_accounts
.where(Status.arel_table[:id].gteq(Mastodon::Snowflake.id_at(Time.now.utc.beginning_of_day)))
.joins(:account)
.group('accounts.domain')

+ 3
- 1
app/views/admin/tags/show.html.haml View File

@ -38,8 +38,10 @@
.table-wrapper
%table.table
%tbody
- total = @usage_by_domain.sum(&:statuses_count).to_f
- @usage_by_domain.each do |(domain, count)|
%tr
%th= domain || site_hostname
%td= number_to_percentage((count / @tag.history[0][:uses].to_f) * 100)
%td= number_to_percentage((count / total) * 100, precision: 1)
%td= number_with_delimiter count

Loading…
Cancel
Save