diff options
Diffstat (limited to 'bucky/app')
| -rw-r--r-- | bucky/app/bucky.js | 39 | ||||
| -rw-r--r-- | bucky/app/index.js | 1 | ||||
| -rw-r--r-- | bucky/app/router.js | 2 |
3 files changed, 29 insertions, 13 deletions
diff --git a/bucky/app/bucky.js b/bucky/app/bucky.js index 5198400..2b07f03 100644 --- a/bucky/app/bucky.js +++ b/bucky/app/bucky.js @@ -87,7 +87,7 @@ var bucky = module.exports = { private: false, color: req.body.color, viewed: 0, - revision: 'a', + revision: 0, } db.createThread(data).then(function(thread){ res.thread = thread @@ -221,16 +221,33 @@ var bucky = module.exports = { res.json({ error: "no files" }) return } - var data = { - thread: res.thread.get('id'), - parent_id: req.body.parent_id || -1, - username: req.user.get('username'), - date: util.now(), - comment: req.body.comment, - } - db.createComment(data).then(function(comment){ - res.comment = comment - next() + var thread_id = res.thread.get('id') + var dirname = '/bucky/data/' + thread_id + '/' + var promises = req.files.map((file) => { + return new Promise( (resolve, reject) => { + upload.put({ + file: file, + preserveFilename: true, + dirname: dirname, + unacceptable: function(err){ + reject(err) + }, + success: function(url){ + var data = { + thread: res.thread.get('id'), + username: req.user.get('username'), + filename: file.originalname, + date: util.now(), + size: file.size, + private: false, + storage: 'i.asdf.us', + } + db.createFile(data).then(function(file){ + resolve(file) + }).catch( (err) => reject(err) ) + } + }) + }) }) }, diff --git a/bucky/app/index.js b/bucky/app/index.js index cbf7388..be3e732 100644 --- a/bucky/app/index.js +++ b/bucky/app/index.js @@ -60,7 +60,6 @@ site.init = function(){ key: process.env.S3_KEY, secret: process.env.S3_SECRET, bucket: process.env.S3_BUCKET, - path: process.env.S3_PATH, }) site.route(app) diff --git a/bucky/app/router.js b/bucky/app/router.js index 134ab1d..bd72a4d 100644 --- a/bucky/app/router.js +++ b/bucky/app/router.js @@ -80,7 +80,7 @@ module.exports = function(app){ multer.array("files"), bucky.verifyFilesOrComment, bucky.createThread, -// bucky.createFiles, + bucky.createOptionalFiles, bucky.createOptionalComment, function(req, res){ res.json(res.thread) |
