AO3-6017 Add role of commenter to comment notification emails

app/helpers/mailer_helper.rb

@@ -181,22 +181,25 @@ def style_work_tag_metadata(tags)
   end
 
   def commenter_pseud_or_name_link(comment)
+    return style_bold(t("roles.anonymous_creator")) if comment.by_anonymous_creator?
+
     if comment.comment_owner.nil?
-      t("roles.guest_commenter_name_html", name: style_bold(comment.comment_owner_name), role: style_role(t("roles.guest_with_parens")))
-    elsif comment.by_anonymous_creator?
-      style_bold(t("roles.anonymous_creator"))
+      t("roles.commenter_name_html", name: style_bold(comment.comment_owner_name), role: style_role(t("roles.guest_with_parens")))
     else
-      style_pseud_link(comment.pseud)
+      role = comment.user.official ? t("roles.official_with_parens") : t("roles.registered_with_parens")
+      pseud_link = style_link(comment.pseud.byline, user_pseud_url(comment.user, comment.pseud))
+      t("roles.commenter_name_html", name: tag.strong(pseud_link), role: style_role(role))
     end
   end
 
   def commenter_pseud_or_name_text(comment)
+    return t("roles.anonymous_creator") if comment.by_anonymous_creator?
+
     if comment.comment_owner.nil?
-      t("roles.guest_commenter_name_text", name: comment.comment_owner_name, role: t("roles.guest_with_parens"))
-    elsif comment.by_anonymous_creator?
-      t("roles.anonymous_creator")
+      t("roles.commenter_name_text", name: comment.comment_owner_name, role: t("roles.guest_with_parens"))
     else
-      text_pseud(comment.pseud)
+      role = comment.user.official ? t("roles.official_with_parens") : t("roles.registered_with_parens")
+      t("roles.commenter_name_text", name: text_pseud(comment.pseud), role: role)
     end
   end
 

app/views/admin_mailer/comment_notification.text.erb

@@ -1,6 +1,6 @@
 <% content_for :message do %>
-<%= commenter_pseud_or_name_text(@comment) %> left the following comment on 
-<% if @comment.ultimate_parent.is_a?(Tag) then %>the tag "<%= @comment.ultimate_parent.commentable_name %>" (<%= url_for(:controller => :tags, :action => :show, :id => @comment.ultimate_parent, :only_path => false) %>) <% else %>"<%= @comment.ultimate_parent.commentable_name.html_safe %>" (<%= polymorphic_url(@comment.ultimate_parent, :only_path => false) %>)<% end %>:
+  <%= commenter_pseud_or_name_text(@comment) %> left the following comment on
+  <% if @comment.ultimate_parent.is_a?(Tag) then %>the tag "<%= @comment.ultimate_parent.commentable_name %>" (<%= url_for(:controller => :tags, :action => :show, :id => @comment.ultimate_parent, :only_path => false) %>) <% else %>"<%= @comment.ultimate_parent.commentable_name.html_safe %>" (<%= polymorphic_url(@comment.ultimate_parent, :only_path => false) %>)<% end %>:
 <%= text_divider %>
 
 <%= to_plain_text(raw @comment.sanitized_content) %>

app/views/admin_mailer/edited_comment_notification.text.erb

@@ -1,6 +1,6 @@
 <% content_for :message do %>
-<%= commenter_pseud_or_name_text(@comment) %> edited the following comment on 
-<% if @comment.ultimate_parent.is_a?(Tag) then %>the tag "<%= @comment.ultimate_parent.commentable_name %>" (<%= url_for(:controller => :tags, :action => :show, :id => @comment.ultimate_parent, :only_path => false) %>) <% else %>"<%= @comment.ultimate_parent.commentable_name.html_safe %>" (<%= polymorphic_url(@comment.ultimate_parent, :only_path => false) %>)<% end %>:
+  <%= commenter_pseud_or_name_text(@comment) %> edited the following comment on
+  <% if @comment.ultimate_parent.is_a?(Tag) then %>the tag "<%= @comment.ultimate_parent.commentable_name %>" (<%= url_for(:controller => :tags, :action => :show, :id => @comment.ultimate_parent, :only_path => false) %>) <% else %>"<%= @comment.ultimate_parent.commentable_name.html_safe %>" (<%= polymorphic_url(@comment.ultimate_parent, :only_path => false) %>)<% end %>:
 <%= text_divider %>
 
 <%= to_plain_text(raw @comment.sanitized_content) %>

