hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user selectable pagination

Browse Source
v1.18.x
Baris Soner Usakli 11 years ago
parent 93f5f320fe
commit 242927d702
10 changed files with 228 additions and 138 deletions
Show Stats Download Patch File Download Diff File

5
public/src/forum/accountsettings.js
Unescape Escape View File

@ -7,7 +7,10 @@ define(['forum/accountheader'], function(header) {
$('#submitBtn').on('click', function() { $('#submitBtn').on('click', function() {
var settings = { var settings = {
showemail: $('#showemailCheckBox').is(':checked') ? 1 : 0 showemail: $('#showemailCheckBox').is(':checked') ? 1 : 0,
usePagination: $('#usePaginationCheckBox').is(':checked') ? 1 : 0,
topicsPerPage: $('#topicsPerPage').val(),
postsPerPage: $('#postsPerPage').val()
}; };
socket.emit('user.saveSettings', settings, function(err) { socket.emit('user.saveSettings', settings, function(err) {

27
public/templates/accountsettings.tpl
Unescape Escape View File

@ -6,16 +6,31 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<h4>privacy</h4> <div class="panel panel-default">
<div class="checkbox"> <div class="panel-body">
<label> <h4>privacy</h4>
<input id="showemailCheckBox" type="checkbox" {showemail}> [[user:show_email]] <div class="checkbox">
</label> <label>
</div> <input id="showemailCheckBox" type="checkbox" <!-- IF settings.showemail -->checked<!-- ENDIF settings.showemail --> > [[user:show_email]]
</label>
</div>
</div>
</div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="panel panel-default">
<div class="panel-body">
<div class="checkbox">
<label>
<input id="usePaginationCheckBox" type="checkbox" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->> <strong>Paginate topics and posts instead of using infinite scroll.</strong>
</label>
</div>
<strong>Topics per Page</strong><br /> <input id="topicsPerPage" type="text" class="form-control" value="{settings.topicsPerPage}"><br />
<strong>Posts per Page</strong><br /> <input id="postsPerPage" type="text" class="form-control" value="{settings.postsPerPage}"><br />
</div>
</div>
</div> </div>
</div> </div>
<div class="form-actions"> <div class="form-actions">

13
src/categories.js
Unescape Escape View File

@ -77,7 +77,7 @@ var db = require('./database'),
} }
function getPageCount(next) { function getPageCount(next) {
Categories.getPageCount(category_id, next); Categories.getPageCount(category_id, current_user, next);
} }
async.parallel({ async.parallel({
@ -146,16 +146,19 @@ var db = require('./database'),
db.getSortedSetRevRange('categories:' + cid + ':tid', start, stop, callback); db.getSortedSetRevRange('categories:' + cid + ':tid', start, stop, callback);
}; };
Categories.getPageCount = function(cid, callback) { Categories.getPageCount = function(cid, uid, callback) {
db.sortedSetCard('categories:' + cid + ':tid', function(err, topicCount) { db.sortedSetCard('categories:' + cid + ':tid', function(err, topicCount) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
var topicsPerPage = parseInt(meta.config.topicsPerPage, 10); user.getSettings(uid, function(err, settings) {
topicsPerPage = topicsPerPage ? topicsPerPage : 20; if(err) {
return callback(err);
}
callback(null, Math.ceil(parseInt(topicCount, 10) / topicsPerPage)); callback(null, Math.ceil(parseInt(topicCount, 10) / settings.topicsPerPage));
});
}); });
}; };

112
src/routes/api.js
Unescape Escape View File

@ -52,7 +52,22 @@ var path = require('path'),
config.defaultLang = meta.config.defaultLang || 'en_GB'; config.defaultLang = meta.config.defaultLang || 'en_GB';
config.environment = process.env.NODE_ENV; config.environment = process.env.NODE_ENV;
res.json(200, config); if (!req.user) {
return res.json(200, config);
}
if(req.user) {
user.getSettings(req.user.uid, function(err, settings) {
if(err) {
return next(err);
}
config.usePagination = settings.usePagination;
config.topicsPerPage = settings.topicsPerPage;
config.postsPerPage = settings.postsPerPage;
res.json(200, config);
});
}
}); });
app.get('/home', function (req, res) { app.get('/home', function (req, res) {
@ -189,33 +204,38 @@ var path = require('path'),
return res.send(404); return res.send(404);
} }
var postsPerPage = parseInt(meta.config.postsPerPage ? meta.config.postsPerPage : 20, 10); user.getSettings(uid, function(err, settings) {
var start = (page - 1) * postsPerPage; if(err) {
var end = start + postsPerPage - 1; return next(err);
}
ThreadTools.privileges(req.params.id, uid, function(err, privileges) { var start = (page - 1) * settings.postsPerPage;
if (privileges.read) { var end = start + settings.postsPerPage - 1;
topics.getTopicWithPosts(req.params.id, uid, start, end, false, function (err, data) {
if(err) {
return next(err);
}
if(page > data.pageCount) { ThreadTools.privileges(req.params.id, uid, function(err, privileges) {
return res.send(404); if (privileges.read) {
} topics.getTopicWithPosts(req.params.id, uid, start, end, false, function (err, data) {
if(err) {
return next(err);
}
data.currentPage = page; if(page > data.pageCount) {
data.privileges = privileges; return res.send(404);
}
if (parseInt(data.deleted, 10) === 1 && parseInt(data.expose_tools, 10) === 0) { data.currentPage = page;
return res.json(404, {}); data.privileges = privileges;
}
res.json(data); if (parseInt(data.deleted, 10) === 1 && parseInt(data.expose_tools, 10) === 0) {
}); return res.json(404, {});
} else { }
res.send(403);
} res.json(data);
});
} else {
res.send(403);
}
});
}); });
}); });
@ -230,30 +250,34 @@ var path = require('path'),
return res.send(404); return res.send(404);
} }
var topicsPerPage = parseInt(meta.config.topicsPerPage ? meta.config.topicsPerPage : 20, 10); user.getSettings(uid, function(err, settings) {
var start = (page - 1) * topicsPerPage; if(err) {
var end = start + topicsPerPage - 1; return next(err);
}
// Category Whitelisting var start = (page - 1) * settings.topicsPerPage;
categoryTools.privileges(req.params.id, uid, function(err, privileges) { var end = start + settings.topicsPerPage - 1;
if (!err && privileges.read) {
categories.getCategoryById(req.params.id, start, end, uid, function (err, data) {
if(err) {
return next(err);
}
data.currentPage = page; categoryTools.privileges(req.params.id, uid, function(err, privileges) {
data.privileges = privileges; if (!err && privileges.read) {
categories.getCategoryById(req.params.id, start, end, uid, function (err, data) {
if(err) {
return next(err);
}
if (data && parseInt(data.disabled, 10) === 0) { data.currentPage = page;
res.json(data); data.privileges = privileges;
} else {
next(); if (data && parseInt(data.disabled, 10) === 0) {
} res.json(data);
}, req.params.id, uid); } else {
} else { next();
res.send(403); }
} }, req.params.id, uid);
} else {
res.send(403);
}
});
}); });
}); });

