diff options
| author | jules <jules@carbonpictures.com> | 2017-05-21 01:16:37 +0000 |
|---|---|---|
| committer | jules <jules@carbonpictures.com> | 2017-05-21 01:16:37 +0000 |
| commit | a2601142ae367335d3103305138ad69f88663a22 (patch) | |
| tree | 4e3d8a5e6ddf41eae206df69c094074cee88ab22 | |
| parent | a12d2288246709c6b97bbd7d04dafe6a9177f419 (diff) | |
fix args
| -rw-r--r-- | db.json | 8 | ||||
| -rw-r--r-- | lib/awmail/index.js | 35 |
2 files changed, 27 insertions, 16 deletions
@@ -2187,6 +2187,14 @@ "disabled": false, "__index": 6, "dateCreated": "Thu, 18 May 2017 00:16:34 GMT" + }, + { + "id": "find-your-face", + "title": "Find Your Face", + "body": "Description of face recognition pipeline coming SOON!", + "disabled": false, + "__index": 7, + "dateCreated": "Sat, 20 May 2017 21:50:17 GMT" } ], "stream": [ diff --git a/lib/awmail/index.js b/lib/awmail/index.js index 64db34c..0373100 100644 --- a/lib/awmail/index.js +++ b/lib/awmail/index.js @@ -40,21 +40,21 @@ function AWMail (options) { key: process.env.MAILGUN_API_KEY, }) - var multerMiddleware = mult.fields([ - { name: 'dots', maxCount: 1 }, - { name: 'lines', maxCount: 1 }, - { name: 'plain', maxCount: 1 }, - ]) + var multerMiddleware = mult.fields([ + { name: 'dots', maxCount: 1 }, + { name: 'lines', maxCount: 1 }, + { name: 'plain', maxCount: 1 }, + ]) router.post('/send', multerMiddleware, function (req, res) { res.header('Access-Control-Allow-Origin', '*') res.header('Access-Control-Allow-Headers', 'X-Requested-With') - var id = uuid() + var id = uuid() var email = req.body.email var track = req.body.track var secret = req.body.secret - var dots_url, lines_url, plain_url + var dots_url, lines_url, plain_url if (secret !== config.secret) { return res.sendStatus(500) @@ -63,25 +63,25 @@ function AWMail (options) { deferToNextTick().then(function(){ console.log("upload dots") return uploadImage({ - filename: uuid + '-dots.jpg', + filename: uuid + '-dots.jpg', file: req.files.dots[0], }) }).then(function(url){ console.log("upload lines") - dots_url = url + dots_url = url return uploadImage({ - filename: uuid + '-lines.jpg', + filename: uuid + '-lines.jpg', file: req.files.lines[0], }) }).then(function(url){ console.log("upload plain") - lines_url = url + lines_url = url return uploadImage({ - filename: uuid + '-plain.jpg', + filename: uuid + '-plain.jpg', file: req.files.plain[0], }) }).then(function(url){ - plain_url = url + plain_url = url console.log("parse templates") // https://marsupial.s3.amazonaws.com/armory/mail/260b1e90-380e-11e7-b0c0-190f661d482a.jpg var templateData = { @@ -119,6 +119,7 @@ function AWMail (options) { var message = req.body.message var track = req.body.track var secret = req.body.secret + var publish = req.body.publish if (secret !== config.secret) { return res.sendStatus(500) @@ -126,7 +127,7 @@ function AWMail (options) { deferToNextTick().then(function(){ console.log("store message") - return storeMessage(name, email, message) + return storeMessage(name, email, message, publish) }).then(function(){ console.log("store email") if (String(track) === 'true') { @@ -246,15 +247,17 @@ function AWMail (options) { }) } - function storeMessage (name, mail, message){ + function storeMessage (name, mail, message,publish){ return Q.Promise(function(resolve, reject, notify) { var data = {} - data['Name'] = mail + data['Name'] = name data['entry.828397709'] = name data['Email'] = mail data['entry.1436672940'] = mail data['Message'] = message data['entry.2103257301'] = message + data['Publish'] = publish ? 'x' : '' + data['entry.125849372'] = publish ? 'x' : '' data['fvv'] = "1" var url = "https://docs.google.com/forms/d/e/1FAIpQLSdWDnpy4ZF1dJwfAcX5CUITpjbLqLC7rS7nr2iSQrEeGXM1bQ/formResponse" |
