diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-01-12 23:56:43 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-01-12 23:56:43 -0600 |
| commit | 51bab85b07b1433e832152f6498f203ec4b4434d (patch) | |
| tree | 3c3e3a5cf92e03956195ef7a4e11f25e10f7b3ad /app/controllers | |
| parent | 651c569c3fe7bd3ab12578396ec5934285f02188 (diff) | |
add privacy option to limit lifespan of public access to post & object urls beyond local followers, default to 90 days
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/statuses_controller.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 2e364bbc8..8573624f2 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -83,6 +83,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_hide_public_profile, :setting_hide_public_outbox, :setting_max_public_history, + :setting_max_public_access, :setting_roar_lifespan, :setting_delayed_roars, :setting_delayed_for, diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 7219f6761..2edd19064 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -186,8 +186,6 @@ class StatusesController < ApplicationController if @status.sharekey.present? && @sharekey == @status.sharekey.key skip_authorization - elsif @account.block_anon && !user_signed_in? - raise ActiveRecord::RecordNotFound else authorize @status, :show? end |