Merge branch 'master' into private-groups

public/language/en_GB/search.json

@@ -1,4 +1,5 @@
 {
 	"results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
-	"no-matches": "No posts found"
+	"no-matches": "No matches found",
+	"in": "In"
 }

public/src/app.js

@@ -435,11 +435,9 @@ app.uid = null;
 		require(['search', 'mousetrap'], function(search, Mousetrap) {
 			$('#search-form').on('submit', function (e) {
 				e.preventDefault();
-				var input = $(this).find('input'),
+				var input = $(this).find('input');
-					term = input.val();
 
-
+				search.query(input.val(), 'posts', function() {
-				search.query(term, function() {
 					input.val('');
 				});
 			});

public/src/client/search.js

@@ -2,9 +2,17 @@ define('forum/search', ['search'], function(searchModule) {
 	var	Search = {};
 
 	Search.init = function() {
-		var searchQuery = $('#post-results').attr('data-search-query');
+		var searchQuery = $('#results').attr('data-search-query');
 		var regexes = [];
 		var searchTerms = searchQuery.split(' ');
+
+		$('#advanced-search input').val(searchQuery);
+		var params = utils.params();
+		if (params && params.in) {
+			$('#advanced-search select').val(params.in);
+		}
+
+
 		for (var i=0; i<searchTerms.length; ++i) {
 			var regex = new RegExp(searchTerms[i], 'gi');
 			regexes.push({regex: regex, term: searchTerms[i]});
@@ -19,13 +27,13 @@ define('forum/search', ['search'], function(searchModule) {
 			result.html(text).find('img').addClass('img-responsive');
 		});
 
-		$('#search-form input').val(searchQuery);
 
-		$('#mobile-search-form').off('submit').on('submit', function(e) {
+		$('#advanced-search').off('submit').on('submit', function(e) {
 			e.preventDefault();
 			var input = $(this).find('input');
+			var searchIn = $(this).find('select');
 
-			searchModule.query(input.val(), function() {
+			searchModule.query(input.val(), searchIn.val(), function() {
 				input.val('');
 			});
 		});

public/src/modules/helpers.js

@@ -45,7 +45,6 @@
 
 		templates.registerHelper('displayUsersLink', helpers.displayUsersLink);
 		templates.registerHelper('buildMetaTag', helpers.buildMetaTag);
-		templates.registerHelper('membershipBtn', helpers.membershipBtn);
 	};
 
 	// Use the define() function if we're in AMD land

public/src/modules/search.js

@@ -1,12 +1,13 @@
+"use strict";
+/* globals socket, ajaxify, translator, app, define */
+
 define('search', ['navigator'], function(nav) {
-	"use strict";
-	/* globals socket, ajaxify */
 
 	var Search = {
 			current: {}
 		};
 
-	Search.query = function(term, callback) {
+	Search.query = function(term, searchIn, callback) {
 		// Detect if a tid was specified
 		var topicSearch = term.match(/in:topic-([\d]+)/);
 
@@ -19,7 +20,7 @@ define('search', ['navigator'], function(nav) {
 				return app.alertError('[[error:invalid-search-term]]');
 			}
 
-			ajaxify.go('search/' + term);
+			ajaxify.go('search/' + term + (searchIn ? '?in=' + searchIn : ''));
 			callback();
 		} else {
 			var cleanedTerm = term.replace(topicSearch[0], ''),
@@ -105,7 +106,7 @@ define('search', ['navigator'], function(nav) {
 				Mousetrap.bind('esc', Search.topicDOM.end);
 			});
 		}
-	}
+	};
 
 	Search.topicDOM.end = function() {
 		$('.topic-search').addClass('hidden').find('.prev, .next').attr('disabled', 'disabled');

src/controllers/categories.js

@@ -35,8 +35,13 @@ var anonCache = {}, lastUpdateTime = 0;
 
 categoriesController.popular = function(req, res, next) {
 	var uid = req.user ? req.user.uid : 0;
-
+	var terms = {
-	var term = req.params.term || 'daily';
+		daily: 'day',
+		weekly: 'week',
+		monthly: 'month',
+		alltime: 'alltime'
+	};
+	var term = terms[req.params.term] || 'day';
 
 	if (uid === 0) {
 		if (anonCache[term] && (Date.now() - lastUpdateTime) < 60 * 60 * 1000) {

src/controllers/index.js

@@ -3,6 +3,7 @@
 var topicsController = require('./topics'),
 	categoriesController = require('./categories'),
 	tagsController = require('./tags'),
+	searchController = require('./search'),
 	usersController = require('./users'),
 	groupsController = require('./groups'),
 	accountsController = require('./accounts'),
@@ -20,7 +21,6 @@ var topicsController = require('./topics'),
 	user = require('../user'),
 	posts = require('../posts'),
 	topics = require('../topics'),
-	search = require('../search'),
 	plugins = require('../plugins'),
 	categories = require('../categories'),
 	privileges = require('../privileges');
@@ -29,6 +29,7 @@ var Controllers = {
 	topics: topicsController,
 	categories: categoriesController,
 	tags: tagsController,
+	search: searchController,
 	users: usersController,
 	groups: groupsController,
 	accounts: accountsController,
@@ -103,33 +104,6 @@ Controllers.home = function(req, res, next) {
 	});
 };
 
-Controllers.search = function(req, res, next) {
-	if (!plugins.hasListeners('filter:search.query')) {
-		return helpers.notFound(req, res);
-	}
-
-	if (!req.params.term) {
-		return res.render('search', {
-			time: 0,
-			search_query: '',
-			posts: [],
-			topics: []
-		});
-	}
-
-	var uid = req.user ? req.user.uid : 0;
-
-	req.params.term = validator.escape(req.params.term);
-
-	search.search(req.params.term, uid, function(err, results) {
-		if (err) {
-			return next(err);
-		}
-
-		return res.render('search', results);
-	});
-};
-
 Controllers.reset = function(req, res, next) {
 	res.render(req.params.code ? 'reset_code' : 'reset', {
 		reset_code: req.params.code ? req.params.code : null

src/controllers/search.js

@@ -0,0 +1,41 @@
+
+'use strict';
+
+var searchController = {},
+	validator = require('validator'),
+	plugins = require('../plugins'),
+	search = require('../search'),
+	helpers = require('./helpers');
+
+
+searchController.search = function(req, res, next) {
+	if (!plugins.hasListeners('filter:search.query')) {
+		return helpers.notFound(req, res);
+	}
+
+	if (!req.params.term) {
+		return res.render('search', {
+			time: 0,
+			search_query: '',
+			posts: [],
+			topics: [],
+			users: [],
+			tags: []
+		});
+	}
+
+	var uid = req.user ? req.user.uid : 0;
+
+	req.params.term = validator.escape(req.params.term);
+
+	search.search(req.params.term, req.query.in, uid, function(err, results) {
+		if (err) {
+			return next(err);
+		}
+
+		res.render('search', results);
+	});
+};
+
+
+module.exports = searchController;

src/routes/index.js

@@ -26,7 +26,7 @@ function mainRoutes(app, middleware, controllers) {
 	setupPageRoute(app, '/register', middleware, loginRegisterMiddleware, controllers.register);
 	setupPageRoute(app, '/confirm/:code', middleware, [], controllers.confirmEmail);
 	setupPageRoute(app, '/outgoing', middleware, [], controllers.outgoing);
-	setupPageRoute(app, '/search/:term?', middleware, [middleware.guestSearchingAllowed], controllers.search);
+	setupPageRoute(app, '/search/:term?', middleware, [middleware.guestSearchingAllowed], controllers.search.search);
 	setupPageRoute(app, '/reset/:code?', middleware, [], controllers.reset);
 	setupPageRoute(app, '/tos', middleware, [], controllers.termsOfUse);
 }

src/search.js

@@ -3,6 +3,7 @@
 var async = require('async'),
 	posts = require('./posts'),
 	topics = require('./topics'),
+	user = require('./user'),
 	plugins = require('./plugins'),
 	privileges = require('./privileges');
 
@@ -10,15 +11,46 @@ var search = {};
 
 module.exports = search;
 
-search.search = function(term, uid, callback) {
+search.search = function(query, searchIn, uid, callback) {
+	function done(err, data) {
+		if (err) {
+			return callback(err);
+		}
+
+		result.search_query = query;
+		result[searchIn] = data;
+		result.matchCount = data.length;
+		result.time = (process.elapsedTimeSince(start) / 1000).toFixed(2);
+		callback(null, result);
+	}
+
 	var start = process.hrtime();
+	searchIn = searchIn || 'posts';
 
+	var result = {
+		posts: [],
+		users: [],
+		tags: []
+	};
+
+	if (searchIn === 'posts') {
+		searchInPosts(query, uid, done);
+	} else if (searchIn === 'users') {
+		searchInUsers(query, done);
+	} else if (searchIn === 'tags') {
+		searchInTags(query, done);
+	} else {
+		callback(new Error('[[error:unknown-search-filter]]'));
+	}
+};
+
+function searchInPosts(query, uid, callback) {
 	async.parallel({
 		pids: function(next) {
-			searchTerm('post', term, next);
+			searchQuery('post', query, next);
 		},
 		tids: function(next) {
-			searchTerm('topic', term, next);
+			searchQuery('topic', query, next);
 		}
 	}, function (err, results) {
 		if (err) {
@@ -26,47 +58,37 @@ search.search = function(term, uid, callback) {
 		}
 
 		if (!results || (!results.pids.length && !results.tids.length)) {
-			return callback(null, {
+			return callback(null, []);
-				time: (process.elapsedTimeSince(start) / 1000).toFixed(2),
-				search_query: term,
-				results: [],
-				matchCount: 0
-			});
 		}
 
-		getMainPids(results.tids, function(err, mainPids) {
+		async.waterfall([
-			if (err) {
+			function(next) {
-				return callback(err);
+				getMainPids(results.tids, next);
-			}
+			},
-
+			function(mainPids, next) {
-			results.pids.forEach(function(pid) {
+				results.pids.forEach(function(pid) {
-				if (mainPids.indexOf(pid) === -1) {
+					if (mainPids.indexOf(pid) === -1) {
-					mainPids.push(pid);
+						mainPids.push(pid);
-				}
-			});
-
-			privileges.posts.filter('read', mainPids, uid, function(err, pids) {
-				if (err) {
-					return callback(err);
-				}
-
-				posts.getPostSummaryByPids(pids, uid, {stripTags: true, parse: false}, function(err, posts) {
-					if (err) {
-						return callback(err);
 					}
-
-					callback(null, {
-						time: (process.elapsedTimeSince(start) / 1000).toFixed(2),
-						search_query: term,
-						results: posts,
-						matchCount: posts.length
-					});
 				});
-			});
+				privileges.posts.filter('read', mainPids, uid, next);
-		});
+			},
+			function(pids, next) {
+				posts.getPostSummaryByPids(pids, uid, {stripTags: true, parse: false}, next);
+			}
+		], callback);
 	});
-};
+}
 
+function searchInUsers(query, callback) {
+	user.search({query: query}, function(err, results) {
+		callback(err, results ? results.users : null);
+	});
+}
+
+function searchInTags(query, callback) {
+	topics.searchAndLoadTags({query: query}, callback);
+}
 
 function getMainPids(tids, callback) {
 	topics.getTopicsFields(tids, ['mainPid'], function(err, topics) {
@@ -80,10 +102,10 @@ function getMainPids(tids, callback) {
 	});
 }
 
-function searchTerm(index, term, callback) {
+function searchQuery(index, query, callback) {
 	plugins.fireHook('filter:search.query', {
 		index: index,
-		query: term
+		query: query
 	}, callback);
 }
 

src/socket.io/topics.js

@@ -522,38 +522,7 @@ SocketTopics.searchAndLoadTags = function(socket, data, callback) {
 	if (!data) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
-	if (!data.query || !data.query.length) {
+	topics.searchAndLoadTags(data, callback);
-		return callback(null, []);
-	}
-	topics.searchTags(data, function(err, tags) {
-		if (err) {
-			return callback(err);
-		}
-		async.parallel({
-			counts: function(next) {
-				db.sortedSetScores('tags:topic:count', tags, next);
-			},
-			tagData: function(next) {
-				tags = tags.map(function(tag) {
-					return {value: tag};
-				});
-
-				topics.getTagData(tags, next);
-			}
-		}, function(err, results) {
-			if (err) {
-				return callback(err);
-			}
-			results.tagData.forEach(function(tag, index) {
-				tag.score = results.counts[index];
-			});
-			results.tagData.sort(function(a, b) {
-				return b.score - a.score;
-			});
-
-			callback(null, results.tagData);
-		});
-	});
 };
 
 SocketTopics.loadMoreTags = function(socket, data, callback) {

src/topics/popular.js

@@ -7,11 +7,6 @@ var async = require('async'),
 
 
 module.exports = function(Topics) {
-	var terms = {
-		daily: 'day',
-		weekly: 'week',
-		monthly: 'month'
-	};
 
 	Topics.getPopular = function(term, uid, count, callback) {
 		count = parseInt(count, 10) || 20;
@@ -20,11 +15,9 @@ module.exports = function(Topics) {
 			return getAllTimePopular(uid, count, callback);
 		}
 
-		var since = terms[term] || 'day';
-
 		async.waterfall([
 			function(next) {
-				Topics.getLatestTids(0, -1, since, next);
+				Topics.getLatestTidsFromSet('topics:tid', 0, -1, term, next);
 			},
 			function(tids, next) {
 				getTopics(tids, uid, count, next);

src/topics/recent.js

@@ -3,10 +3,9 @@
 'use strict';
 
 var async = require('async'),
+	winston = require('winston'),
 	db = require('../database');
 
-
-
 module.exports = function(Topics) {
 	var terms = {
 		day: 86400000,
@@ -18,7 +17,7 @@ module.exports = function(Topics) {
 	Topics.getLatestTopics = function(uid, start, end, term, callback) {
 		async.waterfall([
 			function (next) {
-				Topics.getLatestTids(start, end, term, next);
+				Topics.getLatestTidsFromSet('topics:recent', start, end, term, next);
 			},
 			function(tids, next) {
 				Topics.getTopics(tids, uid, next);
@@ -30,6 +29,11 @@ module.exports = function(Topics) {
 	};
 
 	Topics.getLatestTids = function(start, end, term, callback) {
+		winston.warn('[deprecation warning] please use Topics.getLatestTidsFromSet("topics:recent")');
+		Topics.getLatestTidsFromSet('topics:recent', start, end, term, callback);
+	};
+
+	Topics.getLatestTidsFromSet = function(set, start, end, term, callback) {
 		var since = terms.day;
 		if (terms[term]) {
 			since = terms[term];
@@ -37,7 +41,7 @@ module.exports = function(Topics) {
 
 		var count = parseInt(end, 10) === -1 ? end : end - start + 1;
 
-		db.getSortedSetRevRangeByScore('topics:recent', start, count, '+inf', Date.now() - since, callback);
+		db.getSortedSetRevRangeByScore(set, start, count, '+inf', Date.now() - since, callback);
 	};
 
 	Topics.updateTimestamp = function(tid, timestamp, callback) {

src/topics/tags.js

@@ -276,4 +276,39 @@ module.exports = function(Topics) {
 		});
 	};
 
+	Topics.searchAndLoadTags = function(data, callback) {
+		if (!data.query || !data.query.length) {
+			return callback(null, []);
+		}
+		Topics.searchTags(data, function(err, tags) {
+			if (err) {
+				return callback(err);
+			}
+			async.parallel({
+				counts: function(next) {
+					db.sortedSetScores('tags:topic:count', tags, next);
+				},
+				tagData: function(next) {
+					tags = tags.map(function(tag) {
+						return {value: tag};
+					});
+
+					Topics.getTagData(tags, next);
+				}
+			}, function(err, results) {
+				if (err) {
+					return callback(err);
+				}
+				results.tagData.forEach(function(tag, index) {
+					tag.score = results.counts[index];
+				});
+				results.tagData.sort(function(a, b) {
+					return b.score - a.score;
+				});
+
+				callback(null, results.tagData);
+			});
+		});
+	};
+
 };