Skip to content

[FIX] Missing setting to control when to send the ReplyTo field in email notifications #20744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 5 commits into from
Feb 19, 2021
Merged

[FIX] Missing setting to control when to send the ReplyTo field in email notifications #20744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3359d3e
Add a setting to control when to send the ReplyTo field in email noti…
matheusbsilva137 Feb 12, 2021
54d5248
Update ReplyTo_Enable setting's label
matheusbsilva137 Feb 12, 2021
baff88a
Update setting's section and add translations
matheusbsilva137 Feb 19, 2021
ebd7a97
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
matheusbsilva137 Feb 19, 2021
59a03a0
Update app/lib/server/startup/email.js
sampaiodiego Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/lib/server/functions/notifications/email.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export function getEmailData({
headers: {},
};

if (sender.emails?.length > 0) {
if (sender.emails?.length > 0 && settings.get('Add_Sender_To_ReplyTo')) {
const [senderEmail] = sender.emails;
email.headers['Reply-To'] = generateNameEmail(username, senderEmail.address);
}
Expand Down
3 changes: 3 additions & 0 deletions app/lib/server/startup/email.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,5 +476,8 @@ settings.addGroup('Email', function() {
type: 'boolean',
public: true,
});
this.add('Add_Sender_To_ReplyTo', false, {
type: 'boolean',
});
});
});
1 change: 1 addition & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@
"Add_monitor": "Add monitor",
"Add_Reaction": "Add Reaction",
"Add_Role": "Add Role",
"Add_Sender_To_ReplyTo": "Add Sender to Reply-To",
"Add_user": "Add user",
"Add_User": "Add User",
"Add_users": "Add users",
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-i18n/i18n/pt-BR.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@
"Add_monitor": "Adicionar Monitor",
"Add_Reaction": "Adicionar reação",
"Add_Role": "Adicionar Role",
"Add_Sender_To_ReplyTo": "Adicionar Remetente ao campo \"Responder para\"",
"Add_user": "Adicionar usuário",
"Add_User": "Adicionar Usuário",
"Add_users": "Adicionar usuários",
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-i18n/i18n/pt.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@
"Add_files_from": "Adicionar arquivos de",
"Add_manager": "Adicionar gerente",
"Add_Role": "Adicionar função",
"Add_Sender_To_ReplyTo": "Adicionar Remetente ao campo \"Responder a\"",
"Add_user": "Adicionar utilizador",
"Add_User": "Adicionar Utilizador",
"Add_users": "Adicionar utilizadores",
Expand Down