From 4a109ec1ba419575708e3919584b531adf20e89c Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Mon, 29 Nov 2021 07:13:07 +0900 Subject: 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(-) (limited to 'app') diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb index 8c3e0551a..cc064f63f 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 -- cgit From a458b74c7e73fcd55583823231dd8479a8d0b90d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 29 Nov 2021 17:39:40 +0100 Subject: Fix error on trending mailer due to missing constant (#17072) --- app/mailers/admin_mailer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index 0fbd9932d..b23bd1296 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -29,7 +29,7 @@ class AdminMailer < ApplicationMailer @tags = tags @me = recipient @instance = Rails.configuration.x.local_domain - @lowest_trending_tag = Trends.tags.get(true, Trends::Tags::REVIEW_THRESHOLD).last + @lowest_trending_tag = Trends.tags.get(true, Trends.tags.options[:review_threshold]).last locale_for_account(@me) do mail to: @me.user_email, subject: I18n.t('admin_mailer.new_trending_tags.subject', instance: @instance) @@ -40,7 +40,7 @@ class AdminMailer < ApplicationMailer @links = links @me = recipient @instance = Rails.configuration.x.local_domain - @lowest_trending_link = Trends.links.get(true, Trends::Links::REVIEW_THRESHOLD).last + @lowest_trending_link = Trends.links.get(true, Trends.links.options[:review_threshold]).last locale_for_account(@me) do mail to: @me.user_email, subject: I18n.t('admin_mailer.new_trending_links.subject', instance: @instance) -- cgit