From 67516a07db44196cc4bb94bf94abe5c6f611cf07 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Mon, 13 Jan 2020 21:57:24 -0600
Subject: 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

---
 app/controllers/api/v1/statuses_controller.rb      | 2 ++
 app/controllers/settings/preferences_controller.rb | 7 +++++++
 2 files changed, 9 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index c3f2422ce..255c48e62 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -53,6 +53,7 @@ class Api::V1::StatusesController < Api::BaseController
                                          visibility: status_params[:visibility],
                                          scheduled_at: status_params[:scheduled_at],
                                          delete_after: status_params[:delete_after],
+                                         defederate_after: status_params[:defederate_after],
                                          sharekey: status_params[:sharekey],
                                          application: doorkeeper_token.application,
                                          poll: status_params[:poll],
@@ -100,6 +101,7 @@ class Api::V1::StatusesController < Api::BaseController
       :sharekey,
       :scheduled_at,
       :delete_after,
+      :defederate_after,
       :content_type,
       media_ids: [],
       poll: [
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 8573624f2..295fc3129 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -12,6 +12,12 @@ class Settings::PreferencesController < Settings::BaseController
   def update
     user_settings.update(user_settings_params.to_h)
 
+    MarkExpiredStatusesWorker.perform_async(
+      current_account.id,
+      truthy_param?(:setting_defederate_old),
+      truthy_param?(:setting_lifespan_old)
+    )
+
     if current_user.update(user_params)
       I18n.locale = current_user.locale
       toggle_filters
@@ -85,6 +91,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_max_public_history,
       :setting_max_public_access,
       :setting_roar_lifespan,
+      :setting_roar_defederate,
       :setting_delayed_roars,
       :setting_delayed_for,
       :setting_boost_interval,
-- 
cgit