paravielfalt/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Activity Actions

Fix server graph on admin/tags/:id (#17066)

Browse source
This commit is contained in:
Jeong Arm 2021-11-29 07:13:07 +09:00 committed by GitHub
parent af93d938d4
commit 4a109ec1ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/lib/admin/metrics/measure/tag_servers_measure.rb
View file

@ -20,17 +20,20 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
def data def data
sql = <<-SQL.squish sql = <<-SQL.squish
SELECT axis.*, ( SELECT axis.*, (
SELECT count(*) AS value SELECT count(distinct accounts.domain) AS value
FROM statuses 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 AND date_trunc('day', statuses.created_at)::date = axis.day
) )
FROM ( 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 ) as axis
SQL 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 } } rows.map { |row| { date: row['day'], value: row['value'].to_s } }
end end