renamed end to stop globally

fixed getting favourites for admins

public/src/client/account/favourites.js

@@ -19,6 +19,7 @@ define('forum/account/favourites', ['forum/account/header', 'forum/infinitescrol
 		}
 
 		infinitescroll.loadMore('posts.loadMoreFavourites', {
+			uid: ajaxify.variables.get('theirid'),
 			after: $('.user-favourite-posts').attr('data-nextstart')
 		}, function(data, done) {
 			if (data.posts && data.posts.length) {

src/batch.js

@@ -28,7 +28,7 @@ var async = require('async'),
 
 		var batch = options.batch || DEFAULT_BATCH_SIZE;
 		var start = 0;
-		var end = batch;
+		var stop = batch;
 		var done = false;
 
 		async.whilst(
@@ -36,11 +36,11 @@ var async = require('async'),
 				return !done;
 			},
 			function(next) {
-				db.getSortedSetRange(setKey, start, end, function(err, ids) {
+				db.getSortedSetRange(setKey, start, stop, function(err, ids) {
 					if (err) {
 						return next(err);
 					}
-					if (!ids.length || options.doneIf(start, end, ids)) {
+					if (!ids.length || options.doneIf(start, stop, ids)) {
 						done = true;
 						return next();
 					}
@@ -49,7 +49,7 @@ var async = require('async'),
 							return next(err);
 						}
 						start += utils.isNumber(options.alwaysStartAt) ? options.alwaysStartAt : batch + 1;
-						end = start + batch;
+						stop = start + batch;
 						next();
 					});
 				});

src/controllers/admin.js

@@ -179,20 +179,20 @@ adminController.flags.get = function(req, res, next) {
 		if (err) {
 			return next(err);
 		}
-		res.render('admin/manage/flags', {posts: posts, next: end + 1, byUsername: byUsername});
+		res.render('admin/manage/flags', {posts: posts, next: stop + 1, byUsername: byUsername});
 	}
 	var uid = req.user ? parseInt(req.user.uid, 10) : 0;
 	var sortBy = req.query.sortBy || 'count';
 	var byUsername = req.query.byUsername || '';
 	var start = 0;
-	var end = 19;
+	var stop = 19;
 
 	if (byUsername) {
-		posts.getUserFlags(byUsername, sortBy, uid, start, end, done);
+		posts.getUserFlags(byUsername, sortBy, uid, start, stop, done);
 	} else {
 		var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged';
-		posts.getFlags(set, uid, start, end, done);	
-	}	
+		posts.getFlags(set, uid, start, stop, done);
+	}
 };
 
 adminController.database.get = function(req, res, next) {
@@ -261,7 +261,7 @@ adminController.navigation.get = function(req, res, next) {
 		if (err) {
 			return next(err);
 		}
-		
+
 		res.render('admin/general/navigation', data);
 	});
 };
@@ -374,7 +374,7 @@ adminController.extend.rewards = function(req, res, next) {
 		if (err) {
 			return next(err);
 		}
-		
+
 		res.render('admin/extend/rewards', data);
 	});
 };

src/controllers/categories.js

