2 files changed, 6 insertions, 16 deletions
diff --git a/app/models/account.rb b/app/models/account.rb
index 26d918714..b3afdbcf7 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -132,6 +132,7 @@ class Account < ApplicationRecord
            :defaults_to_sensitive?,
            :defaults_to_local_only?,
            :always_local_only?,
+           :max_public_history,
 
            :hides_interactions?,
            :hides_network?,
@@ -152,7 +153,6 @@ class Account < ApplicationRecord
            :wants_larger_emoji?,
            :hides_filtered_gap?,
            :hides_mascot?,
-           :hides_color_formatting?,
            :hides_captions?,
 
            to: :user,
diff --git a/app/models/user.rb b/app/models/user.rb
index b8151e7ed..eeefce075 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -107,7 +107,6 @@ class User < ApplicationRecord
     :always_local,
     :rawr_federated,
     :hide_stats,
-    :disable_color,
     :hide_captions,
     :larger_menus,
     :larger_buttons,
@@ -121,10 +120,9 @@ class User < ApplicationRecord
     :hide_mntions_blocked,
     :hide_mntions_blocker,
     :hide_mntions_packm8,
-    :gently_kobolds,
-    :user_is_kobold,
     :hide_mascot,
     :hide_interactions,
+    :max_public_history,
 
     :auto_play_gif,
     :default_sensitive,
@@ -279,14 +277,6 @@ class User < ApplicationRecord
     @hides_mentions_outside_scope ||= (settings.hide_mntions_packm8 || true)
   end
 
-  def gentlies_kobolds?
-    @gentlies_kobolds ||= (settings.gently_kobolds || false)
-  end
-
-  def is_a_kobold?
-    @is_a_kobold ||= (settings.user_is_kobold || false)
-  end
-
   def hides_mascot?
     @hides_mascot ||= (settings.hide_mascot || false)
   end
@@ -295,6 +285,10 @@ class User < ApplicationRecord
     @hides_interactions ||= (settings.hide_interactions || false)
   end
 
+  def max_public_history
+    @_max_public_history ||= (settings.max_public_history || 6)
+  end
+
   def defaults_to_local_only?
     @defaults_to_local_only ||= (settings.default_local || false)
   end
@@ -307,10 +301,6 @@ class User < ApplicationRecord
     @wants_raw_federated ||= (settings.rawr_federated || false)
   end
 
-  def hides_color_formatting?
-    @hides_color_formatting ||= (settings.disable_color || false)
-  end
-
   def hides_stats?
     @hides_stats ||= (settings.hide_stats || false)
   end