codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-28 23:13:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Rob 2016-09-21 14:46:22 -07:00
commit 880b724e4c
2 changed files with 3 additions and 4 deletions

5
scripts/updateCloseIoLeads.js
View file

@ -93,7 +93,7 @@ const parseDomain = require('parse-domain');
const request = require('request'); const request = require('request');
const earliestDate = new Date(); const earliestDate = new Date();
earliestDate.setUTCDate(earliestDate.getUTCDate() - 3); earliestDate.setUTCDate(earliestDate.getUTCDate() - 10);
const apiKeyEmailMap = {}; const apiKeyEmailMap = {};
const emailApiKeyMap = {}; const emailApiKeyMap = {};
@ -121,13 +121,12 @@ function upsertLeads(done) {
if (err) return done(err); if (err) return done(err);
updateCloseApiKeyMaps((err) => { updateCloseApiKeyMaps((err) => {
if (err) return done(err);
// log('DEBUG: Updating contacts..'); // log('DEBUG: Updating contacts..');
updateCloseLeads(contacts, (err) => { updateCloseLeads(contacts, (err) => {
return done(err); return done(err);
}); });
return done(err);
}); });
}); });
}); });

2
server/slack.coffee
View file

@ -28,7 +28,7 @@ module.exports.sendSlackMessage = (message, rooms=['tower'], options={}) ->
unfurl_media: false unfurl_media: false
if options.papertrail if options.papertrail
secondsFromEpoch = Math.floor(new Date().getTime() / 1000) secondsFromEpoch = Math.floor(new Date().getTime() / 1000)
link = "https://papertrailapp.com/groups/488214/events?time=#{secondsFromEpoch}" link = "https://app.logdna.com/logs/view?t=timestamp:#{secondsFromEpoch}"
form.text += " #{link}" form.text += " #{link}"
# https://api.slack.com/docs/formatting # https://api.slack.com/docs/formatting
form.text = form.text.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;') form.text = form.text.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')