From 6fa9c3eb1bb416bdc05f8bd4011de396e6248aa5 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Sat, 7 Dec 2019 22:13:32 -0600
Subject: add option to toggle whether regex filters should be applied to
 mentions

---
 app/models/account.rb | 2 +-
 app/models/user.rb    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/account.rb b/app/models/account.rb
index 6841fba3a..c52f28d33 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -144,6 +144,7 @@ class Account < ApplicationRecord
            :hides_stats?,
            :shows_application?,
 
+           :filters_mentions?,
            :hides_replies_of_muted?,
            :hides_replies_of_blocked?,
            :hides_replies_of_blocker?,
@@ -156,7 +157,6 @@ class Account < ApplicationRecord
            :wants_larger_buttons?,
            :wants_larger_drawer?,
            :wants_larger_emoji?,
-           :hides_filtered_gap?,
            :hides_mascot?,
            :hides_captions?,
            :shows_cursor?,
diff --git a/app/models/user.rb b/app/models/user.rb
index d0711c634..06af06911 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -122,7 +122,7 @@ class User < ApplicationRecord
     :larger_buttons,
     :larger_drawer,
     :larger_emoji,
-    :remove_filtered,
+    :filter_mentions,
     :hide_replies_muted,
     :hide_replies_blocked,
     :hide_replies_blocker,
@@ -268,8 +268,8 @@ class User < ApplicationRecord
     @wants_larger_emoji ||= (settings.larger_emoji || false)
   end
 
-  def hides_filtered_gap?
-    @hides_filtered_gap ||= (settings.remove_filtered || false)
+  def filters_mentions?
+    @filters_mentions ||= (settings.filter_mentions || false)
   end
 
   def hides_replies_of_muted?
-- 
cgit