From 51bab85b07b1433e832152f6498f203ec4b4434d Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Sun, 12 Jan 2020 23:56:43 -0600
Subject: add privacy option to limit lifespan of public access to post &
 object urls beyond local followers, default to 90 days

---
 app/controllers/settings/preferences_controller.rb | 1 +
 app/controllers/statuses_controller.rb             | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/controllers')

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
-- 
cgit