From 0d47437c211c2db2196b8d5441ec8cf418485ac4 Mon Sep 17 00:00:00 2001 From: "Isa S." Date: Thu, 21 Nov 2024 17:38:54 +0100 Subject: [PATCH 1/4] Add IP retention question to setup rake task --- lib/tasks/mastodon.rake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index e1e2dd8194..40a0e567e3 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -356,6 +356,16 @@ namespace :mastodon do prompt.say "\n" + ip_retention_period_days = prompt.ask('How long should we store IP addresses in the database, for moderation purposes? (in days)') do |q| + q.required true + q.default 31 + q.convert :int + end + + env['IP_RETENTION_PERIOD'] = (ip_retention_period_days * 86400) + + prompt.say "\n" + loop do if prompt.yes?('Do you want to send e-mails from localhost?', default: false) env['SMTP_SERVER'] = 'localhost' From 637bea5d32f59b231a86e27670aaa5a0d50c2099 Mon Sep 17 00:00:00 2001 From: "Isa S." Date: Thu, 21 Nov 2024 17:42:45 +0100 Subject: [PATCH 2/4] Align IP retention rake with default of 1 year --- lib/tasks/mastodon.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 40a0e567e3..e6da7f1ff6 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -358,7 +358,7 @@ namespace :mastodon do ip_retention_period_days = prompt.ask('How long should we store IP addresses in the database, for moderation purposes? (in days)') do |q| q.required true - q.default 31 + q.default 365 q.convert :int end From a0fba97d79a0a51e4e3a877e9ed9c8a20599da33 Mon Sep 17 00:00:00 2001 From: "Isa S." Date: Thu, 21 Nov 2024 17:57:23 +0100 Subject: [PATCH 3/4] Fix linting issue --- lib/tasks/mastodon.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index e6da7f1ff6..89f74aa33b 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -362,7 +362,7 @@ namespace :mastodon do q.convert :int end - env['IP_RETENTION_PERIOD'] = (ip_retention_period_days * 86400) + env['IP_RETENTION_PERIOD'] = (ip_retention_period_days * 86_400) prompt.say "\n" From 1a47d339a893521f85f9b99b9d1f9ff0e5ee3a39 Mon Sep 17 00:00:00 2001 From: "Isa S." Date: Thu, 21 Nov 2024 18:17:09 +0100 Subject: [PATCH 4/4] Cleaner way of converting days to seconds --- lib/tasks/mastodon.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 89f74aa33b..57ec11f864 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -362,7 +362,7 @@ namespace :mastodon do q.convert :int end - env['IP_RETENTION_PERIOD'] = (ip_retention_period_days * 86_400) + env['IP_RETENTION_PERIOD'] = ip_retention_period_days.days.to_i prompt.say "\n"