106
src/routes/user.js
Unescape Escape View File

@ -270,40 +270,43 @@ var fs = require('fs'),
var callerUID = req.user ? req.user.uid : '0'; var callerUID = req.user ? req.user.uid : '0';
user.getUidByUserslug(req.params.userslug, function (err, uid) { user.getUidByUserslug(req.params.userslug, function (err, uid) {
if (err) {
return next(err);
}
if (!uid) { if (!uid) {
res.json(404, { return res.json(404, {
error: 'User not found!' error: 'User not found!'
}); });
return;
} }
if (uid != callerUID || callerUID == '0') { if (uid != callerUID || callerUID == '0') {
res.json(403, { return res.json(403, {
error: 'Not allowed!' error: 'Not allowed!'
}); });
return;
} }
user.getUserFields(uid, ['username', 'userslug'], function (err, userData) {
user.getUserFields(uid, ['username', 'userslug', 'showemail'], function (err, userData) { if (err) {
if (err)
return next(err); return next(err);
}
if (userData) { if(!userData) {
if (userData.showemail && parseInt(userData.showemail, 10) === 1) { return res.json(404, {
userData.showemail = "checked"; error: 'User not found!'
} else { });
userData.showemail = ""; }
user.getSettings(uid, function(err, settings) {
if(err) {
return next(err);
} }
userData.theirid = uid; userData.theirid = uid;
userData.yourid = callerUID; userData.yourid = callerUID;
userData.settings = settings;
res.json(userData); res.json(userData);
} else { });
res.json(404, {
error: 'User not found!'
});
}
}); });
}); });
}); });
@ -313,17 +316,15 @@ var fs = require('fs'),
user.getUidByUserslug(req.params.userslug, function (err, uid) { user.getUidByUserslug(req.params.userslug, function (err, uid) {
if (!uid) { if (!uid) {
res.json(404, { return res.json(404, {
error: 'User not found!' error: 'User not found!'
}); });
return;
} }
if (uid != callerUID || callerUID == '0') { if (uid != callerUID || callerUID == '0') {
res.json(403, { return res.json(403, {
error: 'Not allowed!' error: 'Not allowed!'
}); });
return;
} }
user.getUserFields(uid, ['username', 'userslug'], function (err, userData) { user.getUserFields(uid, ['username', 'userslug'], function (err, userData) {
@ -331,24 +332,24 @@ var fs = require('fs'),
return next(err); return next(err);
} }
if (userData) { if (!userData) {
posts.getFavourites(uid, 0, 9, function (err, favourites) { return res.json(404, {
if (err) {
return next(err);
}
userData.theirid = uid;
userData.yourid = callerUID;
userData.posts = favourites.posts;
userData.nextStart = favourites.nextStart;
res.json(userData);
});
} else {
res.json(404, {
error: 'User not found!' error: 'User not found!'
}); });
} }
posts.getFavourites(uid, 0, 9, function (err, favourites) {
if (err) {
return next(err);
}
userData.theirid = uid;
userData.yourid = callerUID;
userData.posts = favourites.posts;
userData.nextStart = favourites.nextStart;
res.json(userData);
});
}); });
}); });
}); });
@ -358,10 +359,9 @@ var fs = require('fs'),
user.getUidByUserslug(req.params.userslug, function (err, uid) { user.getUidByUserslug(req.params.userslug, function (err, uid) {
if (!uid) { if (!uid) {
res.json(404, { return res.json(404, {
error: 'User not found!' error: 'User not found!'
}); });
return;
} }
user.getUserFields(uid, ['username', 'userslug'], function (err, userData) { user.getUserFields(uid, ['username', 'userslug'], function (err, userData) {
@ -369,24 +369,24 @@ var fs = require('fs'),
return next(err); return next(err);
} }
if (userData) { if (!userData) {
posts.getPostsByUid(callerUID, uid, 0, 19, function (err, userPosts) { return res.json(404, {
if (err) {
return next(err);
}
userData.uid = uid;
userData.theirid = uid;
userData.yourid = callerUID;
userData.posts = userPosts.posts;
userData.nextStart = userPosts.nextStart;
res.json(userData);
});
} else {
res.json(404, {
error: 'User not found!' error: 'User not found!'
}); });
} }
posts.getPostsByUid(callerUID, uid, 0, 19, function (err, userPosts) {
if (err) {
return next(err);
}
userData.uid = uid;
userData.theirid = uid;
userData.yourid = callerUID;
userData.posts = userPosts.posts;
userData.nextStart = userPosts.nextStart;
res.json(userData);
});
}); });
}); });
}); });

