about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-07-23 16:48:08 -0500
committermultiple creatures <dev@multiple-creature.party>2019-07-23 16:48:08 -0500
commit3862f48c34a00691a12c6002abd88b088cf7c13e (patch)
treef1d5d2299de3d470816300221d3dba6ac8ecc30c /app/controllers
parent2a6ccce070277c8c278a2e8403f45394eec06f91 (diff)
add self-destructing roars & `live`/`lifespan` bangtags
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api/v1/statuses_controller.rb2
-rw-r--r--app/controllers/settings/preferences_controller.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index a9728f997..305e8d113 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -52,6 +52,7 @@ class Api::V1::StatusesController < Api::BaseController
                                          spoiler_text: status_params[:spoiler_text],
                                          visibility: status_params[:visibility],
                                          scheduled_at: status_params[:scheduled_at],
+                                         delete_after: status_params[:delete_after],
                                          sharekey: status_params[:sharekey],
                                          application: doorkeeper_token.application,
                                          poll: status_params[:poll],
@@ -92,6 +93,7 @@ class Api::V1::StatusesController < Api::BaseController
       :visibility,
       :sharekey,
       :scheduled_at,
+      :delete_after,
       :content_type,
       media_ids: [],
       poll: [
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index b9f3a803d..e7d2008d0 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -53,6 +53,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_hide_public_profile,
       :setting_hide_public_outbox,
       :setting_max_public_history,
+      :setting_roar_lifespan,
 
       :setting_default_privacy,
       :setting_default_sensitive,