@@ -18,8 +18,8 @@ var categoriesController = {},
 
 categoriesController.recent = function(req, res, next) {
 	var uid = req.user ? req.user.uid : 0;
-	var end = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
-	topics.getTopicsFromSet('topics:recent', uid, 0, end, function(err, data) {
+	var stop = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
+	topics.getTopicsFromSet('topics:recent', uid, 0, stop, function(err, data) {
 		if (err) {
 			return next(err);
 		}
@@ -72,8 +72,8 @@ categoriesController.popular = function(req, res, next) {
 
 categoriesController.unread = function(req, res, next) {
 	var uid = req.user ? req.user.uid : 0;
-	var end = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
-	topics.getUnreadTopics(uid, 0, end, function (err, data) {
+	var stop = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
+	topics.getUnreadTopics(uid, 0, stop, function (err, data) {
 		if (err) {
 			return next(err);
 		}

src/controllers/tags.js

@@ -11,9 +11,9 @@ var tagsController = {},
 tagsController.getTag = function(req, res, next) {
 	var tag = validator.escape(req.params.tag);
 	var uid = req.user ? req.user.uid : 0;
-	var end = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
+	var stop = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
 
-	topics.getTagTids(tag, 0, end, function(err, tids) {
+	topics.getTagTids(tag, 0, stop, function(err, tids) {
 		if (err) {
 			return next(err);
 		}
@@ -45,7 +45,7 @@ tagsController.getTag = function(req, res, next) {
 			var data = {
 				topics: topics,
 				tag: tag,
-				nextStart: end + 1,
+				nextStart: stop + 1,
 				breadcrumbs: helpers.buildBreadcrumbs([{text: '[[tags:tags]]', url: '/tags'}, {text: tag}])
 			};
 			res.render('tag', data);

src/controllers/topics.js

@@ -106,9 +106,9 @@ topicsController.get = function(req, res, next) {
 			}
 
 			var start = (page - 1) * settings.postsPerPage + postIndex,
-				end = start + settings.postsPerPage - 1;
+				stop = start + settings.postsPerPage - 1;
 
-			topics.getTopicWithPosts(tid, set, uid, start, end, reverse, function (err, topicData) {
+			topics.getTopicWithPosts(tid, set, uid, start, stop, reverse, function (err, topicData) {
 				if (err && err.message === '[[error:no-topic]]' && !topicData) {
 					return helpers.notFound(req, res);
 				}
@@ -255,7 +255,7 @@ topicsController.get = function(req, res, next) {
 		data['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
 		data['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1;
 		data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
-		data['rssFeedUrl'] = nconf.get('relative_path') + '/topic/' + data.tid + '.rss';
+		data.rssFeedUrl = nconf.get('relative_path') + '/topic/' + data.tid + '.rss';
 		data.pagination = pagination.create(data.currentPage, data.pageCount);
 		data.pagination.rel.forEach(function(rel) {
 			res.locals.linkTags.push(rel);
@@ -280,36 +280,31 @@ topicsController.teaser = function(req, res, next) {
 		return next(new Error('[[error:invalid-tid]]'));
 	}
 
-	privileges.topics.can('read', tid, uid, function(err, canRead) {
-		if (err) {
-			return next(err);
-		}
-
-		if (!canRead) {
-			return res.status(403).json('[[error:no-privileges]]');
-		}
-
-		topics.getLatestUndeletedPid(tid, function(err, pid) {
-			if (err) {
-				return next(err);
+	async.waterfall([
+		function(next) {
+			privileges.topics.can('read', tid, uid, next);
+		},
+		function(canRead, next) {
+			if (!canRead) {
+				return res.status(403).json('[[error:no-privileges]]');
 			}
-
+			topics.getLatestUndeletedPid(tid, next);
+		},
+		function(pid, next) {
 			if (!pid) {
 				return res.status(404).json('not-found');
 			}
+			posts.getPostSummaryByPids([pid], uid, {stripTags: false}, next);
+		}
+	], function(err, posts) {
+		if (err) {
+			return next(err);
+		}
 
-			posts.getPostSummaryByPids([pid], uid, {stripTags: false}, function(err, posts) {
-				if (err) {
-					return next(err);
-				}
-
-				if (!Array.isArray(posts) || !posts.length) {
-					return res.status(404).json('not-found');
-				}
-
-				res.json(posts[0]);
-			});
-		});
+		if (!Array.isArray(posts) || !posts.length) {
+			return res.status(404).json('not-found');
+		}
+		res.json(posts[0]);
 	});
 };
 

src/groups.js

@@ -93,8 +93,8 @@ var async = require('async'),
 		});
 	};
 
-	Groups.getGroups = function(start, end, callback) {
-		db.getSortedSetRevRange('groups:createtime', start, end, callback);
+	Groups.getGroups = function(start, stop, callback) {
+		db.getSortedSetRevRange('groups:createtime', start, stop, callback);
 	};
 
 	Groups.get = function(groupName, options, callback) {
@@ -315,8 +315,8 @@ var async = require('async'),
 		});
 	};
 
-	Groups.getMembers = function(groupName, start, end, callback) {
-		db.getSortedSetRevRange('group:' + groupName + ':members', start, end, callback);
+	Groups.getMembers = function(groupName, start, stop, callback) {
+		db.getSortedSetRevRange('group:' + groupName + ':members', start, stop, callback);
 	};
 
 	Groups.getMembersOfGroups = function(groupNames, callback) {

src/messaging.js

@@ -225,10 +225,10 @@ var db = require('./database'),
 		db.sortedSetAdd('uid:' + uid + ':chats', Date.now(), toUid, callback);
 	};
 
-	Messaging.getRecentChats = function(uid, start, end, callback) {
+	Messaging.getRecentChats = function(uid, start, stop, callback) {
 		var websockets = require('./socket.io');
 
-		db.getSortedSetRevRange('uid:' + uid + ':chats', start, end, function(err, uids) {
+		db.getSortedSetRevRange('uid:' + uid + ':chats', start, stop, function(err, uids) {
 			if (err) {
 				return callback(err);
 			}
@@ -250,7 +250,7 @@ var db = require('./database'),
 				});
 
 				if (!results.users.length) {
-					return callback(null, {users: [], nextStart: end + 1});
+					return callback(null, {users: [], nextStart: stop + 1});
 				}
 
 				results.users.forEach(function(user, index) {
@@ -260,7 +260,7 @@ var db = require('./database'),
 					}
 				});
 
-				callback(null, {users: results.users, nextStart: end + 1});
+				callback(null, {users: results.users, nextStart: stop + 1});
 			});
 		});
 	};

src/posts.js

@@ -26,11 +26,11 @@ var async = require('async'),
 		db.isSortedSetMember('posts:pid', pid, callback);
 	};
 
-	Posts.getPidsFromSet = function(set, start, end, reverse, callback) {
-		if (isNaN(start) || isNaN(end)) {
+	Posts.getPidsFromSet = function(set, start, stop, reverse, callback) {
+		if (isNaN(start) || isNaN(stop)) {
 			return callback(null, []);
 		}
-		db[reverse ? 'getSortedSetRevRange' : 'getSortedSetRange'](set, start, end, callback);
+		db[reverse ? 'getSortedSetRevRange' : 'getSortedSetRange'](set, start, stop, callback);
 	};
 
 	Posts.getPostsByPids = function(pids, uid, callback) {
@@ -73,10 +73,10 @@ var async = require('async'),
 		});
 	};
 
-	Posts.getPostsFromSet = function(set, uid, start, end, callback) {
+	Posts.getPostsFromSet = function(set, uid, start, stop, callback) {
 		async.waterfall([
 			function(next) {
-				db.getSortedSetRevRange(set, start, end, next);
+				db.getSortedSetRevRange(set, start, stop, next);
 			},
 			function(pids, next) {
 				privileges.posts.filter('read', pids, uid, next);
@@ -85,7 +85,7 @@ var async = require('async'),
 				Posts.getPostSummaryByPids(pids, uid, {stripTags: false}, next);
 			},
 			function(posts, next) {
-				next(null, {posts: posts, nextStart: end + 1});
+				next(null, {posts: posts, nextStart: stop + 1});
 			}
 		], callback);
 	};

src/posts/flags.js

@@ -38,17 +38,17 @@ module.exports = function(Posts) {
 				},
 				function(next) {
 					if (parseInt(post.uid, 10)) {
-						db.sortedSetAdd('uid:' + post.uid + ':flag:pids', now, post.pid, next);	
+						db.sortedSetAdd('uid:' + post.uid + ':flag:pids', now, post.pid, next);
 					} else {
 						next();
-					}					
+					}
 				},
 				function(next) {
 					if (parseInt(post.uid, 10)) {
 						db.setAdd('uid:' + post.uid + ':flagged_by', uid, next);
 					} else {
 						next();
-					}					
+					}
 				}
 			], function(err, results) {
 				callback(err);
@@ -69,8 +69,8 @@ module.exports = function(Posts) {
 					}
 
 					db.sortedSetsRemove([
-						'posts:flagged', 
-						'posts:flags:count', 
+						'posts:flagged',
+						'posts:flags:count',
 						'uid:' + uid + ':flag:pids'
 					], pid, next);
 				});
@@ -80,7 +80,7 @@ module.exports = function(Posts) {
 			},
 			function(next) {
 				db.delete('pid:' + pid + ':flag:uids', next);
-			}			
+			}
 		], function(err, results) {
 			callback(err);
 		});
@@ -90,8 +90,8 @@ module.exports = function(Posts) {
 		db.delete('posts:flagged', callback);
 	};
 
-	Posts.getFlags = function(set, uid, start, end, callback) {
-		db.getSortedSetRevRange(set, start, end, function(err, pids) {
+	Posts.getFlags = function(set, uid, start, stop, callback) {
+		db.getSortedSetRevRange(set, start, stop, function(err, pids) {
 			if (err) {
 				return callback(err);
 			}
@@ -100,7 +100,7 @@ module.exports = function(Posts) {
 		});
 	};
 
-	Posts.getUserFlags = function(byUsername, sortBy, callerUID, start, end, callback) {
+	Posts.getUserFlags = function(byUsername, sortBy, callerUID, start, stop, callback) {
 		async.waterfall([
 			function(next) {
 				user.getUidByUsername(byUsername, next);
@@ -108,7 +108,7 @@ module.exports = function(Posts) {
 			function(uid, next) {
 				if (!uid) {
 					return next(null, []);
-				}	
+				}
 				db.getSortedSetRevRange('uid:' + uid + ':flag:pids', 0, -1, next);
 			},
 			function(pids, next) {
@@ -120,7 +120,7 @@ module.exports = function(Posts) {
 						return b.flags - a.flags;
 					});
 				}
-				next(null, posts.slice(start, end));
+				next(null, posts.slice(start, stop));
 			}
 		], callback);
 	};

src/posts/recent.js

@@ -33,10 +33,10 @@ module.exports = function(Posts) {
 		], callback);
 	};
 
-	Posts.getRecentPosterUids = function(start, end, callback) {
+	Posts.getRecentPosterUids = function(start, stop, callback) {
 		async.waterfall([
 			function(next) {
-				db.getSortedSetRevRange('posts:pid', start, end, next);
+				db.getSortedSetRevRange('posts:pid', start, stop, next);
 			},
 			function(pids, next) {
 				Posts.getPostsFields(pids, ['uid'], next);

src/posts/topics.js

@@ -6,8 +6,8 @@ var async = require('async'),
 
 module.exports = function(Posts) {
 
-	Posts.getPostsByTid = function(tid, set, start, end, uid, reverse, callback) {
-		Posts.getPidsFromSet(set, start, end, reverse, function(err, pids) {
+	Posts.getPostsByTid = function(tid, set, start, stop, uid, reverse, callback) {
+		Posts.getPidsFromSet(set, start, stop, reverse, function(err, pids) {
 			if (err) {
 				return callback(err);
 			}

src/socket.io/admin.js

@@ -304,12 +304,12 @@ SocketAdmin.getMoreEvents = function(socket, next, callback) {
 	if (start < 0) {
 		return callback(null, {data: [], next: next});
 	}
-	var end = start + 10;
-	events.getEvents(start, end, function(err, events) {
+	var stop = start + 10;
+	events.getEvents(start, stop, function(err, events) {
 		if (err) {
 			return callback(err);
 		}
-		callback(null, {events: events, next: end + 1});
+		callback(null, {events: events, next: stop + 1});
 	});
 };
 
@@ -336,15 +336,15 @@ SocketAdmin.getMoreFlags = function(socket, data, callback) {
 	var sortBy = data.sortBy || 'count';
 	var byUsername = data.byUsername ||  '';
 	var start = parseInt(data.after, 10);
-	var end = start + 19;
+	var stop = start + 19;
 	if (byUsername) {
-		posts.getUserFlags(byUsername, sortBy, socket.uid, start, end, function(err, posts) {
-			callback(err, {posts: posts, next: end + 1});
+		posts.getUserFlags(byUsername, sortBy, socket.uid, start, stop, function(err, posts) {
+			callback(err, {posts: posts, next: stop + 1});
 		});
 	} else {
 		var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged';
-		posts.getFlags(set, socket.uid, start, end, function(err, posts) {
-			callback(err, {posts: posts, next: end + 1});
+		posts.getFlags(set, socket.uid, start, stop, function(err, posts) {
+			callback(err, {posts: posts, next: stop + 1});
 		});
 	}
 };

src/socket.io/categories.js

@@ -58,7 +58,7 @@ SocketCategories.loadMore = function(socket, data, callback) {
 		}
 
 		var start = parseInt(data.after, 10),
-			end = start + results.settings.topicsPerPage - 1;
+			stop = start + results.settings.topicsPerPage - 1;
 
 		if (results.targetUid) {
 			set = 'cid:' + data.cid + ':uid:' + results.targetUid + ':tids';
@@ -69,7 +69,7 @@ SocketCategories.loadMore = function(socket, data, callback) {
 			set: set,
 			reverse: reverse,
 			start: start,
-			stop: end,
+			stop: stop,
 			uid: socket.uid,
 			targetUid: results.targetUid
 		}, function(err, data) {

src/socket.io/modules.js

@@ -249,9 +249,9 @@ SocketModules.chats.getRecentChats = function(socket, data, callback) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 	var start = parseInt(data.after, 10),
-		end = start + 9;
+		stop = start + 9;
 
-	Messaging.getRecentChats(socket.uid, start, end, callback);
+	Messaging.getRecentChats(socket.uid, start, stop, callback);
 };
 
 

src/socket.io/posts.js

@@ -511,27 +511,23 @@ SocketPosts.flag = function(socket, pid, callback) {
 };
 
 SocketPosts.loadMoreFavourites = function(socket, data, callback) {
-	if(!data || !data.after) {
-		return callback(new Error('[[error:invalid-data]]'));
-	}
-
-	var start = parseInt(data.after, 10),
-		end = start + 9;
-
-	posts.getPostsFromSet('uid:' + socket.uid + ':favourites', socket.uid, start, end, callback);
+	loadMorePosts('uid:' + data.uid + ':favourites', socket.uid, data, callback);
 };
 
 SocketPosts.loadMoreUserPosts = function(socket, data, callback) {
-	if(!data || !data.uid || !utils.isNumber(data.after)) {
+	loadMorePosts('uid:' + data.uid + ':posts', socket.uid, data, callback);
+};
+
+function loadMorePosts(set, uid, data, callback) {
+	if (!data || !utils.isNumber(data.uid) || !utils.isNumber(data.after)) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
 	var start = Math.max(0, parseInt(data.after, 10)),
-		end = start + 9;
-
-	posts.getPostsFromSet('uid:' + data.uid + ':posts', socket.uid, start, end, callback);
-};
+		stop = start + 9;
 
+	posts.getPostsFromSet(set, uid, start, stop, callback);
+}
 
 SocketPosts.getRecentPosts = function(socket, data, callback) {
 	if(!data || !data.count) {

src/socket.io/topics.js

@@ -470,11 +470,11 @@ SocketTopics.loadMore = function(socket, data, callback) {
 			}
 		}
 
-		var end = start + results.settings.postsPerPage - 1;
+		var stop = start + results.settings.postsPerPage - 1;
 
 		async.parallel({
 			posts: function(next) {
-				topics.getTopicPosts(data.tid, set, start, end, socket.uid, reverse, next);
+				topics.getTopicPosts(data.tid, set, start, stop, socket.uid, reverse, next);
 			},
 			privileges: function(next) {
 				next(null, results.privileges);
@@ -490,33 +490,33 @@ SocketTopics.loadMore = function(socket, data, callback) {
 };
 
 SocketTopics.loadMoreUnreadTopics = function(socket, data, callback) {
-	if(!data || !data.after) {
+	if (!data || !data.after) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
 	var start = parseInt(data.after, 10),
-		end = start + 9;
+		stop = start + 9;
 
-	topics.getUnreadTopics(socket.uid, start, end, callback);
+	topics.getUnreadTopics(socket.uid, start, stop, callback);
 };
 
 SocketTopics.loadMoreFromSet = function(socket, data, callback) {
-	if(!data || !data.after || !data.set) {
+	if (!data || !data.after || !data.set) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
 	var start = parseInt(data.after, 10),
-		end = start + 9;
+		stop = start + 9;
 
-	topics.getTopicsFromSet(data.set, socket.uid, start, end, callback);
+	topics.getTopicsFromSet(data.set, socket.uid, start, stop, callback);
 };
 
 SocketTopics.loadTopics = function(socket, data, callback) {
-	if(!data || !data.set || !utils.isNumber(data.start) || !utils.isNumber(data.end)) {
+	if (!data || !data.set || !utils.isNumber(data.start) || !utils.isNumber(data.stop)) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
-	topics.getTopicsFromSet(data.set, socket.uid, data.start, data.end, callback);
+	topics.getTopicsFromSet(data.set, socket.uid, data.start, data.stop, callback);
 };
 
 SocketTopics.getPageCount = function(socket, tid, callback) {
@@ -544,14 +544,14 @@ SocketTopics.loadMoreTags = function(socket, data, callback) {
 	}
 
 	var start = parseInt(data.after, 10),
-		end = start + 99;
+		stop = start + 99;
 
-	topics.getTags(start, end, function(err, tags) {
+	topics.getTags(start, stop, function(err, tags) {
 		if (err) {
 			return callback(err);
 		}
 
-		callback(null, {tags: tags, nextStart: end + 1});
+		callback(null, {tags: tags, nextStart: stop + 1});
 	});
 };
 

src/socket.io/user.js

@@ -397,7 +397,7 @@ SocketUser.getUnreadChatCount = function(socket, data, callback) {
 };
 
 SocketUser.loadMore = function(socket, data, callback) {
-	if(!data || !data.set || parseInt(data.after, 10) < 0) {
+	if (!data || !data.set || parseInt(data.after, 10) < 0) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
@@ -406,28 +406,30 @@ SocketUser.loadMore = function(socket, data, callback) {
 	}
 
 	var start = parseInt(data.after, 10),
-		end = start + 19;
+		stop = start + 19;
 
-	user.getUsersFromSet(data.set, socket.uid, start, end, function(err, userData) {
+	async.parallel({
+		isAdmin: function(next) {
+			user.isAdministrator(socket.uid, next);
+		},
+		users: function(next) {
+			user.getUsersFromSet(data.set, socket.uid, start, stop, next);
+		}
+	}, function(err, results) {
 		if (err) {
 			return callback(err);
 		}
 
-		user.isAdministrator(socket.uid, function (err, isAdministrator) {
-			if (err) {
-				return callback(err);
-			}
-
-			if (!isAdministrator && data.set === 'users:online') {
-				userData = userData.filter(function(item) {
-					return item.status !== 'offline';
-				});
-			}
 
-			callback(null, {
-				users: userData,
-				nextStart: end + 1
+		if (!results.isAdmin && data.set === 'users:online') {
+			results.users = results.users.filter(function(user) {
+				return user.status !== 'offline';
 			});
+		}
+
+		callback(null, {
+			users: results.users,
+			nextStart: stop + 1
 		});
 	});
 };

src/topics.js

@@ -112,16 +112,16 @@ var async = require('async'),
 		});
 	};
 
-	Topics.getTopicsFromSet = function(set, uid, start, end, callback) {
+	Topics.getTopicsFromSet = function(set, uid, start, stop, callback) {
 		async.waterfall([
 			function(next) {
-				db.getSortedSetRevRange(set, start, end, next);
+				db.getSortedSetRevRange(set, start, stop, next);
 			},
 			function(tids, next) {
 				Topics.getTopics(tids, uid, next);
 			},
 			function(topics, next) {
-				next(null, {topics: topics, nextStart: end + 1});
+				next(null, {topics: topics, nextStart: stop + 1});
 			}
 		], callback);
 	};
@@ -209,14 +209,14 @@ var async = require('async'),
 		});
 	};
 
-	Topics.getTopicWithPosts = function(tid, set, uid, start, end, reverse, callback) {
+	Topics.getTopicWithPosts = function(tid, set, uid, start, stop, reverse, callback) {
 		Topics.getTopicData(tid, function(err, topicData) {
 			if (err || !topicData) {
 				return callback(err || new Error('[[error:no-topic]]'));
 			}
 
 			async.parallel({
-				posts: async.apply(getMainPostAndReplies, topicData, set, uid, start, end, reverse),
+				posts: async.apply(getMainPostAndReplies, topicData, set, uid, start, stop, reverse),
 				category: async.apply(Topics.getCategoryData, tid),
 				threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', {topic: topicData, uid: uid, tools: []}),
 				tags: async.apply(Topics.getTopicTagsObjects, tid),
@@ -244,10 +244,10 @@ var async = require('async'),
 		});
 	};
 
-	function getMainPostAndReplies(topic, set, uid, start, end, reverse, callback) {
+	function getMainPostAndReplies(topic, set, uid, start, stop, reverse, callback) {
 		async.waterfall([
 			function(next) {
-				posts.getPidsFromSet(set, start, end, reverse, next);
+				posts.getPidsFromSet(set, start, stop, reverse, next);
 			},
 			function(pids, next) {
 				if ((!Array.isArray(pids) || !pids.length) && !topic.mainPid) {
@@ -268,7 +268,7 @@ var async = require('async'),
 					posts[0].index = 0;
 				}
 
-				var indices = Topics.calculatePostIndices(start, end, topic.postcount, reverse);
+				var indices = Topics.calculatePostIndices(start, stop, topic.postcount, reverse);
 				for (var i=1; i<posts.length; ++i) {
 					if (posts[i]) {
 						posts[i].index = indices[i - 1];

src/topics/posts.js

@@ -29,11 +29,11 @@ module.exports = function(Topics) {
 		], callback);
 	};
 
-	Topics.getTopicPosts = function(tid, set, start, end, uid, reverse, callback) {
+	Topics.getTopicPosts = function(tid, set, start, stop, uid, reverse, callback) {
 		callback = callback || function() {};
 		async.parallel({
 			posts: function(next) {
-				posts.getPostsByTid(tid, set, start, end, uid, reverse, next);
+				posts.getPostsByTid(tid, set, start, stop, uid, reverse, next);
 			},
 			postCount: function(next) {
 				Topics.getTopicField(tid, 'postcount', next);
@@ -43,7 +43,7 @@ module.exports = function(Topics) {
 				return callback(err);
 			}
 
-			var indices = Topics.calculatePostIndices(start, end, results.postCount, reverse);
+			var indices = Topics.calculatePostIndices(start, stop, results.postCount, reverse);
 			results.posts.forEach(function(post, index) {
 				if (post) {
 					post.index = indices[index];
@@ -150,9 +150,9 @@ module.exports = function(Topics) {
 		});
 	};
 
-	Topics.calculatePostIndices = function(start, end, postCount, reverse) {
+	Topics.calculatePostIndices = function(start, stop, postCount, reverse) {
 		var indices = [];
-		var count = end - start + 1;
+		var count = stop - start + 1;
 		for(var i=0; i<count; ++i) {
 			if (reverse) {
 				indices.push(postCount - (start + i + 1));

src/topics/recent.js

@@ -14,32 +14,32 @@ module.exports = function(Topics) {
 		year: 31104000000
 	};
 
-	Topics.getLatestTopics = function(uid, start, end, term, callback) {
+	Topics.getLatestTopics = function(uid, start, stop, term, callback) {
 		async.waterfall([
 			function (next) {
-				Topics.getLatestTidsFromSet('topics:recent', start, end, term, next);
+				Topics.getLatestTidsFromSet('topics:recent', start, stop, term, next);
 			},
 			function(tids, next) {
 				Topics.getTopics(tids, uid, next);
 			},
 			function(topics, next) {
-				next(null, {topics: topics, nextStart: end + 1});
+				next(null, {topics: topics, nextStart: stop + 1});
 			}
 		], callback);
 	};
 
-	Topics.getLatestTids = function(start, end, term, callback) {
+	Topics.getLatestTids = function(start, stop, term, callback) {
 		winston.warn('[deprecation warning] please use Topics.getLatestTidsFromSet("topics:recent")');
-		Topics.getLatestTidsFromSet('topics:recent', start, end, term, callback);
+		Topics.getLatestTidsFromSet('topics:recent', start, stop, term, callback);
 	};
 
-	Topics.getLatestTidsFromSet = function(set, start, end, term, callback) {
+	Topics.getLatestTidsFromSet = function(set, start, stop, term, callback) {
 		var since = terms.day;
 		if (terms[term]) {
 			since = terms[term];
 		}
 
-		var count = parseInt(end, 10) === -1 ? end : end - start + 1;
+		var count = parseInt(stop, 10) === -1 ? stop : stop - start + 1;
 
 		db.getSortedSetRevRangeByScore(set, start, count, '+inf', Date.now() - since, callback);
 	};

src/topics/suggested.js

@@ -11,7 +11,7 @@ var async = require('async'),
 
 module.exports = function(Topics) {
 
-	Topics.getSuggestedTopics = function(tid, uid, start, end, callback) {
+	Topics.getSuggestedTopics = function(tid, uid, start, stop, callback) {
 		async.parallel({
 			tagTids: function(next) {
 				getTidsWithSameTags(tid, next);
@@ -29,7 +29,7 @@ module.exports = function(Topics) {
 			var tids = results.tagTids.concat(results.searchTids).concat(results.categoryTids);
 			tids = tids.filter(function(_tid, index, array) {
 				return parseInt(_tid, 10) !== parseInt(tid, 10) && array.indexOf(_tid) === index;
-			}).slice(start, end + 1);
+			}).slice(start, stop + 1);
 
 			Topics.getTopics(tids, uid, callback);
 		});

src/topics/tags.js

@@ -72,8 +72,8 @@ module.exports = function(Topics) {
 		});
 	}
 
-	Topics.getTagTids = function(tag, start, end, callback) {
-		db.getSortedSetRevRange('tag:' + tag + ':topics', start, end, callback);
+	Topics.getTagTids = function(tag, start, stop, callback) {
+		db.getSortedSetRevRange('tag:' + tag + ':topics', start, stop, callback);
 	};
 
 	Topics.getTagTopicCount = function(tag, callback) {
@@ -121,8 +121,8 @@ module.exports = function(Topics) {
 		db.sortedSetRemove('tags:topic:count', tag);
 	};
 
-	Topics.getTags = function(start, end, callback) {
-		db.getSortedSetRevRangeWithScores('tags:topic:count', start, end, function(err, tags) {
+	Topics.getTags = function(start, stop, callback) {
+		db.getSortedSetRevRangeWithScores('tags:topic:count', start, stop, function(err, tags) {
 			if (err) {
 				return callback(err);
 			}
@@ -271,7 +271,7 @@ module.exports = function(Topics) {
 			matches = matches.slice(0, 20).sort(function(a, b) {
 				return a > b;
 			});
-			
+
 			plugins.fireHook('filter:tags.search', {data: data, matches: matches}, function(err, data) {
 				callback(err, data ? data.matches : []);
 			});

src/user/admin.js

@@ -15,8 +15,8 @@ module.exports = function(User) {
 		}
 	};
 
-	User.getIPs = function(uid, end, callback) {
-		db.getSortedSetRevRange('uid:' + uid + ':ip', 0, end, function(err, ips) {
+	User.getIPs = function(uid, stop, callback) {
+		db.getSortedSetRevRange('uid:' + uid + ':ip', 0, stop, function(err, ips) {
 			if(err) {
 				return callback(err);
 			}

src/user/follow.js

@@ -53,20 +53,20 @@ module.exports = function(User) {
 		});
 	}
 
-	User.getFollowing = function(uid, start, end, callback) {
-		getFollow(uid, 'following:' + uid, start, end, callback);
+	User.getFollowing = function(uid, start, stop, callback) {
+		getFollow(uid, 'following:' + uid, start, stop, callback);
 	};
 
-	User.getFollowers = function(uid, start, end, callback) {
-		getFollow(uid, 'followers:' + uid, start, end, callback);
+	User.getFollowers = function(uid, start, stop, callback) {
+		getFollow(uid, 'followers:' + uid, start, stop, callback);
 	};
 
-	function getFollow(uid, set, start, end, callback) {
+	function getFollow(uid, set, start, stop, callback) {
 		if (!parseInt(uid, 10)) {
 			return callback(null, []);
 		}
 
-		db.getSortedSetRevRange(set, start, end, function(err, uids) {
+		db.getSortedSetRevRange(set, start, stop, function(err, uids) {
 			if (err) {
 				return callback(err);
 			}

src/user/search.js

@@ -59,14 +59,14 @@ module.exports = function(User) {
 	User.paginate = function(page, data) {
 		var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20;
 		var start = Math.max(0, page - 1) * resultsPerPage;
-		var end = start + resultsPerPage;
+		var stop = start + resultsPerPage;
 
 		var pageCount = Math.ceil(data.length / resultsPerPage);
 		var currentPage = Math.max(1, Math.ceil((start + 1) / resultsPerPage));
 
 		return {
 			pagination: pagination.create(currentPage, pageCount),
-			data: data.slice(start, end)
+			data: data.slice(start, stop)
 		};
 	};