From 76bdc01aeea1c859374ed68465e8eda9e8cf3490 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 1 Sep 2019 19:44:05 +0200
Subject: [PATCH] Fix wrong percentages in admin UI for hashtag usage breakdown
(#11714)
---
app/controllers/admin/tags_controller.rb | 3 ++-
app/views/admin/tags/show.html.haml | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 39aca2a4b3..25d9b7d3d2 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -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')
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index c3779d48c4..f9677874a7 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -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