Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 02:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3346 from bdharrington7/bookmark2

Browse Source 
Saves user bookmarks on server if available
This commit is contained in:
Barış Soner Uşaklı
2015-08-01 17:08:40 -04:00
parent 0dfe2e0e90 bd26961fa6
commit 2968dbb9ac
3 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,8 @@ define('forum/topic', [
};
function handleBookmark(tid) {
var bookmark = localStorage.getItem('topic:' + tid + ':bookmark');
// use the user's bookmark data if available, fallback to local if available
var bookmark = ajaxify.data.bookmark || localStorage.getItem('topic:' + tid + ':bookmark');
var postIndex = getPostIndex();
if (postIndex && window.location.search.indexOf('page=') === -1) {
@@ -128,7 +129,7 @@ define('forum/topic', [
timeout: 0,
type: 'info',
clickfn : function() {
navigator.scrollToPost(parseInt(bookmark, 10), true);
navigator.scrollToPost(parseInt(bookmark - 1, 10), true);
},
closefn : function() {
localStorage.removeItem('topic:' + tid + ':bookmark');
@@ -197,10 +198,28 @@ define('forum/topic', [
}
}
var currentBookmark = localStorage.getItem('topic:' + ajaxify.data.tid + ':bookmark');
var bookmarkKey = 'topic:' + ajaxify.data.tid + ':bookmark';
var currentBookmark = ajaxify.data.bookmark || localStorage.getItem(bookmarkKey);
if (!currentBookmark || parseInt(postIndex, 10) > parseInt(currentBookmark, 10)) {
if (app.user.uid) {
var payload = {
'tid': ajaxify.data.tid,
'index': postIndex
};
socket.emit('topics.bookmark', payload, function(err) {
if (err) {
console.warn('Error saving bookmark:', err);
}
ajaxify.data.bookmark = postIndex;
});
} else {
localStorage.setItem(bookmarkKey, postIndex);
}
}
// removes the bookmark alert when we get to / past the bookmark
if (!currentBookmark || parseInt(postIndex, 10) >= parseInt(currentBookmark, 10)) {
localStorage.setItem('topic:' + ajaxify.data.tid + ':bookmark', postIndex);
app.removeAlert('bookmark');
}

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

@@ -96,6 +96,10 @@ SocketTopics.postcount = function(socket, tid, callback) {
topics.getTopicField(tid, 'postcount', callback);
};
SocketTopics.bookmark = function(socket, payload, callback) {
topics.setUserBookmark(payload.tid, socket.uid, payload.index, callback);
};
SocketTopics.markAsRead = function(socket, tids, callback) {
if (!Array.isArray(tids) || !socket.uid) {
return callback(new Error('[[error:invalid-data]]'));

12
src/topics.js
View File

@@ -222,7 +222,8 @@ var async = require('async'),
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),
isFollowing: async.apply(Topics.isFollowing, [tid], uid)
isFollowing: async.apply(Topics.isFollowing, [tid], uid),
bookmark: async.apply(Topics.getUserBookmark, tid, uid)
}, function(err, results) {
if (err) {
return callback(err);
@@ -233,6 +234,7 @@ var async = require('async'),
topicData.thread_tools = results.threadTools.tools;
topicData.tags = results.tags;
topicData.isFollowing = results.isFollowing[0];
topicData.bookmark = results.bookmark;
topicData.unreplied = parseInt(topicData.postcount, 10) === 1;
topicData.deleted = parseInt(topicData.deleted, 10) === 1;
@@ -328,6 +330,14 @@ var async = require('async'),
});
}
Topics.getUserBookmark = function (tid, uid, callback) {
db.sortedSetScore('topic:' + tid + ':bookmarks', uid, callback);
};
Topics.setUserBookmark = function(tid, uid, index, callback) {
db.sortedSetAdd('topic:' + tid + ':bookmarks', index, uid, callback);
};
Topics.getTopicField = function(tid, field, callback) {
db.getObjectField('topic:' + tid, field, callback);
};