From d9073f132b041fae818ae3894503065de123f257 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Sun, 21 Jul 2019 19:51:07 -0500
Subject: add more options for time range of roars visible to anonymous public
 profile viewers

---
 app/controllers/accounts_controller.rb             | 4 +++-
 app/controllers/settings/preferences_controller.rb | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 084201d85..4736b3596 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -60,7 +60,9 @@ class AccountsController < ApplicationController
     else
       scope = default_statuses.without_replies.without_reblogs
     end
-    current_user.blank? ? scope.where(created_at: 6.days.ago..Time.current) : scope
+    return scope if current_user
+    return Status.none unless @account&.user
+    scope.where(created_at: @account.user.max_public_history.to_i.days.ago..Time.current)
   end
 
   def default_statuses
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 530d54a41..45bfd24b2 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -50,6 +50,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_user_is_kobold,
       :setting_hide_mascot,
       :setting_hide_interactions,
+      :setting_max_public_history,
 
       :setting_default_privacy,
       :setting_default_sensitive,
-- 
cgit