[Filters, Timelines] Add options to toggle filters for replies to and boosts of unfollowed accounts

4 files changed, 9 insertions, 2 deletions

diff --git a/config/locales/en-MP.yml b/config/locales/en-MP.yml
index 26931ffe3..18ce2d7c4 100644
--- a/config/locales/en-MP.yml
+++ b/config/locales/en-MP.yml
@@ -68,7 +68,7 @@ en-MP:
   appearance:
     toot_layout: Roar layout
     custom_css: Custom CSS
-    custom_css_error: "There are problems with the above CSS that must be fixed before it can be applied:"    
+    custom_css_error: "There are problems with the above CSS that must be fixed before it can be applied:"
   auth:
     description:
       prefix_invited_by_user: "@%{name} invites you to join Monsterpit!"
@@ -98,6 +98,7 @@ en-MP:
       title: New roar
   preferences:
     advanced_publishing: Advanced publishing options
+    filtering: Filtering options
   remote_interaction:
     favourite:
       proceed: Proceed to admire
@@ -141,4 +142,4 @@ en-MP:
     warning:
       explanation:
         silence: While your account is limited, only creatures who are already following you will see your roars on this server, and you may be excluded from various public listings. However, others may still manually follow you.
-        suspend: Your account has been suspended, and all of your roars and your uploaded media files have been irreversibly removed from this server, and servers where you had followers.
\ No newline at end of file
+        suspend: Your account has been suspended, and all of your roars and your uploaded media files have been irreversibly removed from this server, and servers where you had followers.
diff --git a/config/locales/simple_form.en-MP.yml b/config/locales/simple_form.en-MP.yml
index 8b9e09b65..f442203cc 100644
--- a/config/locales/simple_form.en-MP.yml
+++ b/config/locales/simple_form.en-MP.yml
@@ -26,6 +26,8 @@ en-MP:
         setting_default_content_type_console_html: <code>Plain-text console formatting.</code>
         setting_default_content_type_bbcode_html: "<strong>[b]Bold[/b]</strong>, <u>[u]Underline[/u]</u>, <em>[i]Italic[/i]</em>, <code>[code]Console[/code]</code>, ..."
         setting_default_language: The language of your roars can be detected automatically, but it's not always accurate
+        setting_filter_to_unknown: Do not show replies to unfollowed accounts on your home timeline.  Takes effect for newly-pushed items.
+        setting_filter_from_unknown: Do not show boosts from unfollowed accounts on your home timeline.  Takes effect for newly-pushed items.
         setting_manual_publish: This allows you to draft, proofread, and edit your roars before publishing them.  You can publish a roar from its <strong>action menu</strong> (the three dots).
         setting_show_application: The application you use to toot will be displayed in the detailed view of your roars
         setting_skin: Reskins the selected UI flavour
@@ -51,6 +53,8 @@ en-MP:
         setting_display_media_show_all: Reveal all
         setting_expand_spoilers: Always expand roars marked with content warnings
         setting_favourite_modal: Show confirmation dialog before admiring (applies to Glitch flavour only)
+        setting_filter_to_unknown: Filter replies to unfollowed accounts
+        setting_filter_to_unknown: Filter boosts from unfollowed accounts
         setting_manual_publish: Manually publish roars
         setting_publish_in: Auto-publish
         setting_show_application: Disclose application used to send roars
diff --git a/config/navigation.rb b/config/navigation.rb
index bd172f25f..49049ef4f 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -13,6 +13,7 @@ SimpleNavigation::Configuration.run do |navigation|
     n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url, if: -> { current_user.functional? } do |s|
       s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_url
       s.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_preferences_notifications_url
+      s.item :filters, safe_join([fa_icon('filter fw'), t('preferences.filters')]), settings_preferences_filters_url
       s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_url
     end
 
diff --git a/config/routes.rb b/config/routes.rb
index cdfb4a77a..74ed750a4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -117,6 +117,7 @@ Rails.application.routes.draw do
       resource :appearance, only: [:show, :update], controller: :appearance
       resource :notifications, only: [:show, :update]
       resource :other, only: [:show, :update], controller: :other
+      resource :filters, only: [:show, :update], controller: :filters
     end
 
     resource :import, only: [:show, :create]