14
src/socket.io/categories.js
Unescape Escape View File

@ -1,5 +1,6 @@
var categories = require('../categories'), var categories = require('../categories'),
meta = require('./../meta'), meta = require('./../meta'),
user = require('./../user'),
SocketCategories = {}; SocketCategories = {};
@ -16,16 +17,17 @@ SocketCategories.loadMore = function(socket, data, callback) {
return callback(new Error('invalid data')); return callback(new Error('invalid data'));
} }
var topicsPerPage = parseInt(meta.config.topicsPerPage, 10) || 20; user.getSettings(socket.uid, function(err, settings) {
var start = parseInt(data.after, 10), var start = parseInt(data.after, 10),
end = start + topicsPerPage - 1; end = start + settings.topicsPerPage - 1;
categories.getCategoryTopics(data.cid, start, end, socket.uid, callback); categories.getCategoryTopics(data.cid, start, end, socket.uid, callback);
});
}; };
SocketCategories.getPageCount = function(socket, cid, callback) { SocketCategories.getPageCount = function(socket, cid, callback) {
categories.getPageCount(cid, callback); categories.getPageCount(cid, socket.uid, callback);
} };
module.exports = SocketCategories; module.exports = SocketCategories;

31
src/socket.io/topics.js
Unescape Escape View File

