deleting a user will delete topic tags too

src/topics/tags.js

@@ -57,23 +57,23 @@ module.exports = function(Topics) {
 	}
 
 	Topics.updateTags = function(tid, tags) {
-		async.parallel({
+		Topics.getTopicField(tid, 'timestamp', function(err, timestamp) {
-			timestamp: function(next) {
+			if (!err) {
-				Topics.getTopicField(tid, 'timestamp', next);
+				Topics.deleteTopicTags(tid, function(err) {
-			},
-			currentTags: function(next) {
-				Topics.getTopicTags(tid, next);
-			}
-		}, function(err, results) {
-			removeTopicTags(tid, results.currentTags, function(err) {
 					if (!err) {
-					Topics.createTags(tags, tid, results.timestamp);
+						Topics.createTags(tags, tid, timestamp);
 					}
 				});
+			}
 		});
 	};
 
-	function removeTopicTags(tid, tags, callback) {
+	Topics.deleteTopicTags = function(tid, callback) {
+		Topics.getTopicTags(tid, function(err, tags) {
+			if (err) {
+				return callback(err);
+			}
+
 			async.parallel([
 				function(next) {
 					db.delete('topic:' + tid + ':tags', next);
@@ -84,7 +84,8 @@ module.exports = function(Topics) {
 					}, next);
 				}
 			], callback);
-	}
+		});
+	};
 
 	Topics.searchTags = function(query, callback) {
 		if (!query || query.length === 0) {

src/user/delete.js

@@ -153,7 +153,6 @@ module.exports = function(User) {
 	}
 
 	function deleteTopic(tid, callback) {
-
 		async.parallel([
 			function(next) {
 				db.delete('tid:' + tid + ':followers', next);
@@ -175,6 +174,9 @@ module.exports = function(User) {
 			},
 			function(next) {
 				deleteTopicFromCategory(tid, next);
+			},
+			function(next) {
+				topics.deleteTopicTags(tid, next);
 			}
 		], function(err) {
 			if (err) {