vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add preferences for follow request notification e-mails

Browse source
This commit is contained in:
Eugen Rochko 2016-12-26 22:04:16 +01:00
parent 5418df467d
commit eca6110fc4
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/settings/preferences_controller.rb
View file

@ -8,10 +8,11 @@ class Settings::PreferencesController < ApplicationController
def show; end def show; end
def update def update
current_user.settings(:notification_emails).follow = user_params[:notification_emails][:follow] == '1' 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).follow_request = user_params[:notification_emails][:follow_request] == '1'
current_user.settings(:notification_emails).favourite = user_params[:notification_emails][:favourite] == '1' current_user.settings(:notification_emails).reblog = user_params[:notification_emails][:reblog] == '1'
current_user.settings(:notification_emails).mention = user_params[:notification_emails][:mention] == '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_follower = user_params[:interactions][:must_be_follower] == '1'
current_user.settings(:interactions).must_be_following = user_params[:interactions][:must_be_following] == '1' current_user.settings(:interactions).must_be_following = user_params[:interactions][:must_be_following] == '1'
@ -26,6 +27,6 @@ class Settings::PreferencesController < ApplicationController
private private
def user_params 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
end end

1
app/views/settings/preferences/show.html.haml
View file

@ -8,6 +8,7 @@
= f.simple_fields_for :notification_emails, current_user.settings(:notification_emails) do |ff| = f.simple_fields_for :notification_emails, current_user.settings(:notification_emails) do |ff|
= ff.input :follow, as: :boolean, wrapper: :with_label = ff.input :follow, as: :boolean, wrapper: :with_label
= ff.input :follow_request, as: :boolean, wrapper: :with_label
= ff.input :reblog, as: :boolean, wrapper: :with_label = ff.input :reblog, as: :boolean, wrapper: :with_label
= ff.input :favourite, as: :boolean, wrapper: :with_label = ff.input :favourite, as: :boolean, wrapper: :with_label
= ff.input :mention, as: :boolean, wrapper: :with_label = ff.input :mention, as: :boolean, wrapper: :with_label

1
config/locales/simple_form.en.yml
View file

@ -25,6 +25,7 @@ en:
notification_emails: notification_emails:
favourite: Send e-mail when someone favourites your status favourite: Send e-mail when someone favourites your status
follow: Send e-mail when someone follows you follow: Send e-mail when someone follows you
follow_request: Send e-mail when someone requests to follow you
mention: Send e-mail when someone mentions you mention: Send e-mail when someone mentions you
reblog: Send e-mail when someone reblogs your status reblog: Send e-mail when someone reblogs your status
'no': 'No' 'no': 'No'