From 4a109ec1ba419575708e3919584b531adf20e89c Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Mon, 29 Nov 2021 07:13:07 +0900 Subject: [PATCH] Fix server graph on admin/tags/:id (#17066) --- app/lib/admin/metrics/measure/tag_servers_measure.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb index 8c3e0551a19..cc064f63f64 100644 --- a/app/lib/admin/metrics/measure/tag_servers_measure.rb +++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb @@ -20,17 +20,20 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base def data sql = <<-SQL.squish SELECT axis.*, ( - SELECT count(*) AS value + SELECT count(distinct accounts.domain) AS value FROM statuses - WHERE statuses.id BETWEEN $1 AND $2 + INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id + INNER JOIN accounts ON statuses.account_id = accounts.id + WHERE statuses_tags.tag_id = $1 + AND statuses.id BETWEEN $2 AND $3 AND date_trunc('day', statuses.created_at)::date = axis.day ) FROM ( - SELECT generate_series(date_trunc('day', $3::timestamp)::date, date_trunc('day', $4::timestamp)::date, ('1 day')::interval) AS day + SELECT generate_series(date_trunc('day', $4::timestamp)::date, date_trunc('day', $5::timestamp)::date, ('1 day')::interval) AS day ) as axis SQL - rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, @start_at], [nil, @end_at]]) + rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:id].to_i], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, @start_at], [nil, @end_at]]) rows.map { |row| { date: row['day'], value: row['value'].to_s } } end