config/locales/mailers/en.yml

@@ -83,9 +83,11 @@ en:
         support: The AO3 Support team
   roles:
     anonymous_creator: Anonymous Creator
-    guest_commenter_name_html: "%{name} %{role}"
-    guest_commenter_name_text: "%{name} %{role}"
+    commenter_name_html: "%{name} %{role}"
+    commenter_name_text: "%{name} %{role}"
     guest_with_parens: "(Guest)"
+    official_with_parens: "(Official)"
+    registered_with_parens: "(Registered User)"
   user_mailer:
     abuse_report:
       copy:

spec/mailers/admin_mailer_spec.rb

@@ -172,4 +172,94 @@
       end
     end
   end
+
+  let(:commenter) { create(:user, login: "Accumulator") }
+  let(:commenter_pseud) { create(:pseud, user: commenter, name: "Blueprint") }
+  let(:comment) { create(:comment, :on_admin_post, pseud: commenter_pseud) }
+
+  shared_examples "a notification email with the commenters pseud and username" do
+    describe "HTML email" do
+      it "has the pseud and username of the commenter" do
+        expect(email).to have_html_part_content(">Blueprint (Accumulator)</a></strong> <em><strong>(Registered User)</strong></em>")
+        expect(subject.html_part).to have_xpath(
+          "//a[@href=\"#{user_pseud_url(commenter, commenter_pseud)}\"]",
+          text: "Blueprint (Accumulator)"
+        )
+      end
+    end
+
+    describe "text email" do
+      it "has the pseud and username of the commenter" do
+        expect(subject).to have_text_part_content(
+          "Blueprint (Accumulator) (#{user_pseud_url(commenter, commenter_pseud)}) (Registered User)"
+        )
+      end
+    end
+  end
+
+  shared_examples "a notification email that marks the commenter as official" do
+    describe "HTML email" do
+      it "has the username of the commenter and the official role" do
+        expect(email).to have_html_part_content(">Centrifuge</a></strong> <em><strong>(Official)</strong></em>")
+        expect(subject.html_part).to have_xpath(
+          "//a[@href=\"#{user_pseud_url(commenter, commenter.default_pseud)}\"]",
+          text: "Centrifuge"
+        )
+      end
+    end
+
+    describe "text email" do
+      it "has the username of the commenter and the official role" do
+        expect(subject).to have_text_part_content(
+          "Centrifuge (#{user_pseud_url(commenter, commenter.default_pseud)}) (Official)"
+        )
+      end
+    end
+  end
+
+  describe "comment_notification" do
+    subject(:email) { AdminMailer.comment_notification(comment.id) }
+
+    it_behaves_like "an email with a valid sender"
+    it_behaves_like "a multipart email"
+    it_behaves_like "a notification email with the commenters pseud and username"
+
+    context "when the comment is by an official user using their default pseud" do
+      let(:commenter) { create(:official_user, login: "Centrifuge") }
+      let(:comment) { create(:comment, :on_admin_post, pseud: commenter.default_pseud) }
+
+      it_behaves_like "a notification email that marks the commenter as official"
+    end
+
+    context "when the commenter is a guest" do
+      let(:comment) { create(:comment, :on_admin_post, pseud: nil, name: "Defender", email: Faker::Internet.email) }
+
+      describe "HTML email" do
+        it "has the name of the guest and the guest role" do
+          expect(email).to have_html_part_content(">Defender</b> <em><strong>(Guest)</strong></em>")
+        end
+      end
+
+      describe "text email" do
+        it "has the name of the guest and the guest role" do
+          expect(subject).to have_text_part_content("Defender (Guest)")
+        end
+      end
+    end
+  end
+
+  describe "comment_edited_notification" do
+    subject(:email) { AdminMailer.edited_comment_notification(comment.id) }
+
+    it_behaves_like "an email with a valid sender"
+    it_behaves_like "a multipart email"
+    it_behaves_like "a notification email with the commenters pseud and username"
+
+    context "when the comment is by an official user using their default pseud" do
+      let(:commenter) { create(:official_user, login: "Centrifuge") }
+      let(:comment) { create(:comment, :on_admin_post, pseud: commenter.default_pseud) }
+
+      it_behaves_like "a notification email that marks the commenter as official"
+    end
+  end
 end