about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-10-21 01:50:04 -0500
committerFire Demon <firedemon@creature.cafe>2020-10-21 01:50:04 -0500
commit0a32c484e1b8819983514f6f06da30c910cdd133 (patch)
tree48457fb5e94b1b47aeeb0c1d92758e58889b9fe9 /app/controllers/settings
parent0e6cb59f2f51ad6831188b47fd9e5c6827e9ff91 (diff)
Make receiving boosts from Tavern timeline in home feed opt-in; always aggregate boosts
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/preferences_controller.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 12c03ce76..0a7c53f83 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -4,8 +4,10 @@ class Settings::PreferencesController < Settings::BaseController
   def show; end
 
   def update
+    old_home_reblogs = current_user.home_reblogs?
+  
     if user_settings.update(user_settings_params.to_h)
-      ClearReblogsWorker.perform_async(current_user.account_id) if current_user.disables_home_reblogs?
+      ClearReblogsWorker.perform_async(current_user.account_id) unless old_home_reblogs == current_user.home_reblogs? || current_user.home_reblogs?
     end
 
     if current_user.update(user_params)
@@ -51,7 +53,6 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_noindex,
       :setting_hide_network,
       :setting_hide_followers_count,
-      :setting_aggregate_reblogs,
       :setting_show_application,
       :setting_advanced_layout,
       :setting_default_content_type,
@@ -74,7 +75,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_filter_unknown,
       :setting_unpublish_on_delete,
       :setting_rss_disabled,
-      :setting_no_boosts_home,
+      :setting_home_reblogs,
       :setting_max_history_public,
       :setting_max_history_private,
       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag),