A platform for community discussion. Free, open, simple.
FIX: Respect user email preferences in group SMTP emails
Jake Goldsboroughb39abb563223
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rbindex d3bea02b5dc..cf7ffc843d0 100644--- a/app/services/post_alerter.rb+++ b/app/services/post_alerter.rb@@ -891,9 +891,12 @@ class PostAlerterpost.topic.topic_allowed_users- .includes(:user)+ .includes(user: :user_option).order(:created_at)- .reject { |tau| not_allowed?(tau.user, post) }+ .reject do |tau|+ not_allowed?(tau.user, post) ||+ tau.user.user_option.email_messages_level == UserOption.email_level_types[:never]+ endreturn emails_to_skip_send if topic_allowed_users_by_age.empty?# This should usually be the OP of the topic, unless they are the onediff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rbindex 49919e6072e..dd2ae5d7781 100644--- a/spec/services/post_alerter_spec.rb+++ b/spec/services/post_alerter_spec.rb@@ -2656,6 +2656,29 @@ RSpec.describe PostAlerter doexpect(email.subject).to eq("[Discourse] [PM] #{topic.title}")end+ it "excludes users with email_messages_level set to never from group SMTP emails" do+ NotificationEmailer.enable++ incoming_email_post = create_post_with_incoming+ topic = incoming_email_post.topic++ # Get one of the topic allowed users and set their email preference to never+ topic_allowed_user = topic.topic_allowed_users.first+ topic_allowed_user.user.user_option.update!(+ email_messages_level: UserOption.email_level_types[:never],+ )++ post = Fabricate(:post, topic: topic.reload)++ PostAlerter.new.after_save_post(post, true)++ # The group SMTP email should not include the user who has email disabled+ email = ActionMailer::Base.deliveries.last+ expect(email.from).to eq([group.email_username])+ expect(email.to).not_to include(topic_allowed_user.user.email)+ expect(email.cc).not_to include(topic_allowed_user.user.email)+ end+it "skips sending a notification email to the cc address that was added on the same post with an incoming email" doNotificationEmailer.enable