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

fixing topic moving

Browse Source
This commit is contained in:
Julian Lam
2014-01-14 09:19:33 -05:00
parent a32aee60c2
commit bc407ee59c
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/categories.js
View File

@@ -398,7 +398,7 @@ var db = require('./database.js'),
Categories.moveActiveUsers = function(tid, oldCid, cid, callback) { Categories.moveActiveUsers = function(tid, oldCid, cid, callback) {
function updateUser(uid) { function updateUser(uid) {
Categories.addActiveUser(cid, uid); Categories.addActiveUser(cid, uid, Date.now());
Categories.isUserActiveIn(oldCid, uid, function(err, active) { Categories.isUserActiveIn(oldCid, uid, function(err, active) {
if (!err && !active) { if (!err && !active) {

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

@@ -177,8 +177,8 @@ SocketTopics.movePost = function(data, callback, sessionData) {
}); });
}; };
SocketTopics.move = function(data, sessionData) { SocketTopics.move = function(data, callback, sessionData) {
threadTools.move(data.tid, data.cid, sessionData.socket); threadTools.move(data.tid, data.cid, callback, sessionData);
}; };
SocketTopics.followCheck = function(tid, callback, sessionData) { SocketTopics.followCheck = function(tid, callback, sessionData) {

10
src/threadTools.js
View File

@@ -167,8 +167,7 @@ var winston = require('winston'),
} }
} }
ThreadTools.move = function(tid, cid, socket) { ThreadTools.move = function(tid, cid, callback, sessionData) {
topics.getTopicFields(tid, ['cid', 'lastposttime'], function(err, topicData) { topics.getTopicFields(tid, ['cid', 'lastposttime'], function(err, topicData) {
var oldCid = topicData.cid; var oldCid = topicData.cid;
@@ -176,10 +175,9 @@ var winston = require('winston'),
db.sortedSetAdd('categories:' + cid + ':tid', topicData.lastposttime, tid, function(err, result) { db.sortedSetAdd('categories:' + cid + ':tid', topicData.lastposttime, tid, function(err, result) {
if(err) { if(err) {
socket.emit('api:topic.move', { return callback({
status: 'error' status: 'error'
}); });
return;
} }
topics.setTopicField(tid, 'cid', cid); topics.setTopicField(tid, 'cid', cid);
@@ -199,11 +197,11 @@ var winston = require('winston'),
categories.incrementCategoryFieldBy(oldCid, 'topic_count', -1); categories.incrementCategoryFieldBy(oldCid, 'topic_count', -1);
categories.incrementCategoryFieldBy(cid, 'topic_count', 1); categories.incrementCategoryFieldBy(cid, 'topic_count', 1);
socket.emit('api:topic.move', { callback({
status: 'ok' status: 'ok'
}); });
websockets.in('topic_' + tid).emit('event:topic_moved', { sessionData.server.sockets.in('topic_' + tid).emit('event:topic_moved', {
tid: tid tid: tid
}); });
}); });