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

changes bookmark storage to sortedset, gets uid from socket rather than being passed from client

Browse Source
This commit is contained in:
bdharrington7
2015-07-30 23:13:34 -07:00
parent c0ec6faed3
commit 25203ee67e
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/src/client/topic.js
View File

@@ -203,12 +203,11 @@ define('forum/topic', [
if (!currentBookmark || parseInt(postIndex, 10) > parseInt(currentBookmark, 10)) { if (!currentBookmark || parseInt(postIndex, 10) > parseInt(currentBookmark, 10)) {
if (app.user.uid) { if (app.user.uid) {
var data = { var payload = {
'tid': ajaxify.data.tid, 'tid': ajaxify.data.tid,
'uid': app.user.uid, 'index': postIndex
'postIndex': postIndex };
} socket.emit('topics.bookmark', payload, function(err) {
socket.emit('topics.bookmark', data, function(err) {
if (err) { if (err) {
console.warn('Error saving bookmark:', err); console.warn('Error saving bookmark:', err);
} }

7
src/socket.io/topics.js
View File

@@ -96,10 +96,9 @@ SocketTopics.postcount = function(socket, tid, callback) {
topics.getTopicField(tid, 'postcount', callback); topics.getTopicField(tid, 'postcount', callback);
}; };
SocketTopics.bookmark = function(socket, data, callback) { SocketTopics.bookmark = function(socket, payload, callback) {
// data contains tid, uid, and postIndex topics.setUserBookmark(payload.tid, socket.uid, payload.index, callback);
topics.setUserBookmark(data, callback); };
}
SocketTopics.markAsRead = function(socket, tids, callback) { SocketTopics.markAsRead = function(socket, tids, callback) {
if(!Array.isArray(tids) || !socket.uid) { if(!Array.isArray(tids) || !socket.uid) {

6
src/topics.js
View File

@@ -330,11 +330,11 @@ var async = require('async'),
} }
Topics.getUserBookmark = function (tid, uid, callback) { Topics.getUserBookmark = function (tid, uid, callback) {
db.getObjectField('topic:' + tid + ':bookmarks', uid, callback); db.sortedSetScore('topic:' + tid + ':bookmarks', uid, callback);
}; };
Topics.setUserBookmark = function(data, callback) { Topics.setUserBookmark = function(tid, uid, index, callback) {
db.setObjectField('topic:' + data.tid + ':bookmarks', data.uid, data.postIndex, callback); db.sortedSetAdd('topic:' + tid + ':bookmarks', index, uid, callback);
}; };
Topics.getTopicField = function(tid, field, callback) { Topics.getTopicField = function(tid, field, callback) {