From fe6a7dfb2c9db62ca67940363b667be612580290 Mon Sep 17 00:00:00 2001
From: chr <chr@cybre.space>
Date: Mon, 21 Jan 2019 15:08:25 -0800
Subject: [PATCH] Add setting for whether to show DMS in home timeline

---
 app/controllers/settings/preferences_controller.rb | 1 +
 app/lib/feed_manager.rb                            | 2 +-
 app/lib/user_settings_decorator.rb                 | 5 +++++
 app/models/user.rb                                 | 4 ++++
 app/views/settings/preferences/show.html.haml      | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 41df3bde2..cde8f0647 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -48,6 +48,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_theme,
       :setting_hide_network,
       :setting_aggregate_reblogs,
+      :setting_home_dms,
       notification_emails: %i(follow follow_request reblog favourite mention digest report),
       interactions: %i(must_be_follower must_be_following)
     )
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index f99df33e5..bed2f0b3a 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -92,7 +92,7 @@ class FeedManager
     end
 
     query.each do |status|
-      next if status.direct_visibility? || status.limited_visibility? || filter?(:home, status, into_account)
+        next if not (status.direct_visibility? && account.user&.home_dms?) || status.limited_visibility? || filter?(:home, status, into_account)
       add_to_feed(:home, into_account.id, status, into_account.user&.aggregates_reblogs?)
     end
 
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index 19b854410..2a5f780fc 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -32,6 +32,7 @@ class UserSettingsDecorator
     user.settings['theme']               = theme_preference if change?('setting_theme')
     user.settings['hide_network']        = hide_network_preference if change?('setting_hide_network')
     user.settings['aggregate_reblogs']   = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
+    user.settings['home_dms']   = aggregate_reblogs_preference if change?('home_dms')
   end
 
   def merged_notification_emails
@@ -102,6 +103,10 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_aggregate_reblogs'
   end
 
+  def home_dms_preference
+    boolean_cast_setting 'setting_home_dms'
+  end
+
   def boolean_cast_setting(key)
     ActiveModel::Type::Boolean.new.cast(settings[key])
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 5aa5c2b15..2105d5251 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -244,6 +244,10 @@ class User < ApplicationRecord
     @aggregates_reblogs ||= settings.aggregate_reblogs
   end
 
+  def home_dms?
+    @home_dms ||= settings.home_dms
+  end
+
   def token_for_app(a)
     return nil if a.nil? || a.owner != self
     Doorkeeper::AccessToken
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index a2c61c9a6..a14704465 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -49,6 +49,7 @@
 
   .fields-group
     = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label
+    = f.input :setting_home_dms, as: :boolean, wrapper: :with_label
 
   .fields-group
     = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label