refactored topic locking pinning and deleting (and its inverses) so that the privilege check is done not in the method, but in the socket call

src/postTools.js

@@ -142,7 +142,7 @@ var RDB = require('./redis.js'),
 				// Delete the thread if it is the last undeleted post
 				threadTools.getLatestUndeletedPid(postData.tid, function(err, pid) {
 					if (err && err.message === 'no-undeleted-pids-found') {
-						threadTools.delete(postData.tid, -1, function(err) {
+						threadTools.delete(postData.tid, function(err) {
 							if (err) {
 								winston.error('Could not delete topic (tid: ' + postData.tid + ')', err.stack);
 							}

src/threadTools.js

@@ -47,9 +47,7 @@ var RDB = require('./redis.js'),
 		});
 	}
 
-	ThreadTools.lock = function(tid, uid, socket) {
-		ThreadTools.privileges(tid, uid, function(privileges) {
-			if (privileges.editable) {
+	ThreadTools.lock = function(tid, socket) {
 		topics.setTopicField(tid, 'locked', 1);
 
 		if (socket) {
@@ -64,12 +62,8 @@ var RDB = require('./redis.js'),
 			});
 		}
 	}
-		});
-	}
 
-	ThreadTools.unlock = function(tid, uid, socket) {
-		ThreadTools.privileges(tid, uid, function(privileges) {
-			if (privileges.editable) {
+	ThreadTools.unlock = function(tid, socket) {
 		topics.setTopicField(tid, 'locked', 0);
 
 		if (socket) {
@@ -84,18 +78,13 @@ var RDB = require('./redis.js'),
 			});
 		}
 	}
-		});
-	}
-
-	ThreadTools.delete = function(tid, uid, callback) {
-		ThreadTools.privileges(tid, uid, function(privileges) {
-			if (privileges.editable || uid === -1) {
 
+	ThreadTools.delete = function(tid, callback) {
 		topics.delete(tid);
 
 		RDB.decr('totaltopiccount');
 
-				ThreadTools.lock(tid, uid);
+		ThreadTools.lock(tid);
 
 		topicSearch.remove(tid);
 
@@ -104,18 +93,15 @@ var RDB = require('./redis.js'),
 			status: 'ok'
 		});
 
+		if (callback) {
 			callback(null);
-			} else callback(new Error('not-enough-privs'));
-		});
+		}
 	}
 
-	ThreadTools.restore = function(tid, uid, socket, callback) {
-		ThreadTools.privileges(tid, uid, function(privileges) {
-			if (privileges.editable) {
-
+	ThreadTools.restore = function(tid, socket, callback) {
 		topics.restore(tid);
 		RDB.incr('totaltopiccount');
-				ThreadTools.unlock(tid, uid);
+		ThreadTools.unlock(tid);
 
 		io.sockets.in('topic_' + tid).emit('event:topic_restored', {
 			tid: tid,
@@ -126,16 +112,12 @@ var RDB = require('./redis.js'),
 			topicSearch.index(title, tid);
 		});
 
-				if(callback)
+		if(callback) {
 			callback(null);
 		}
-		});
 	}
 
-	ThreadTools.pin = function(tid, uid, socket) {
-		ThreadTools.privileges(tid, uid, function(privileges) {
-			if (privileges.editable) {
-
+	ThreadTools.pin = function(tid, socket) {
 		topics.setTopicField(tid, 'pinned', 1);
 		topics.getTopicField(tid, 'cid', function(err, cid) {
 			RDB.zadd('categories:' + cid + ':tid', Math.pow(2, 53), tid);
@@ -153,13 +135,8 @@ var RDB = require('./redis.js'),
 			});
 		}
 	}
-		});
-	}
-
-	ThreadTools.unpin = function(tid, uid, socket) {
-		ThreadTools.privileges(tid, uid, function(privileges) {
-			if (privileges.editable) {
 
+	ThreadTools.unpin = function(tid, socket) {
 		topics.setTopicField(tid, 'pinned', 0);
 		topics.getTopicFields(tid, ['cid', 'lastposttime'], function(err, topicData) {
 			RDB.zadd('categories:' + topicData.cid + ':tid', topicData.lastposttime, tid);
@@ -176,8 +153,6 @@ var RDB = require('./redis.js'),
 			});
 		}
 	}
-		});
-	}
 
 	ThreadTools.move = function(tid, cid, socket) {
 

src/websockets.js

@@ -491,7 +491,9 @@ module.exports.init = function(io) {
 		});
 
 		socket.on('api:topic.delete', function(data) {
-			threadTools.delete(data.tid, uid, function(err) {
+			threadTools.privileges(data.tid, uid, function(privileges) {
+				if (privileges.editable) {
+					threadTools.delete(data.tid, function(err) {
 						if (!err) {
 							posts.getTopicPostStats();
 							socket.emit('api:topic.delete', {
@@ -500,10 +502,14 @@ module.exports.init = function(io) {
 							});
 						}
 					});
+				}
+			});
 		});
 
 		socket.on('api:topic.restore', function(data) {
-			threadTools.restore(data.tid, uid, socket, function(err) {
+			threadTools.privileges(data.tid, uid, function(privileges) {
+				if (privileges.editable) {
+					threadTools.restore(data.tid, socket, function(err) {
 						posts.getTopicPostStats();
 
 						socket.emit('api:topic.restore', {
@@ -511,22 +517,40 @@ module.exports.init = function(io) {
 							tid: data.tid
 						});
 					});
+				}
+			});
 		});
 
 		socket.on('api:topic.lock', function(data) {
-			threadTools.lock(data.tid, uid, socket);
+			threadTools.privileges(data.tid, uid, function(privileges) {
+				if (privileges.editable) {
+					threadTools.lock(data.tid, socket);
+				}
+			});
 		});
 
 		socket.on('api:topic.unlock', function(data) {
-			threadTools.unlock(data.tid, uid, socket);
+			threadTools.privileges(data.tid, uid, function(privileges) {
+				if (privileges.editable) {
+					threadTools.unlock(data.tid, socket);
+				}
+			});
 		});
 
 		socket.on('api:topic.pin', function(data) {
-			threadTools.pin(data.tid, uid, socket);
+			threadTools.privileges(data.tid, uid, function(privileges) {
+				if (privileges.editable) {
+					threadTools.pin(data.tid, socket);
+				}
+			});
 		});
 
 		socket.on('api:topic.unpin', function(data) {
-			threadTools.unpin(data.tid, uid, socket);
+			threadTools.privileges(data.tid, uid, function(privileges) {
+				if (privileges.editable) {
+					threadTools.unpin(data.tid, socket);
+				}
+			});
 		});
 
 		socket.on('api:topic.move', function(data) {