@ -1,6 +1,7 @@
var topics = require('../topics'), var topics = require('../topics'),
threadTools = require('../threadTools'), threadTools = require('../threadTools'),
index = require('./index'), index = require('./index'),
user = require('../user'),
async = require('async'), async = require('async'),
@ -233,21 +234,21 @@ SocketTopics.loadMore = function(socket, data, callback) {
return callback(new Error('invalid data')); return callback(new Error('invalid data'));
} }
var postsPerPage = parseInt(meta.config.postsPerPage, 10); user.getSettings(socket.uid, function(err, settings) {
postsPerPage = postsPerPage ? postsPerPage : 20;
var start = parseInt(data.after, 10), var start = parseInt(data.after, 10),
end = start + postsPerPage - 1; end = start + settings.postsPerPage - 1;
async.parallel({ async.parallel({
posts: function(next) { posts: function(next) {
topics.getTopicPosts(data.tid, start, end, socket.uid, next); topics.getTopicPosts(data.tid, start, end, socket.uid, next);
}, },
privileges: function(next) { privileges: function(next) {
threadTools.privileges(data.tid, socket.uid, next); threadTools.privileges(data.tid, socket.uid, next);
} }
}, function(err, results) { }, function(err, results) {
callback(err, results); callback(err, results);
});
}); });
}; };
@ -286,7 +287,7 @@ SocketTopics.loadMoreFromSet = function(socket, data, callback) {
SocketTopics.getPageCount = function(socket, tid, callback) { SocketTopics.getPageCount = function(socket, tid, callback) {
topics.getPageCount(tid, callback); topics.getPageCount(tid, socket.uid, callback);
}; };
module.exports = SocketTopics; module.exports = SocketTopics;

4
src/socket.io/user.js
Unescape Escape View File

@ -135,9 +135,7 @@ SocketUser.unfollow = function(socket, data, callback) {
SocketUser.saveSettings = function(socket, data, callback) { SocketUser.saveSettings = function(socket, data, callback) {
if (socket.uid && data) { if (socket.uid && data) {
user.setUserFields(socket.uid, { user.saveSettings(socket.uid, data, callback);
showemail: data.showemail
}, callback);
} }
}; };

13
src/topics.js
Unescape Escape View File

@ -391,16 +391,19 @@ var async = require('async'),
}); });
} }
Topics.getPageCount = function(tid, callback) { Topics.getPageCount = function(tid, uid, callback) {
db.sortedSetCard('tid:' + tid + ':posts', function(err, postCount) { db.sortedSetCard('tid:' + tid + ':posts', function(err, postCount) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
var postsPerPage = parseInt(meta.config.postsPerPage, 10); user.getSettings(uid, function(err, settings) {
postsPerPage = postsPerPage ? postsPerPage : 20; if(err) {
return callback(err);
}
callback(null, Math.ceil(parseInt(postCount, 10) / postsPerPage)); callback(null, Math.ceil(parseInt(postCount, 10) / settings.postsPerPage));
});
}); });
} }
@ -808,7 +811,7 @@ var async = require('async'),
} }
function getPageCount(next) { function getPageCount(next) {
Topics.getPageCount(tid, next); Topics.getPageCount(tid, current_user, next);
} }
async.parallel([getTopicData, getTopicPosts, getPrivileges, getCategoryData, getPageCount], function(err, results) { async.parallel([getTopicData, getTopicPosts, getPrivileges, getCategoryData, getPageCount], function(err, results) {

41
src/user.js
Unescape Escape View File

@ -184,6 +184,47 @@ var bcrypt = require('bcryptjs'),
}); });
}; };
User.getSettings = function(uid, callback) {
function sendDefaultSettings() {
callback(null, {
showemail: false,
usePagination: parseInt(meta.config.usePagination, 10) !== 0,
topicsPerPage: parseInt(meta.config.topicsPerPage, 10) || 20,
postsPerPage: parseInt(meta.config.postsPerPage, 10) || 10
});
}
if(!parseInt(uid, 10)) {
return sendDefaultSettings();
}
db.getObject('user:' + uid + ':settings', function(err, settings) {
if(err) {
return callback(err);
}
if(!settings) {
return sendDefaultSettings();
}
settings.showemail = parseInt(settings.showemail, 10) !== 0;
settings.usePagination = parseInt(settings.usePagination, 10) !== 0;
settings.topicsPerPage = parseInt(settings.topicsPerPage, 10);
settings.postsPerPage = parseInt(settings.postsPerPage, 10);
callback(null, settings);
});
}
User.saveSettings = function(uid, data, callback) {
db.setObject('user:' + uid + ':settings', {
showemail: data.showemail || 0,
usePagination: data.usePagination || 0,
topicsPerPage: data.topicsPerPage || 20,
postsPerPage: data.postsPerPage || 10
}, callback);
}
User.updateProfile = function(uid, data, callback) { User.updateProfile = function(uid, data, callback) {
var fields = ['username', 'email', 'fullname', 'website', 'location', 'birthday', 'signature']; var fields = ['username', 'email', 'fullname', 'website', 'location', 'birthday', 'signature'];

Write Preview
Loading…
Cancel
Save