more desiiiiiiiign

2 files changed, 11 insertions, 3 deletions

diff --git a/bucky/app/bucky.js b/bucky/app/bucky.js
index 2b07f03..49ad8e0 100644
--- a/bucky/app/bucky.js
+++ b/bucky/app/bucky.js
@@ -176,7 +176,7 @@ var bucky = module.exports = {
     var hasComment = req.body.comment && req.body.comment.length
     var hasFile = req.files && req.files.length
     if (! hasComment && ! hasFile) {
-      console.log(">>> NO FILES OR COMMENT")
+      console.log(">>> no files or comment")
       return res.sendStatus(400)
     }
     next()
@@ -249,6 +249,11 @@ var bucky = module.exports = {
         })
       })
     })
+    Promise.all(promises).then(values => {
+      next()
+    }).catch(err => {
+      console.log(err)
+    })
   },
 
   /* MAIL */
diff --git a/bucky/app/router.js b/bucky/app/router.js
index bd72a4d..a793192 100644
--- a/bucky/app/router.js
+++ b/bucky/app/router.js
@@ -5,7 +5,7 @@ var bucky = require('./bucky')
 var db = require('../db')
 var util = require('../util/util')
 var search = require('../search/middleware')
-var multer = require('multer')({ dest:'./uploads/' })
+var multer = require('multer')()
 
 module.exports = function(app){
 	app.all('*', middleware.ensureLocals)
@@ -89,7 +89,10 @@ module.exports = function(app){
     middleware.ensureAuthenticated,
     bucky.ensureThread,
     // ensure thread privacy
-    bucky.createComment,
+    multer.array("files"),
+    bucky.verifyFilesOrComment,
+    bucky.createOptionalFiles,
+    bucky.createOptionalComment,
     function(req, res){
       res.json({
         comment: res.comment