IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: force enable a user's email_private_messages option when user replies via email (#6478)

Browse Source 
* Enable user email PM when posting to group or replying to topic via email

* remove extra line

* Add test and fix snake_case

* Only reenable email_private_messages for PM replies
This commit is contained in:
Penar Musaraj
2018-10-15 19:51:57 -04:00
committed by Sam
parent 005e1f5373
commit b06dccac49
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/email/receiver.rb
View File

@@ -621,11 +621,6 @@ module Email
end
def create_group_post(group, user, body, elided, hidden_reason_id)
# ensure user PM emails are enabled (since user is posting via email)
if !user.staged && !user.user_option.email_private_messages
user.user_option.update!(email_private_messages: true)
end
message_ids = Email::Receiver.extract_reply_message_ids(@mail, max_message_id_count: 5)
post_ids = []
@@ -648,6 +643,8 @@ module Email
topic: post.topic,
skip_validations: true)
else
enable_email_pm_setting(user)
create_topic(user: user,
raw: body,
elided: elided,
@@ -856,6 +853,7 @@ module Email
def create_reply(options = {})
raise TopicNotFoundError if options[:topic].nil? || options[:topic].trashed?
options[:post] = nil if options[:post]&.trashed?
enable_email_pm_setting(options[:user]) if options[:topic].archetype == Archetype.private_message
if post_action_type = post_action_for(options[:raw])
create_post_action(options[:user], options[:post], post_action_type)
@@ -1073,6 +1071,13 @@ module Email
end
end
end
def enable_email_pm_setting(user)
# ensure user PM emails are enabled (since user is posting via email)
if !user.staged && !user.user_option.email_private_messages
user.user_option.update!(email_private_messages: true)
end
end
end
end