dan/wedding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Send slack message on bouncer-block

Browse Source
This commit is contained in:
Dan Head
2017-02-16 14:06:05 +00:00
parent deefcaadfc
commit c939c09991
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/slack.js
View File

@@ -8,9 +8,9 @@ slack.setWebhook(slackWebhook);
// Debounce sending the slack message to avoid spamming
const slackTimers = {};
export const sendSlackMsg = function sendSlackMsg(text) {
export const sendSlackMsg = function sendSlackMsg(text, channel) {
slack.webhook({
channel: '#wedding-rsvps',
channel,
username: 'weddingbot',
text,
}, err => {
@@ -20,12 +20,12 @@ export const sendSlackMsg = function sendSlackMsg(text) {
});
};
export const sendSlackMsgWithDebounce = function sendSlackMsgWithDebounce(text, key) {
export const sendSlackMsgWithDebounce = function sendSlackMsgWithDebounce(text, channel, key) {
if (key) {
// Stop previous msg
clearTimeout(slackTimers[key]);
slackTimers[key] = setTimeout(() => {
sendSlackMsg(text);
sendSlackMsg(text, channel);
}, 10000);
}
};

11
src/server.js
View File

@@ -24,7 +24,7 @@ import assets from './assets'; // eslint-disable-line import/no-unresolved
import { port, auth, starters, mains, rsvpEndDate } from './config';
import Person from './data/models/Person';
import Rollbar from './core/rollbar';
import { sendSlackMsgWithDebounce } from './core/slack';
import { sendSlackMsg, sendSlackMsgWithDebounce } from './core/slack';
import sequelize from './data/sequelize';
const app = express();
@@ -33,12 +33,15 @@ Rollbar.init();
const bouncer = Bouncer(10 * 60 * 1000, 60 * 60 * 1000, 5);
bouncer.blocked = (req, res, next, remaining) => {
let time = Math.ceil(remaining / 1000);
let suffix = ' seconds';
let suffix = 'seconds';
if (time > 120) {
time = Math.ceil(time / 60);
suffix = ' minutes';
suffix = 'minutes';
}
const body = `You have made too many incorrect attempts. Please wait ${time} ${suffix}.`;
const uAgent = req.headers['user-agent'];
const ip = req.headers['x-forwarded-for'];
sendSlackMsg(`Bouncer block\nIP address: ${ip}\nUser agent: ${uAgent}\nDuration: ${time} ${suffix}`, '#wedding-site');
res.status(429).send(body);
};
@@ -166,7 +169,7 @@ app.post('/rsvp/save', (req, res) => {
const main = (data.attending && data.main !== -1) ? `\nMain: ${mains[data.main]}` : '';
const dietary = (data.attending && data.dietary) ? `\nDietary requirements: ${data.dietary}` : '';
sendSlackMsgWithDebounce(`${data.firstname} ${data.lastname} has saved their RSVP:${attending}${starter}${main}${dietary}`, req.body.key);
sendSlackMsgWithDebounce(`${data.firstname} ${data.lastname} has saved their RSVP:${attending}${starter}${main}${dietary}`, '#wedding-rsvps', req.body.key);
}
res.json({
success: true,