From 0a1fa72bd88c92a7dd3ba6935a89c47909d37993 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sun, 16 Nov 2014 18:31:57 -0500
Subject: [PATCH] use loadMoreFromSet

---
 public/src/client/recent.js   |  5 +++--
 src/controllers/categories.js |  2 +-
 src/socket.io/topics.js       | 11 -----------
 src/topics/recent.js          |  4 ----
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/public/src/client/recent.js b/public/src/client/recent.js
index a2db035f77..fc591fbb3b 100644
--- a/public/src/client/recent.js
+++ b/public/src/client/recent.js
@@ -75,8 +75,9 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) {
 			return;
 		}
 
-		infinitescroll.loadMore('topics.loadMoreRecentTopics', {
-			after: $('#topics-container').attr('data-nextstart')
+		infinitescroll.loadMore('topics.loadMoreFromSet', {
+			after: $('#topics-container').attr('data-nextstart'),
+			set: 'topics:recent'
 		}, function(data, done) {
 			if (data.topics && data.topics.length) {
 				Recent.onTopicsLoaded('recent', data.topics, false, done);
diff --git a/src/controllers/categories.js b/src/controllers/categories.js
index bb50bc86f5..d2bc7d57f7 100644
--- a/src/controllers/categories.js
+++ b/src/controllers/categories.js
@@ -16,7 +16,7 @@ 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.getRecentTopics(uid, 0, end, function (err, data) {
+	topics.getTopicsFromSet('topics:recent', uid, 0, end, function(err, data) {
 		if (err) {
 			return next(err);
 		}
diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js
index 5f4c12ac29..cb226af683 100644
--- a/src/socket.io/topics.js
+++ b/src/socket.io/topics.js
@@ -455,17 +455,6 @@ SocketTopics.loadMore = function(socket, data, callback) {
 	});
 };
 
-SocketTopics.loadMoreRecentTopics = function(socket, data, callback) {
-	if(!data || !data.after) {
-		return callback(new Error('[[error:invalid-data]]'));
-	}
-
-	var start = parseInt(data.after, 10),
-		end = start + 9;
-
-	topics.getRecentTopics(socket.uid, start, end, callback);
-};
-
 SocketTopics.loadMoreUnreadTopics = function(socket, data, callback) {
 	if(!data || !data.after) {
 		return callback(new Error('[[error:invalid-data]]'));
diff --git a/src/topics/recent.js b/src/topics/recent.js
index b9a5a8d798..b316aa65a5 100644
--- a/src/topics/recent.js
+++ b/src/topics/recent.js
@@ -15,10 +15,6 @@ module.exports = function(Topics) {
 		year: 31104000000
 	};
 
-	Topics.getRecentTopics = function(uid, start, end, callback) {
-		Topics.getTopicsFromSet('topics:recent', uid, start, end, callback);
-	};
-
 	Topics.getLatestTopics = function(uid, start, end, term, callback) {
 		async.waterfall([
 			function (next) {