erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Consolidate time periods methods into base measure (#30757)

Browse source
This commit is contained in:
Matt Jankowski 2024-06-19 04:45:47 -04:00 committed by GitHub
parent 80743e0e7f
commit a8b3d2e4e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 2 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/lib/admin/metrics/measure/active_users_measure.rb
View file

@ -22,12 +22,4 @@ class Admin::Metrics::Measure::ActiveUsersMeasure < Admin::Metrics::Measure::Bas
def activity_tracker
@activity_tracker ||= ActivityTracker.new('activity:logins', :unique)
end
def time_period
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
end

4
app/lib/admin/metrics/measure/base_measure.rb
View file

@ -86,11 +86,11 @@ class Admin::Metrics::Measure::BaseMeasure
end
def time_period
(@start_at..@end_at)
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at - length_of_period)..(@end_at - length_of_period))
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
def length_of_period

8
app/lib/admin/metrics/measure/instance_accounts_measure.rb
View file

@ -48,14 +48,6 @@ class Admin::Metrics::Measure::InstanceAccountsMeasure < Admin::Metrics::Measure
SQL
end
def time_period
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
def params
@params.permit(:domain, :include_subdomains)
end

8
app/lib/admin/metrics/measure/instance_followers_measure.rb
View file

@ -49,14 +49,6 @@ class Admin::Metrics::Measure::InstanceFollowersMeasure < Admin::Metrics::Measur
SQL
end
def time_period
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
def params
@params.permit(:domain, :include_subdomains)
end

8
app/lib/admin/metrics/measure/instance_follows_measure.rb
View file

@ -49,14 +49,6 @@ class Admin::Metrics::Measure::InstanceFollowsMeasure < Admin::Metrics::Measure:
SQL
end
def time_period
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
def params
@params.permit(:domain, :include_subdomains)
end

8
app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
View file

@ -58,14 +58,6 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
SQL
end
def time_period
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
def params
@params.permit(:domain, :include_subdomains)
end

8
app/lib/admin/metrics/measure/instance_reports_measure.rb
View file

@ -49,14 +49,6 @@ class Admin::Metrics::Measure::InstanceReportsMeasure < Admin::Metrics::Measure:
SQL
end
def time_period
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
def params
@params.permit(:domain, :include_subdomains)
end

8
app/lib/admin/metrics/measure/instance_statuses_measure.rb
View file

@ -58,14 +58,6 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure
Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
end
def time_period
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
def params
@params.permit(:domain, :include_subdomains)
end

8
app/lib/admin/metrics/measure/interactions_measure.rb
View file

@ -22,12 +22,4 @@ class Admin::Metrics::Measure::InteractionsMeasure < Admin::Metrics::Measure::Ba
def activity_tracker
@activity_tracker ||= ActivityTracker.new('activity:interactions', :basic)
end
def time_period
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
end

8
app/lib/admin/metrics/measure/tag_accounts_measure.rb
View file

@ -27,14 +27,6 @@ class Admin::Metrics::Measure::TagAccountsMeasure < Admin::Metrics::Measure::Bas
@tag ||= Tag.find(params[:id])
end
def time_period
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
def params
@params.permit(:id)
end

8
app/lib/admin/metrics/measure/tag_uses_measure.rb
View file

@ -27,14 +27,6 @@ class Admin::Metrics::Measure::TagUsesMeasure < Admin::Metrics::Measure::BaseMea
@tag ||= Tag.find(params[:id])
end
def time_period
(@start_at.to_date..@end_at.to_date)
end
def previous_time_period
((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
end
def params
@params.permit(:id)
end