From 6f038b1b92b6f569ce329fe174ba0b99789595a8 Mon Sep 17 00:00:00 2001 From: anthony-zhou Date: Fri, 10 Jan 2020 11:33:39 -0600 Subject: [PATCH 1/3] Solve merge conflicts --- app/mailers/admin_mailer.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index 51d8a52676..1fb950eed9 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -10,7 +10,11 @@ def notify_node_moderators(node) @node = node @user = node.author @footer = feature('email-footer') - moderators = User.where(role: %w(moderator admin)).collect(&:email) + all_moderators = User.where(role: %w(moderator admin)).collect(&:email) + moderators = [] + all_moderators.each do |mod_user| + moderators << mod_user unless .has_tag('no-moderation-emails') + end if node.status == 4 # only if it remains unmoderated mail( to: "moderators@#{ActionMailer::Base.default_url_options[:host]}", From d47561a13b5a36988065016f3170157c34b153ce Mon Sep 17 00:00:00 2001 From: anthony-zhou Date: Fri, 10 Jan 2020 11:40:58 -0600 Subject: [PATCH 2/3] Fix codeclimate issue --- app/mailers/admin_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index 1fb950eed9..c0702a7a87 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -13,7 +13,7 @@ def notify_node_moderators(node) all_moderators = User.where(role: %w(moderator admin)).collect(&:email) moderators = [] all_moderators.each do |mod_user| - moderators << mod_user unless .has_tag('no-moderation-emails') + moderators << mod_user unless mod_user.has_tag('no-moderation-emails') end if node.status == 4 # only if it remains unmoderated mail( From 986f5b556d36c3303cc84dbb2ef3a56bf044f071 Mon Sep 17 00:00:00 2001 From: anthony-zhou Date: Sun, 12 Jan 2020 21:15:42 -0600 Subject: [PATCH 3/3] call has_tag on user object --- app/mailers/admin_mailer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index c0702a7a87..952e2b0198 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -10,10 +10,10 @@ def notify_node_moderators(node) @node = node @user = node.author @footer = feature('email-footer') - all_moderators = User.where(role: %w(moderator admin)).collect(&:email) + all_moderators = User.where(role: %w(moderator admin)) moderators = [] all_moderators.each do |mod_user| - moderators << mod_user unless mod_user.has_tag('no-moderation-emails') + moderators << mod_user.email unless mod_user.has_tag('no-moderation-emails') end if node.status == 4 # only if it remains unmoderated mail(