about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-01-13 21:57:24 -0600
committermultiple creatures <dev@multiple-creature.party>2020-01-13 21:57:24 -0600
commit67516a07db44196cc4bb94bf94abe5c6f611cf07 (patch)
treef65b7c79f859329a0438d806e777fa1d7aa7f400 /config
parent1fbe7c340201ddff5232c7931a265136943ffd59 (diff)
add new privacy option to auto-defederate after a given timespan + add options to defederate and/or delete past posts + add `defed_in`/`parent:defed_in`/`thread:defed_in` bangtags + ui indicator for posts marked for auto-defederation
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml2
-rw-r--r--config/locales/simple_form.en.yml5
-rw-r--r--config/sidekiq.yml3
3 files changed, 10 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7f026135f..fbb1dd44e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -885,6 +885,8 @@ en:
     too_soon: The scheduled timeframe must be at least 5 minutes into the future
   destructing_statuses:
     too_soon: The destruction timeframe must be at least 5 minutes into the future
+  defederating_statuses:
+    too_soon: The destruction timeframe must be at least 5 minutes into the future
   sessions:
     activity: Last activity
     browser: Browser
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index aee7ca276..0cab950e9 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -49,6 +49,8 @@ en:
         media_only: Hides text-only posts
         filters_enabled: Enables custom timeline filters which can be configured in the Filters tab.
         monsterfork_api: How much of Monsterfork features should be exposed to clients.  Set to Basic or Vanilla if your Mastodon app is having problems with Monsterfork.
+        setting_roar_lifespan_old: "<strong>This is a destructive operation!</strong><br>Back up your account before saving changes!<br>Will deselect after save"
+        setting_roar_defederate_old: "<strong>This is an irreversible operation!</strong><br>Will deselect after save"
       featured_tag:
         name: 'You might want to use one of these:'
       imports:
@@ -131,6 +133,9 @@ en:
         setting_default_language: Posting language
         setting_default_privacy: Post privacy
         setting_roar_lifespan: Auto-delete new roars after
+        setting_roar_lifespan_old: Include past roars
+        setting_roar_defederate: Auto-defederate new roars after
+        setting_roar_defederate_old: Include past roars
         setting_delayed_roars: Delayed publishing of roars for proofreading
         setting_delayed_for: Delay for
         setting_boost_interval: Automatically space out consecutive boosts
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 89adb59e2..553404cc9 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -13,6 +13,9 @@
   destructing_statuses_scheduler:
     every: '1m'
     class: Scheduler::DestructingStatusesScheduler
+  defederatinging_statuses_scheduler:
+    every: '1m'
+    class: Scheduler::DefederatingStatusesScheduler
   boosts_scheduler:
     every: '1m'
     class: Scheduler::BoostsScheduler