-
diff --git a/public/templates/search.tpl b/public/templates/search.tpl
new file mode 100644
index 0000000000..19a369600f
--- /dev/null
+++ b/public/templates/search.tpl
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+ No search results for {search_query}.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/postTools.js b/src/postTools.js
index 1afa47c10c..0f826ec995 100644
--- a/src/postTools.js
+++ b/src/postTools.js
@@ -6,7 +6,9 @@ var RDB = require('./redis.js'),
async = require('async'),
utils = require('../public/src/utils'),
- plugins = require('./plugins');
+ plugins = require('./plugins'),
+ reds = require('reds'),
+ search = reds.createSearch('nodebbsearch');
(function(PostTools) {
PostTools.isMain = function(pid, tid, callback) {
@@ -56,6 +58,10 @@ var RDB = require('./redis.js'),
posts.setPostField(pid, 'edited', Date.now());
posts.setPostField(pid, 'editor', uid);
+ search.remove(pid, function() {
+ search.index(content, pid);
+ });
+
posts.getPostField(pid, 'tid', function(tid) {
PostTools.isMain(pid, tid, function(isMainPost) {
if (isMainPost)
@@ -84,6 +90,7 @@ var RDB = require('./redis.js'),
var success = function() {
posts.setPostField(pid, 'deleted', 1);
+ search.remove(pid);
posts.getPostFields(pid, ['tid', 'uid'], function(postData) {
@@ -119,7 +126,7 @@ var RDB = require('./redis.js'),
var success = function() {
posts.setPostField(pid, 'deleted', 0);
- posts.getPostFields(pid, ['tid', 'uid'], function(postData) {
+ posts.getPostFields(pid, ['tid', 'uid', 'content'], function(postData) {
user.incrementUserFieldBy(postData.uid, 'postcount', 1);
@@ -132,6 +139,8 @@ var RDB = require('./redis.js'),
topics.updateTimestamp(postData.tid, timestamp);
});
});
+
+ search.index(postData.content, pid);
});
};
diff --git a/src/posts.js b/src/posts.js
index e9d5ae6a4d..769d263aee 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -8,7 +8,9 @@ var RDB = require('./redis.js'),
postTools = require('./postTools'),
feed = require('./feed.js'),
async = require('async'),
- plugins = require('./plugins');
+ plugins = require('./plugins'),
+ reds = require('reds'),
+ search = reds.createSearch('nodebbsearch');
(function(Posts) {
@@ -323,46 +325,19 @@ var RDB = require('./redis.js'),
user.onNewPostMade(uid, tid, pid, timestamp);
- var imgur = require('./imgur');
- imgur.setClientID(global.nconf.get('imgurClientID'));
+ uploadPostImages(postData, images, function(err, uploadedImages) {
+ if(err) {
+ console.log('Uploading images failed!');
+ } else {
+ postData.uploadedImages = JSON.stringify(uploadedImages);
+ Posts.setPostField(pid, 'uploadedImages', postData.uploadedImages);
+ }
+ callback(postData);
+ });
- var uploadedImages = [];
-
- function uploadImage(image, callback) {
- imgur.upload(image.data, 'base64', function(err, data) {
- if(err) {
- callback(err);
- } else {
- if(data.success) {
- var img= {url:data.data.link, name:image.name};
- uploadedImages.push(img);
- callback(null);
- } else {
- callback(data);
- }
- }
- });
- }
-
plugins.fireHook('action:save_post_content', [pid, content]);
- if(!images) {
- postData.uploadedImages = JSON.stringify(uploadedImages);
- Posts.setPostField(pid, 'uploadedImages', postData.uploadedImages);
- callback(postData);
- } else {
- async.each(images, uploadImage, function(err) {
- if(!err) {
- postData.uploadedImages = JSON.stringify(uploadedImages);
- Posts.setPostField(pid, 'uploadedImages', postData.uploadedImages);
-
- callback(postData);
- } else {
- console.log(err);
- callback(null);
- }
- });
- }
+ search.index(content, pid);
});
});
} else {
@@ -370,6 +345,42 @@ var RDB = require('./redis.js'),
}
});
}
+
+ function uploadPostImages(postData, images, callback) {
+ var imgur = require('./imgur');
+ imgur.setClientID(global.nconf.get('imgurClientID'));
+
+ var uploadedImages = [];
+
+ function uploadImage(image, callback) {
+ imgur.upload(image.data, 'base64', function(err, data) {
+ if(err) {
+ callback(err);
+ } else {
+ if(data.success) {
+ var img= {url:data.data.link, name:image.name};
+ uploadedImages.push(img);
+ callback(null);
+ } else {
+ callback(data);
+ }
+ }
+ });
+ }
+
+ if(!images) {
+ callback(null, uploadedImages);
+ } else {
+ async.each(images, uploadImage, function(err) {
+ if(!err) {
+ callback(null, uploadedImages);
+ } else {
+ console.log(err);
+ callback(err, null);
+ }
+ });
+ }
+ }
Posts.getPostsByUid = function(uid, start, end, callback) {
diff --git a/src/routes/api.js b/src/routes/api.js
index 2bd750f7b4..9629869bc4 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -146,5 +146,36 @@ var user = require('./../user.js'),
res.redirect(global.nconf.get('relative_path') + '/404');
}
});
+
+ app.get('/api/search', function(req, res) {
+ return res.json({
+ show_no_results:'hide',
+ search_query:'',
+ posts:[]
+ });
+ });
+
+ app.get('/api/search/:term', function(req, res, next) {
+
+ var reds = require('reds');
+ var search = reds.createSearch('nodebbsearch');
+
+ search
+ .query(query = req.params.term).type('or')
+ .end(function(err, ids) {
+ if (err)
+ return next();
+
+
+ posts.getPostSummaryByPids(ids, function(posts) {
+ res.json(200, {
+ show_no_results:ids.length?'hide':'show',
+ search_query:req.params.term,
+ posts:posts
+ });
+ });
+
+ });
+ });
}
}(exports));
diff --git a/src/webserver.js b/src/webserver.js
index 77bb1388be..41a5b0e8f7 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -382,6 +382,18 @@ var express = require('express'),
res.redirect(global.nconf.get('relative_path') + '/404');
}
});
+
+ app.get('/search', function(req, res) {
+ app.build_header({ req: req, res: res }, function(err, header) {
+ res.send(header + app.create_route("search", null, "search") + templates['footer']);
+ });
+ });
+
+ app.get('/search/:term', function(req, res) {
+ app.build_header({ req: req, res: res }, function(err, header) {
+ res.send(header + app.create_route("search/"+req.params.term, null, "search") + templates['footer']);
+ });
+ });
});
}(WebServer));