about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-26 22:04:16 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-26 22:04:16 +0100
commiteca6110fc44c9a51925c1a217b1522d613648779 (patch)
tree5dbc17aeac018bf75044eff6e4c58cc55eaf6507 /app/controllers/settings
parent5418df467d953316838b8eaee1ad90c33b3c15a6 (diff)
Add preferences for follow request notification e-mails
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/preferences_controller.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 692cf95ac..3b6d109a6 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -8,10 +8,11 @@ class Settings::PreferencesController < ApplicationController
   def show; end
 
   def update
-    current_user.settings(:notification_emails).follow    = user_params[:notification_emails][:follow]    == '1'
-    current_user.settings(:notification_emails).reblog    = user_params[:notification_emails][:reblog]    == '1'
-    current_user.settings(:notification_emails).favourite = user_params[:notification_emails][:favourite] == '1'
-    current_user.settings(:notification_emails).mention   = user_params[:notification_emails][:mention]   == '1'
+    current_user.settings(:notification_emails).follow         = user_params[:notification_emails][:follow]         == '1'
+    current_user.settings(:notification_emails).follow_request = user_params[:notification_emails][:follow_request] == '1'
+    current_user.settings(:notification_emails).reblog         = user_params[:notification_emails][:reblog]         == '1'
+    current_user.settings(:notification_emails).favourite      = user_params[:notification_emails][:favourite]      == '1'
+    current_user.settings(:notification_emails).mention        = user_params[:notification_emails][:mention]        == '1'
 
     current_user.settings(:interactions).must_be_follower  = user_params[:interactions][:must_be_follower]  == '1'
     current_user.settings(:interactions).must_be_following = user_params[:interactions][:must_be_following] == '1'
@@ -26,6 +27,6 @@ class Settings::PreferencesController < ApplicationController
   private
 
   def user_params
-    params.require(:user).permit(:locale, notification_emails: [:follow, :reblog, :favourite, :mention], interactions: [:must_be_follower, :must_be_following])
+    params.require(:user).permit(:locale, notification_emails: [:follow, :follow_request, :reblog, :favourite, :mention], interactions: [:must_be_follower, :must_be_following])
   end
 end