Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into webserver.js-refactor

Browse Source
This commit is contained in:
psychobunny
2014-03-01 15:37:57 -05:00
parent e73f8d6f37 ea222a4295
commit 26853d024e
12 changed files with 106 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/routes/api.js
View File

@@ -30,6 +30,8 @@ var path = require('path'),
user.updateLastOnlineTime(req.user.uid);
}
db.sortedSetAdd('ip:recent', Date.now(), req.ip || 'Unknown');
next();
});
@@ -222,15 +224,13 @@ var path = require('path'),
return res.redirect('/404');
}
var limit = 50;
function searchPosts(callback) {
Plugins.fireHook('filter:search.query', {
index: 'post',
query: req.params.terms
query: req.params.term
}, function(err, pids) {
if (err) {
return callback(err, null);
return callback(err);
}
posts.getPostSummaryByPids(pids, false, callback);
@@ -240,10 +240,10 @@ var path = require('path'),
function searchTopics(callback) {
Plugins.fireHook('filter:search.query', {
index: 'topic',
query: req.params.terms
query: req.params.term
}, function(err, tids) {
if (err) {
return callback(err, null);
return callback(err);
}
topics.getTopicsByTids(tids, 0, callback);