Skip to content
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.

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

Rocketchat mailer #13036

Merged
merged 28 commits into from Jan 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
eb36f8b
Move rocketchat settings to specific package
MarcosSpessatto Dec 21, 2018
4428a97
WIP: Move models from rocketchat-lib to a specific package (server)
MarcosSpessatto Dec 24, 2018
157edc0
Move function from rocketchat:lib to rocketchat:utils to use it in ro…
MarcosSpessatto Dec 24, 2018
7b65a21
Merge branch 'develop' into globals/remove-rocketchat-settings
MarcosSpessatto Dec 24, 2018
4a26cba
Merge branch 'globals/remove-rocketchat-settings' into globals/move-r…
MarcosSpessatto Dec 24, 2018
24cfb4f
Move client models from rocketchat:lib to rocketchat:models
MarcosSpessatto Dec 26, 2018
0683f57
Fix lint
MarcosSpessatto Dec 26, 2018
b26e192
Move rocketchat.info from lib to utils
MarcosSpessatto Dec 27, 2018
8eeac90
Remove directly dependency between lib and migrations
MarcosSpessatto Dec 27, 2018
7080105
Move statistics Model to rocketchat:models
MarcosSpessatto Dec 27, 2018
3d2395c
Create rocketchat:metrics to be able to depacking rocketchat callbacks
MarcosSpessatto Dec 27, 2018
289c478
Move callbacks to specific package
MarcosSpessatto Dec 27, 2018
ccba459
Remove unused dependency
MarcosSpessatto Dec 27, 2018
869c15d
Move rocketchat-notifications to a specific package
MarcosSpessatto Dec 27, 2018
cbb3529
Remove dependency between mailer and lib
MarcosSpessatto Dec 27, 2018
4f1947d
Merge branch 'develop' into globals/remove-rocketchat-settings
MarcosSpessatto Jan 2, 2019
52e95cc
Merge branch 'globals/remove-rocketchat-settings' into globals/move-r…
MarcosSpessatto Jan 2, 2019
dfbcf6b
Merge branch 'globals/move-rocketchat-models' into globals/move-rocke…
MarcosSpessatto Jan 3, 2019
e60d248
Merge branch 'globals/move-rocketchat-metrics' into globals/move-rock…
MarcosSpessatto Jan 3, 2019
2c34342
Merge branch 'globals/move-rocketchat-callbacks' into globals/move-ro…
MarcosSpessatto Jan 3, 2019
6313e97
Merge branch 'globals/move-rocketchat-notifications' into globals/roc…
MarcosSpessatto Jan 3, 2019
b40ea2d
Merge branch 'develop' into globals/move-rocketchat-callbacks
MarcosSpessatto Jan 10, 2019
ac03e2d
Merge branch 'develop' into globals/move-rocketchat-callbacks
MarcosSpessatto Jan 10, 2019
483650d
Merge branch 'globals/move-rocketchat-callbacks' into globals/move-ro…
MarcosSpessatto Jan 10, 2019
d6b3cdf
Merge branch 'globals/move-rocketchat-notifications' into globals/roc…
MarcosSpessatto Jan 10, 2019
db361ac
Merge branch 'develop' into globals/move-rocketchat-notifications
rodrigok Jan 10, 2019
d74d241
Merge branch 'globals/move-rocketchat-notifications' into globals/roc…
MarcosSpessatto Jan 10, 2019
7b98cf3
Merge branch 'develop' into globals/rocketchat-mailer
rodrigok Jan 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/rocketchat-mailer/package.js
Expand Up @@ -10,6 +10,7 @@ Package.onUse(function(api) {
'email',
'ddp-rate-limiter',
'rocketchat:i18n',
'rocketchat:settings',
]);

api.mainModule('server/api.js', 'server');
Expand Down
5 changes: 3 additions & 2 deletions packages/rocketchat-mailer/server/api.js
@@ -1,6 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Email } from 'meteor/email';
import { TAPi18n } from 'meteor/tap:i18n';
import { settings } from 'meteor/rocketchat:settings';
import _ from 'underscore';
import s from 'underscore.string';
import juice from 'juice';
Expand Down Expand Up @@ -33,8 +34,8 @@ export const replace = function replace(str, data = {}) {
};

export const replaceEscaped = (str, data = {}) => replace(str, {
Site_Name: s.escapeHTML(RocketChat.settings.get('Site_Name')),
Site_Url: s.escapeHTML(RocketChat.settings.get('Site_Url')),
Site_Name: s.escapeHTML(settings.get('Site_Name')),
Site_Url: s.escapeHTML(settings.get('Site_Url')),
...Object.entries(data).reduce((ret, [key, value]) => {
ret[key] = s.escapeHTML(value);
return ret;
Expand Down