discourse
/
discourse-assign
mirror of https://github.com/discourse/discourse-assign.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: do not include username in assign push notification

This commit is contained in:
Sam 2018-12-05 08:42:02 +11:00
parent 2d5359055d
commit cd6f61683e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/server.en.yml
View File

@ -18,7 +18,7 @@ en:
already_claimed: "That topic has already been claimed." already_claimed: "That topic has already been claimed."
flag_assigned: "Sorry, that flag's topic is assigned to another user" flag_assigned: "Sorry, that flag's topic is assigned to another user"
flag_unclaimed: "You must claim that topic before acting on the flag" flag_unclaimed: "You must claim that topic before acting on the flag"
topic_assigned_excerpt: "@%{username} assigned you the topic '%{title}'" topic_assigned_excerpt: "assigned you the topic '%{title}'"
assign_mailer: assign_mailer:
title: "Assign Mailer" title: "Assign Mailer"
subject_template: "[%{email_prefix}] %{assignee_name} assigned you to '%{topic_title}'!" subject_template: "[%{email_prefix}] %{assignee_name} assigned you to '%{topic_title}'!"

3
lib/topic_assigner.rb
View File

@ -215,8 +215,9 @@ SQL
alerter.create_notification_alert( alerter.create_notification_alert(
user: assign_to, user: assign_to,
post: first_post, post: first_post,
username: @assigned_by.username,
notification_type: Notification.types[:custom], notification_type: Notification.types[:custom],
excerpt: I18n.t("discourse_assign.topic_assigned_excerpt", title: @topic.title, username: @assigned_by.username) excerpt: I18n.t("discourse_assign.topic_assigned_excerpt", title: @topic.title)
) )
end end

2
spec/lib/topic_assigner_spec.rb
View File

@ -38,7 +38,7 @@ RSpec.describe TopicAssigner do
end end
expect(messages.length).to eq(1) expect(messages.length).to eq(1)
expect(messages.first.data[:excerpt]).to eq("@#{moderator2.username} assigned you the topic '#{topic.title}'") expect(messages.first.data[:excerpt]).to eq("assigned you the topic '#{topic.title}'")
expect(TopicQuery.new( expect(TopicQuery.new(
moderator, assigned: moderator.username moderator, assigned: moderator.username