diff --git a/src/core/emailer.js b/src/core/emailer.js index cd365fe..d4ec346 100644 --- a/src/core/emailer.js +++ b/src/core/emailer.js @@ -1,6 +1,6 @@ import Nodemailer from 'nodemailer'; import { email, starters, mains, getRsvpEnd } from '../config'; -import { handleError } from '../core/rollbar'; +import Rollbar from './rollbar'; import Settings from '../data/models/Settings'; const transporter = Nodemailer.createTransport({ @@ -49,12 +49,12 @@ export const sendRSVPEmail = function sendRSVPEmail(person) { // send mail with defined transport object transporter.sendMail(mailOptions, (error) => { if (error) { - handleError(error); + Rollbar.handleError(error); } }); } }).catch(err => { - handleError(err); + Rollbar.handleError(err); }); }; @@ -64,6 +64,6 @@ export const sendRSVPEmailWithDebounce = function sendRSVPEmailWithDebounce(pers clearTimeout(emailTimers[person.key]); emailTimers[person.key] = setTimeout(() => { sendRSVPEmail(person); - }, 60000); + }, email.debounce); } }; diff --git a/src/core/slack.js b/src/core/slack.js index f73feba..a7420db 100644 --- a/src/core/slack.js +++ b/src/core/slack.js @@ -1,10 +1,10 @@ import Slack from 'slack-node'; -import { slackWebhook } from '../config'; -import { handleError } from '../core/rollbar'; +import { slack as slackCfg } from '../config'; +import Rollbar from './rollbar'; import Settings from '../data/models/Settings'; const slack = new Slack(); -slack.setWebhook(slackWebhook); +slack.setWebhook(slackCfg.webhook); // Debounce sending the slack message to avoid spamming const slackTimers = {}; @@ -18,12 +18,12 @@ export const sendSlackMsg = function sendSlackMsg(text, channel) { text, }, err => { if (err) { - handleError(err); + Rollbar.handleError(err); } }); } }).catch(err => { - handleError(err); + Rollbar.handleError(err); }); }; @@ -33,6 +33,6 @@ export const sendSlackMsgWithDebounce = function sendSlackMsgWithDebounce(text, clearTimeout(slackTimers[key]); slackTimers[key] = setTimeout(() => { sendSlackMsg(text, channel); - }, 60000); + }, slackCfg.debounce); } };