diff options
Diffstat (limited to 'bucky')
| -rw-r--r-- | bucky/app/api.js | 2 | ||||
| -rw-r--r-- | bucky/app/bucky.js | 4 | ||||
| -rw-r--r-- | bucky/app/privacy.js | 2 | ||||
| -rw-r--r-- | bucky/db/bookshelf.js | 1 | ||||
| -rw-r--r-- | bucky/search/search.js | 22 |
5 files changed, 17 insertions, 14 deletions
diff --git a/bucky/app/api.js b/bucky/app/api.js index d2472c3..8840fa0 100644 --- a/bucky/app/api.js +++ b/bucky/app/api.js @@ -186,8 +186,8 @@ function route (app){ privacy.checkThreadPrivacy, multer.array("files"), bucky.verifyFilesOrComment, - bucky.createOptionalComment, bucky.createOptionalFiles, + bucky.createOptionalComment, bucky.bumpThreadRevisions, function(req, res){ res.json({ diff --git a/bucky/app/bucky.js b/bucky/app/bucky.js index ab153f9..47026a8 100644 --- a/bucky/app/bucky.js +++ b/bucky/app/bucky.js @@ -413,7 +413,7 @@ var bucky = module.exports = { }) }, createOptionalComment: function(req, res, next){ - if (! req.body.comment || ! req.body.comment.length) { + if (! req.body.comment || ! req.body.comment.length ) { return next() } bucky.createComment(req, res, next) @@ -514,7 +514,7 @@ var bucky = module.exports = { privacy: false, storage: process.env.S3_BUCKET, } - req.body.comment = url+"\n"+file.originalname + req.body.comment = (req.body.comment.length) ? req.body.comment + "<hr>\n" + url + "\n" + file.originalname : url+"\n"+file.originalname db.createFile(data).then(function(file){ resolve(file) }).catch( (err) => reject(err) ).then( diff --git a/bucky/app/privacy.js b/bucky/app/privacy.js index fb1fcd1..86f2475 100644 --- a/bucky/app/privacy.js +++ b/bucky/app/privacy.js @@ -47,4 +47,4 @@ var privacy = module.exports = { }) next() }, -}
\ No newline at end of file +} diff --git a/bucky/db/bookshelf.js b/bucky/db/bookshelf.js index df14961..47a9636 100644 --- a/bucky/db/bookshelf.js +++ b/bucky/db/bookshelf.js @@ -17,6 +17,7 @@ var knex = require('knex')({ }) var bookshelf = require('bookshelf')(knex) +bookshelf.plugin('registry'); module.exports = { bookshelf: bookshelf, diff --git a/bucky/search/search.js b/bucky/search/search.js index 9891963..a4888ad 100644 --- a/bucky/search/search.js +++ b/bucky/search/search.js @@ -1,5 +1,5 @@ var db = require('../db') -var eachSeries = require('async/eachSeries'); +//var eachSeries = require('async/eachSeries'); var redisClient = require('./redis-client.js') const { promisify } = require("util"); const lookupAsync = promisify(redisClient.get).bind(redisClient); @@ -41,13 +41,13 @@ function search (query, start, limit, cb) { var file_ids = [] var results = [] - - eachSeries( - terms, - function(term, callback){ + var promise_terms = terms.map((term) => { + return new Promise((resolve, reject) => { if (STOPWORDS.has(term)) return; redisClient.get(term, function(err, results){ -// if (!results) return callback(); + if (err) { reject(err) } + if (!results) return resolve(); + results = split_results(results) results.forEach((result) => { @@ -59,10 +59,12 @@ function search (query, start, limit, cb) { score.strength += parseFloat(result.strength) score.count += 1 }) - callback() + resolve() }) - }, - function() { + }) + }) + Promise.all( promise_terms) + .then(() => { total = Object.keys(scores).length Object.values(scores).sort((b,a) => { return cmp(a.strength, b.strength) @@ -90,7 +92,7 @@ function search (query, start, limit, cb) { comment_ids: comment_ids, file_ids: file_ids, }); - }) + }) } |