2) {
notifications[modifyIndex].bodyShort = '[[' + mergeId + '_multiple, ' + usernames[0] + ', ' + (numUsers - 1) + titleEscaped + ']]';
}
+
+ notifications[modifyIndex].path = set[set.length-1].path;
break;
case 'new_register':
diff --git a/src/plugins.js b/src/plugins.js
index 6eba5de2ce..c531dfa27d 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -94,6 +94,10 @@ var middleware;
function(next) {
// Build language code list
fs.readdir(path.join(__dirname, '../public/language'), function(err, directories) {
+ if (err) {
+ return next(err);
+ }
+
Plugins.languageCodes = directories.filter(function(code) {
return code !== 'TODO';
});
@@ -206,7 +210,11 @@ var middleware;
}
});
} else {
- winston.warn('[plugins/' + plugin.id + '] A templates directory was defined for this plugin, but was not found.');
+ if (err) {
+ winston.error(err);
+ } else {
+ winston.warn('[plugins/' + plugin.id + '] A templates directory was defined for this plugin, but was not found.');
+ }
}
next(false);
@@ -392,7 +400,7 @@ var middleware;
next();
});
}, function(err) {
- next(null, plugins);
+ next(err, plugins);
});
}
], callback);
diff --git a/src/plugins/install.js b/src/plugins/install.js
index 1ea826784c..3e3ee42ff3 100644
--- a/src/plugins/install.js
+++ b/src/plugins/install.js
@@ -96,6 +96,10 @@ module.exports = function(Plugins) {
}
Plugins.get(id, function(err, pluginData) {
+ if (err) {
+ return callback(err);
+ }
+
Plugins.fireHook('action:plugin.' + type, id);
callback(null, pluginData);
});
diff --git a/src/plugins/load.js b/src/plugins/load.js
index 70aea70ccd..99019e371f 100644
--- a/src/plugins/load.js
+++ b/src/plugins/load.js
@@ -221,6 +221,10 @@ module.exports = function(Plugins) {
fallbackMap = {};
utils.walk(pathToFolder, function(err, languages) {
+ if (err) {
+ return callback(err);
+ }
+
async.each(languages, function(pathToLang, next) {
fs.readFile(pathToLang, function(err, file) {
if (err) {
diff --git a/src/posts/flags.js b/src/posts/flags.js
index 9eae966cda..dcc2f32f1d 100644
--- a/src/posts/flags.js
+++ b/src/posts/flags.js
@@ -106,6 +106,10 @@ module.exports = function(Posts) {
async.series([
function(next) {
db.getSortedSetRange('pid:' + pid + ':flag:uids', 0, -1, function(err, uids) {
+ if (err) {
+ return next(err);
+ }
+
async.each(uids, function(uid, next) {
var nid = 'post_flag:' + pid + ':uid:' + uid;
async.parallel([
diff --git a/src/posts/summary.js b/src/posts/summary.js
index 885a0e444d..e3e948c292 100644
--- a/src/posts/summary.js
+++ b/src/posts/summary.js
@@ -101,6 +101,10 @@ module.exports = function(Posts) {
next(null, post);
});
}, function(err, posts) {
+ if (err) {
+ return callback(err);
+ }
+
plugins.fireHook('filter:post.getPostSummaryByPids', {posts: posts, uid: uid}, function(err, postData) {
callback(err, postData.posts);
});
diff --git a/src/reset.js b/src/reset.js
index f1e27738e8..56669b6e2d 100644
--- a/src/reset.js
+++ b/src/reset.js
@@ -82,7 +82,12 @@ function resetTheme(themeId) {
type: 'local',
id: themeId
}, function(err) {
- winston.info('[reset] Theme reset to ' + themeId);
+ if (err) {
+ winston.warn('[reset] Failed to reset theme to ' + themeId);
+ } else {
+ winston.info('[reset] Theme reset to ' + themeId);
+ }
+
process.exit();
});
}
diff --git a/src/rewards/admin.js b/src/rewards/admin.js
index e6c32bc34b..0bde13ac00 100644
--- a/src/rewards/admin.js
+++ b/src/rewards/admin.js
@@ -46,6 +46,10 @@ rewards.save = function(data, callback) {
}
async.each(data, save, function(err) {
+ if (err) {
+ return callback(err);
+ }
+
saveConditions(data, callback);
});
};
@@ -125,6 +129,10 @@ function getActiveRewards(callback) {
}
db.getSetMembers('rewards:list', function(err, rewards) {
+ if (err) {
+ return callback(err);
+ }
+
async.eachSeries(rewards, load, function(err) {
callback(err, activeRewards);
});
diff --git a/src/rewards/index.js b/src/rewards/index.js
index c811ce933c..bbccab69f3 100644
--- a/src/rewards/index.js
+++ b/src/rewards/index.js
@@ -111,14 +111,22 @@ function getRewardsByRewardData(rewards, callback) {
function checkCondition(reward, method, callback) {
method(function(err, value) {
+ if (err) {
+ return callback(err);
+ }
+
plugins.fireHook('filter:rewards.checkConditional:' + reward.conditional, {left: value, right: reward.value}, function(err, bool) {
- callback(bool);
+ callback(err || bool);
});
});
}
function giveRewards(uid, rewards, callback) {
getRewardsByRewardData(rewards, function(err, rewardData) {
+ if (err) {
+ return callback(err);
+ }
+
async.each(rewards, function(reward, next) {
plugins.fireHook('action:rewards.award:' + reward.rid, {uid: uid, reward: rewardData[rewards.indexOf(reward)]});
db.sortedSetIncrBy('uid:' + uid + ':rewards', 1, reward.id, next);
diff --git a/src/routes/debug.js b/src/routes/debug.js
index b81938ccc9..a24a159e18 100644
--- a/src/routes/debug.js
+++ b/src/routes/debug.js
@@ -2,6 +2,7 @@
var express = require('express'),
nconf = require('nconf'),
+ winston = require('winston'),
user = require('./../user'),
categories = require('./../categories'),
topics = require('./../topics'),
@@ -16,6 +17,10 @@ module.exports = function(app, middleware, controllers) {
}
user.getUserData(req.params.uid, function (err, data) {
+ if (err) {
+ winston.error(err);
+ }
+
if (data) {
res.send(data);
} else {
@@ -28,6 +33,10 @@ module.exports = function(app, middleware, controllers) {
router.get('/cid/:cid', function (req, res) {
categories.getCategoryData(req.params.cid, function (err, data) {
+ if (err) {
+ winston.error(err);
+ }
+
if (data) {
res.send(data);
} else {
@@ -38,6 +47,10 @@ module.exports = function(app, middleware, controllers) {
router.get('/tid/:tid', function (req, res) {
topics.getTopicData(req.params.tid, function (err, data) {
+ if (err) {
+ winston.error(err);
+ }
+
if (data) {
res.send(data);
} else {
@@ -48,6 +61,10 @@ module.exports = function(app, middleware, controllers) {
router.get('/pid/:pid', function (req, res) {
posts.getPostData(req.params.pid, function (err, data) {
+ if (err) {
+ winston.error(err);
+ }
+
if (data) {
res.send(data);
} else {
diff --git a/src/routes/index.js b/src/routes/index.js
index 1e51f5d59e..006e5b8c18 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -36,6 +36,9 @@ function mainRoutes(app, middleware, controllers) {
setupPageRoute(app, '/search/:term?', middleware, [], controllers.search.search);
setupPageRoute(app, '/reset/:code?', middleware, [], controllers.reset);
setupPageRoute(app, '/tos', middleware, [], controllers.termsOfUse);
+
+ app.get('/ping', controllers.ping);
+ app.get('/sping', controllers.ping);
}
function globalModRoutes(app, middleware, controllers) {
@@ -153,6 +156,7 @@ module.exports = function(app, middleware, hotswapIds) {
}));
app.use('/vendor/jquery/timeago/locales', middleware.processTimeagoLocales);
app.use(controllers.handle404);
+ app.use(controllers.handleURIErrors);
app.use(controllers.handleErrors);
// Add plugin routes
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index 556eee0290..c599abf491 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -251,20 +251,6 @@ SocketAdmin.errors.clear = function(socket, data, callback) {
meta.errors.clear(callback);
};
-SocketAdmin.getMoreEvents = function(socket, next, callback) {
- var start = parseInt(next, 10);
- if (start < 0) {
- return callback(null, {data: [], next: next});
- }
- var stop = start + 10;
- events.getEvents(start, stop, function(err, events) {
- if (err) {
- return callback(err);
- }
- callback(null, {events: events, next: stop + 1});
- });
-};
-
SocketAdmin.deleteAllEvents = function(socket, data, callback) {
events.deleteAll(callback);
};
diff --git a/src/socket.io/admin/tags.js b/src/socket.io/admin/tags.js
index ad7ffa7201..cbe25fabcb 100644
--- a/src/socket.io/admin/tags.js
+++ b/src/socket.io/admin/tags.js
@@ -1,7 +1,15 @@
"use strict";
-var topics = require('../../topics'),
- Tags = {};
+var topics = require('../../topics');
+var Tags = {};
+
+Tags.create = function(socket, data, callback) {
+ if (!data) {
+ return callback(new Error('[[error:invalid-data]]'));
+ }
+
+ topics.createEmptyTag(data.tag, callback);
+};
Tags.update = function(socket, data, callback) {
if (!data) {
diff --git a/src/socket.io/helpers.js b/src/socket.io/helpers.js
index 706604ec6e..46617c2889 100644
--- a/src/socket.io/helpers.js
+++ b/src/socket.io/helpers.js
@@ -172,7 +172,15 @@ SocketHelpers.rescindUpvoteNotification = function(pid, fromuid) {
notifications.rescind(nid);
posts.getPostField(pid, 'uid', function(err, uid) {
+ if (err) {
+ return winston.error(err);
+ }
+
user.notifications.getUnreadCount(uid, function(err, count) {
+ if (err) {
+ return winston.error(err);
+ }
+
websockets.in('uid_' + uid).emit('event:notifications.updateCount', count);
});
});
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index cebbfe1a24..3ec75ecd0d 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -56,6 +56,8 @@ var ratelimit = require('../middleware/ratelimit');
} else {
socket.join('online_guests');
}
+
+ io.sockets.sockets[socket.id].emit('checkSession', socket.uid);
}
function onMessage(socket, payload) {
diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js
index 3251c3700c..6c86458fc2 100644
--- a/src/socket.io/posts.js
+++ b/src/socket.io/posts.js
@@ -30,6 +30,7 @@ SocketPosts.reply = function(socket, data, callback) {
data.uid = socket.uid;
data.req = websockets.reqFromSocket(socket);
+ data.timestamp = Date.now();
topics.reply(data, function(err, postData) {
if (err) {
diff --git a/src/socket.io/user.js b/src/socket.io/user.js
index 44c17ea476..6bb23a0698 100644
--- a/src/socket.io/user.js
+++ b/src/socket.io/user.js
@@ -122,6 +122,10 @@ SocketUser.reset.commit = function(socket, data, callback) {
var parsedDate = now.getFullYear() + '/' + (now.getMonth()+1) + '/' + now.getDate();
user.getUserField(uid, 'username', function(err, username) {
+ if (err) {
+ return callback(err);
+ }
+
emailer.send('reset_notify', uid, {
username: username,
date: parsedDate,
diff --git a/src/socket.io/user/ban.js b/src/socket.io/user/ban.js
index a2c4ea50d3..41c60411e0 100644
--- a/src/socket.io/user/ban.js
+++ b/src/socket.io/user/ban.js
@@ -34,7 +34,20 @@ module.exports = function(SocketUser) {
};
SocketUser.unbanUsers = function(socket, uids, callback) {
- toggleBan(socket.uid, uids, user.unban, callback);
+ toggleBan(socket.uid, uids, user.unban, function(err) {
+ if (err) {
+ return callback(err);
+ }
+
+ async.each(uids, function(uid, next) {
+ events.log({
+ type: 'user-unban',
+ uid: socket.uid,
+ targetUid: uid,
+ ip: socket.ip
+ }, next);
+ }, callback);
+ });
};
function toggleBan(uid, uids, method, callback) {
diff --git a/src/socket.io/user/picture.js b/src/socket.io/user/picture.js
index cf886b1d48..e71de5f18c 100644
--- a/src/socket.io/user/picture.js
+++ b/src/socket.io/user/picture.js
@@ -38,6 +38,10 @@ module.exports = function(SocketUser) {
type: type,
picture: undefined
}, function(err, returnData) {
+ if (err) {
+ return next(err);
+ }
+
next(null, returnData.picture || '');
});
break;
diff --git a/src/socket.io/user/profile.js b/src/socket.io/user/profile.js
index 52c9fcd801..48c0f0fa49 100644
--- a/src/socket.io/user/profile.js
+++ b/src/socket.io/user/profile.js
@@ -29,6 +29,10 @@ module.exports = function(SocketUser) {
}
user.isAdministrator(socket.uid, function(err, isAdmin) {
+ if (err) {
+ return callback(err);
+ }
+
if (!isAdmin && data.uid !== socket.uid) {
return callback(new Error('[[error:no-privileges]]'));
}
diff --git a/src/topics.js b/src/topics.js
index 0079c501ce..4cb795b2c3 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -188,19 +188,27 @@ var social = require('./social');
posts: async.apply(getMainPostAndReplies, topicData, set, uid, start, stop, reverse),
category: async.apply(Topics.getCategoryData, topicData.tid),
threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', {topic: topicData, uid: uid, tools: []}),
- tags: async.apply(Topics.getTopicTagsObjects, topicData.tid),
isFollowing: async.apply(Topics.isFollowing, [topicData.tid], uid),
isIgnoring: async.apply(Topics.isIgnoring, [topicData.tid], uid),
bookmark: async.apply(Topics.getUserBookmark, topicData.tid, uid),
postSharing: async.apply(social.getActivePostSharing),
- related: async.apply(Topics.getRelatedTopics, topicData, uid)
+ related: function(next) {
+ async.waterfall([
+ function(next) {
+ Topics.getTopicTagsObjects(topicData.tid, next);
+ },
+ function(tags, next) {
+ topicData.tags = tags;
+ Topics.getRelatedTopics(topicData, uid, next);
+ }
+ ], next);
+ }
}, next);
},
function (results, next) {
topicData.posts = results.posts;
topicData.category = results.category;
topicData.thread_tools = results.threadTools.tools;
- topicData.tags = results.tags;
topicData.isFollowing = results.isFollowing[0];
topicData.isNotFollowing = !results.isFollowing[0] && !results.isIgnoring[0];
topicData.isIgnoring = results.isIgnoring[0];
diff --git a/src/topics/create.js b/src/topics/create.js
index cd1bf23a62..ea7d35761a 100644
--- a/src/topics/create.js
+++ b/src/topics/create.js
@@ -230,7 +230,15 @@ module.exports = function(Topics) {
check(content, meta.config.minimumPostLength, meta.config.maximumPostLength, 'content-too-short', 'content-too-long', next);
},
function(next) {
- posts.create({uid: uid, tid: tid, handle: data.handle, content: content, toPid: data.toPid, timestamp: data.timestamp, ip: data.req ? data.req.ip : null}, next);
+ posts.create({
+ uid: uid,
+ tid: tid,
+ handle: data.handle,
+ content: content,
+ toPid: data.toPid,
+ timestamp: data.timestamp,
+ ip: data.req ? data.req.ip : null
+ }, next);
},
function(_postData, next) {
postData = _postData;
@@ -328,6 +336,7 @@ module.exports = function(Topics) {
}
callback();
});
+ return;
}
callback();
}
diff --git a/src/topics/delete.js b/src/topics/delete.js
index a960ff0421..cf6ae01d8d 100644
--- a/src/topics/delete.js
+++ b/src/topics/delete.js
@@ -32,7 +32,7 @@ module.exports = function(Topics) {
db.sortedSetRemove('cid:' + topicData.cid + ':pids', pids, next);
});
}
- ], function(err, results) {
+ ], function(err) {
callback(err);
});
});
@@ -79,7 +79,7 @@ module.exports = function(Topics) {
});
});
}
- ], function(err, results) {
+ ], function(err) {
callback(err);
});
});
@@ -109,28 +109,35 @@ module.exports = function(Topics) {
};
Topics.purge = function(tid, uid, callback) {
- async.parallel([
+ async.waterfall([
function(next) {
- db.deleteAll([
- 'tid:' + tid + ':followers',
- 'tid:' + tid + ':ignorers',
- 'tid:' + tid + ':posts',
- 'tid:' + tid + ':posts:votes',
- 'tid:' + tid + ':bookmarks',
- 'tid:' + tid + ':posters'
+ deleteFromFollowersIgnorers(tid, next);
+ },
+ function(next) {
+ async.parallel([
+ function(next) {
+ db.deleteAll([
+ 'tid:' + tid + ':followers',
+ 'tid:' + tid + ':ignorers',
+ 'tid:' + tid + ':posts',
+ 'tid:' + tid + ':posts:votes',
+ 'tid:' + tid + ':bookmarks',
+ 'tid:' + tid + ':posters'
+ ], next);
+ },
+ function(next) {
+ db.sortedSetsRemove(['topics:tid', 'topics:recent', 'topics:posts', 'topics:views'], tid, next);
+ },
+ function(next) {
+ deleteTopicFromCategoryAndUser(tid, next);
+ },
+ function(next) {
+ Topics.deleteTopicTags(tid, next);
+ },
+ function(next) {
+ reduceCounters(tid, next);
+ }
], next);
- },
- function(next) {
- db.sortedSetsRemove(['topics:tid', 'topics:recent', 'topics:posts', 'topics:views'], tid, next);
- },
- function(next) {
- deleteTopicFromCategoryAndUser(tid, next);
- },
- function(next) {
- Topics.deleteTopicTags(tid, next);
- },
- function(next) {
- reduceCounters(tid, next);
}
], function(err) {
if (err) {
@@ -141,6 +148,26 @@ module.exports = function(Topics) {
});
};
+ function deleteFromFollowersIgnorers(tid, callback) {
+ async.waterfall([
+ function(next) {
+ async.parallel({
+ followers: async.apply(db.getSetMembers, 'tid:' + tid + ':followers'),
+ ignorers: async.apply(db.getSetMembers, 'tid:' + tid + ':ignorers')
+ }, next);
+ },
+ function(results, next) {
+ var followerKeys = results.followers.map(function(uid) {
+ return 'uid:' + uid + ':followed_tids';
+ });
+ var ignorerKeys = results.ignorers.map(function(uid) {
+ return 'uid:' + uid + 'ignored_tids';
+ });
+ db.sortedSetsRemove(followerKeys.concat(ignorerKeys), tid, next);
+ }
+ ], callback);
+ }
+
function deleteTopicFromCategoryAndUser(tid, callback) {
Topics.getTopicFields(tid, ['cid', 'uid'], function(err, topicData) {
if (err) {
diff --git a/src/topics/tags.js b/src/topics/tags.js
index ec16c09ff6..13dcd4b14d 100644
--- a/src/topics/tags.js
+++ b/src/topics/tags.js
@@ -48,6 +48,29 @@ module.exports = function(Topics) {
], callback);
};
+ Topics.createEmptyTag = function(tag, callback) {
+ if (!tag) {
+ return callback(new Error('[[error:invalid-tag]]'));
+ }
+
+ tag = utils.cleanUpTag(tag, meta.config.maximumTagLength);
+ if (tag.length < (meta.config.minimumTagLength || 3)) {
+ return callback(new Error('[[error:tag-too-short]]'));
+ }
+
+ async.waterfall([
+ function(next) {
+ db.isSortedSetMember('tags:topic:count', tag, next);
+ },
+ function(isMember, next) {
+ if (isMember) {
+ return callback(new Error('[[error:tag-exists]]'));
+ }
+ db.sortedSetAdd('tags:topic:count', 0, tag, next);
+ }
+ ], callback);
+ };
+
Topics.updateTag = function(tag, data, callback) {
db.setObject('tag:' + tag, data, callback);
};
@@ -233,7 +256,7 @@ module.exports = function(Topics) {
updateTagCount(tag, next);
}, next);
}
- ], function(err, results) {
+ ], function(err) {
callback(err);
});
});
@@ -317,7 +340,7 @@ module.exports = function(Topics) {
}
var maximumTopics = parseInt(meta.config.maximumRelatedTopics, 10) || 0;
- if (maximumTopics === 0 || !topicData.tags.length) {
+ if (maximumTopics === 0 || !topicData.tags || !topicData.tags.length) {
return callback(null, []);
}
diff --git a/src/upgrade.js b/src/upgrade.js
index ae3877458d..317f1837da 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -46,6 +46,10 @@ Upgrade.upgrade = function(callback) {
function(next) {
// Prepare for upgrade & check to make sure the upgrade is possible
db.get('schemaDate', function(err, value) {
+ if (err) {
+ return next(err);
+ }
+
if(!value) {
db.set('schemaDate', latestSchema, function() {
next();
@@ -506,8 +510,16 @@ Upgrade.upgrade = function(callback) {
var privilegesAPI = require('./privileges');
db.getSortedSetRange('categories:cid', 0, -1, function(err, cids) {
+ if (err) {
+ return next(err);
+ }
+
async.eachSeries(cids, function(cid, next) {
privilegesAPI.categories.list(cid, function(err, data) {
+ if (err) {
+ return next(err);
+ }
+
var groups = data.groups;
var users = data.users;
@@ -628,6 +640,10 @@ Upgrade.upgrade = function(callback) {
var meta = require('./meta');
db.getSortedSetRange('categories:cid', 0, -1, function(err, cids) {
+ if (err) {
+ return next(err);
+ }
+
async.eachSeries(cids, function(cid, next) {
privilegesAPI.categories.list(cid, function(err, data) {
if (err) {
@@ -694,8 +710,16 @@ Upgrade.upgrade = function(callback) {
var privilegesAPI = require('./privileges');
db.getSortedSetRange('categories:cid', 0, -1, function(err, cids) {
+ if (err) {
+ return next(err);
+ }
+
async.eachSeries(cids, function(cid, next) {
privilegesAPI.categories.list(cid, function(err, data) {
+ if (err) {
+ return next(err);
+ }
+
var groups = data.groups;
var users = data.users;
diff --git a/src/user/admin.js b/src/user/admin.js
index e4384782ee..dd3134e442 100644
--- a/src/user/admin.js
+++ b/src/user/admin.js
@@ -5,6 +5,7 @@ var async = require('async');
var db = require('../database');
var posts = require('../posts');
var plugins = require('../plugins');
+var winston = require('winston');
module.exports = function(User) {
@@ -27,6 +28,7 @@ module.exports = function(User) {
};
User.getUsersCSV = function(callback) {
+ winston.info('[user/getUsersCSV] Compiling User CSV data');
var csvContent = '';
async.waterfall([
diff --git a/src/user/approval.js b/src/user/approval.js
index 8ccd5192aa..95b2daa68b 100644
--- a/src/user/approval.js
+++ b/src/user/approval.js
@@ -166,26 +166,44 @@ module.exports = function(User) {
// temporary: see http://www.stopforumspam.com/forum/viewtopic.php?id=6392
user.ip = user.ip.replace('::ffff:', '');
- request({
- method: 'get',
- url: 'http://api.stopforumspam.org/api' +
- '?ip=' + encodeURIComponent(user.ip) +
- '&email=' + encodeURIComponent(user.email) +
- '&username=' + encodeURIComponent(user.username) +
- '&f=json',
- json: true
- }, function (err, response, body) {
- if (err) {
- return next(null, user);
- }
- if (response.statusCode === 200 && body) {
- user.spamData = body;
- user.usernameSpam = body.username ? (body.username.frequency > 0 || body.username.appears > 0) : true;
- user.emailSpam = body.email ? (body.email.frequency > 0 || body.email.appears > 0) : true;
- user.ipSpam = body.ip ? (body.ip.frequency > 0 || body.ip.appears > 0) : true;
- }
+ async.parallel([
+ function(next) {
+ User.getUidsFromSet('ip:' + user.ip + ':uid', 0, -1, function(err, uids) {
+ if (err) {
+ return next(err);
+ }
- next(null, user);
+ User.getUsersFields(uids, ['uid', 'username', 'picture'], function(err, ipMatch) {
+ user.ipMatch = ipMatch;
+ next(err);
+ });
+ });
+ },
+ function(next) {
+ request({
+ method: 'get',
+ url: 'http://api.stopforumspam.org/api' +
+ '?ip=' + encodeURIComponent(user.ip) +
+ '&email=' + encodeURIComponent(user.email) +
+ '&username=' + encodeURIComponent(user.username) +
+ '&f=json',
+ json: true
+ }, function (err, response, body) {
+ if (err) {
+ return next();
+ }
+ if (response.statusCode === 200 && body) {
+ user.spamData = body;
+ user.usernameSpam = body.username ? (body.username.frequency > 0 || body.username.appears > 0) : true;
+ user.emailSpam = body.email ? (body.email.frequency > 0 || body.email.appears > 0) : true;
+ user.ipSpam = body.ip ? (body.ip.frequency > 0 || body.ip.appears > 0) : true;
+ }
+
+ next();
+ });
+ }
+ ], function(err) {
+ next(err, user);
});
}, next);
}
diff --git a/src/user/auth.js b/src/user/auth.js
index f2fa917962..b8ff96053b 100644
--- a/src/user/auth.js
+++ b/src/user/auth.js
@@ -101,7 +101,7 @@ module.exports = function(User) {
async.each(expiredSids, function(sid, next) {
User.auth.revokeSession(sid, uid, next);
}, function(err) {
- next(null, sessions);
+ next(err, sessions);
});
}
], function (err, sessions) {
diff --git a/src/user/digest.js b/src/user/digest.js
index 81b6ea0220..f3978bd8e5 100644
--- a/src/user/digest.js
+++ b/src/user/digest.js
@@ -60,6 +60,10 @@ var utils = require('../../public/src/utils');
Digest.getSubscribers = function(interval, callback) {
db.getSortedSetRange('digest:' + interval + ':uids', 0, -1, function(err, subscribers) {
+ if (err) {
+ return callback(err);
+ }
+
plugins.fireHook('filter:digest.subscribers', {
interval: interval,
subscribers: subscribers
diff --git a/src/user/follow.js b/src/user/follow.js
index 094d33c460..7295f01519 100644
--- a/src/user/follow.js
+++ b/src/user/follow.js
@@ -85,6 +85,10 @@ module.exports = function(User) {
start: start,
stop: stop
}, function(err, data) {
+ if (err) {
+ return callback(err);
+ }
+
User.getUsers(data.uids, uid, callback);
});
});
diff --git a/src/user/picture.js b/src/user/picture.js
index 38d013cab0..78ad131ab4 100644
--- a/src/user/picture.js
+++ b/src/user/picture.js
@@ -200,6 +200,10 @@ module.exports = function(User) {
], function(err) {
if (err) {
return fs.unlink(data.file.path, function(unlinkErr) {
+ if (unlinkErr) {
+ winston.error(unlinkErr);
+ }
+
callback(err); // send back the original error
});
}
diff --git a/src/user/profile.js b/src/user/profile.js
index 8b2a83f152..34fb24467c 100644
--- a/src/user/profile.js
+++ b/src/user/profile.js
@@ -49,6 +49,10 @@ module.exports = function(User) {
}
User.getUserField(uid, 'email', function(err, email) {
+ if (err) {
+ return next(err);
+ }
+
if(email === data.email) {
return next();
}
diff --git a/src/views/400.tpl b/src/views/400.tpl
new file mode 100644
index 0000000000..9c263fcff1
--- /dev/null
+++ b/src/views/400.tpl
@@ -0,0 +1,4 @@
+
+
[[global:400.title]]
+
[[global:400.message, {config.relative_path}]]
+
{events.jsonString}
+
diff --git a/src/views/admin/manage/registration.tpl b/src/views/admin/manage/registration.tpl
index f751eca74d..5944219794 100644
--- a/src/views/admin/manage/registration.tpl
+++ b/src/views/admin/manage/registration.tpl
@@ -42,6 +42,15 @@
{users.ip}
+
+
+
+ 
+
+ {users.ipMatch.icon:text}
+
+ {users.ipMatch.username}
+
diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl
index bc47f93731..d60cdc4147 100644
--- a/src/views/admin/manage/tags.tpl
+++ b/src/views/admin/manage/tags.tpl
@@ -6,7 +6,7 @@
Your forum does not have any topics with tags yet.
-
+
diff --git a/tests/categories.js b/tests/categories.js
index c5bbee22cc..b607e6fc0a 100644
--- a/tests/categories.js
+++ b/tests/categories.js
@@ -25,6 +25,8 @@ describe('Categories', function() {
blockclass: 'category-blue',
order: '5'
}, function(err, category) {
+ assert.equal(err, null);
+
categoryObj = category;
done.apply(this, arguments);
});
@@ -41,6 +43,8 @@ describe('Categories', function() {
stop: -1,
uid: 0
}, function(err, categoryData) {
+ assert.equal(err, null);
+
assert(categoryData);
assert.equal(categoryObj.name, categoryData.name);
assert.equal(categoryObj.description, categoryData.description);
@@ -60,6 +64,8 @@ describe('Categories', function() {
stop: 10,
uid: 0
}, function(err, result) {
+ assert.equal(err, null);
+
assert(Array.isArray(result.topics));
assert(result.topics.every(function(topic) {
return topic instanceof Object;
@@ -79,6 +85,7 @@ describe('Categories', function() {
uid: 0,
targetUid: 1
}, function(err, result) {
+ assert.equal(err, null);
assert(Array.isArray(result.topics));
assert(result.topics.every(function(topic) {
return topic instanceof Object && topic.uid === '1';
diff --git a/tests/database/list.js b/tests/database/list.js
index 137c465c2e..c008a0f784 100644
--- a/tests/database/list.js
+++ b/tests/database/list.js
@@ -125,6 +125,7 @@ describe('List methods', function() {
assert.equal(arguments.length, 1);
db.getListRange('testList5', 0, -1, function(err, list) {
+ assert.equal(err, null);
assert.equal(Array.isArray(list), true);
assert.equal(list.length, 2);
assert.equal(list.indexOf('1'), -1);
@@ -148,6 +149,7 @@ describe('List methods', function() {
assert.equal(err, null);
assert.equal(arguments.length, 1);
db.getListRange('testList6', 0, -1, function(err, list) {
+ assert.equal(err, null);
assert.equal(list.length, 3);
assert.deepEqual(list, ['1', '2', '3']);
done();
diff --git a/tests/database/sorted.js b/tests/database/sorted.js
index 8f23038dae..c1066f5ff4 100644
--- a/tests/database/sorted.js
+++ b/tests/database/sorted.js
@@ -336,6 +336,18 @@ describe('Sorted Set methods', function() {
});
describe('sortedSetScores()', function() {
+ before(function(done) {
+ db.sortedSetAdd('zeroScore', 0, 'value1', done);
+ });
+
+ it('should return 0 if score is 0', function(done) {
+ db.sortedSetScores('zeroScore', ['value1'], function(err, scores) {
+ assert.ifError(err);
+ assert.equal(0, scores[0]);
+ done();
+ });
+ });
+
it('should return the scores of value in sorted sets', function(done) {
db.sortedSetScores('sortedSetTest1', ['value2', 'value1', 'doesnotexist'], function(err, scores) {
assert.equal(err, null);
diff --git a/tests/groups.js b/tests/groups.js
index 6c30bddd77..43b1857b99 100644
--- a/tests/groups.js
+++ b/tests/groups.js
@@ -270,6 +270,7 @@ describe('Groups', function() {
if (err) return done(err);
Groups.isMember(1, 'Test', function(err, isMember) {
+ assert.equal(err, null);
assert.strictEqual(true, isMember);
done();
@@ -284,6 +285,7 @@ describe('Groups', function() {
if (err) return done(err);
Groups.isMember(1, 'Test', function(err, isMember) {
+ assert.equal(err, null);
assert.strictEqual(false, isMember);
done();
diff --git a/tests/messaging.js b/tests/messaging.js
index 3092e42b35..e7a936bae1 100644
--- a/tests/messaging.js
+++ b/tests/messaging.js
@@ -17,6 +17,10 @@ describe('Messaging Library', function() {
async.apply(User.create, { username: 'baz', password: 'quux' }), // restricted user
async.apply(User.create, { username: 'herp', password: 'derp' }) // regular user
], function(err, uids) {
+ if (err) {
+ return done(err);
+ }
+
testUids = uids;
async.parallel([
async.apply(Groups.join, 'administrators', uids[0]),
diff --git a/tests/mocks/databasemock.js b/tests/mocks/databasemock.js
index a895d25c8a..b18d19e338 100644
--- a/tests/mocks/databasemock.js
+++ b/tests/mocks/databasemock.js
@@ -75,6 +75,10 @@
before(function(done) {
db.init(function(err) {
+ if (err) {
+ return done(err);
+ }
+
//Clean up
db.flushdb(function(err) {
if(err) {
diff --git a/tests/topics.js b/tests/topics.js
index 7103b32689..575ce6a0b1 100644
--- a/tests/topics.js
+++ b/tests/topics.js
@@ -23,6 +23,10 @@ describe('Topic\'s', function() {
};
User.create({username: userData.username, password: userData.password, email: userData.email}, function(err, uid) {
+ if (err) {
+ return done(err);
+ }
+
categories.create({
name: 'Test Category',
description: 'Test category created by testing script',
@@ -30,6 +34,10 @@ describe('Topic\'s', function() {
blockclass: 'category-blue',
order: '5'
}, function(err, category) {
+ if (err) {
+ return done(err);
+ }
+
categoryObj = category;
topic = {
@@ -91,6 +99,10 @@ describe('Topic\'s', function() {
before(function(done) {
topics.post({uid: topic.userId, title: topic.title, content: topic.content, cid: topic.categoryId}, function(err, result) {
+ if (err) {
+ return done(err);
+ }
+
newTopic = result.topicData;
newPost = result.postData;
done();
@@ -134,6 +146,10 @@ describe('Topic\'s', function() {
before(function(done) {
topics.post({uid: topic.userId, title: topic.title, content: topic.content, cid: topic.categoryId}, function(err, result) {
+ if (err) {
+ return done(err);
+ }
+
newTopic = result.topicData;
newPost = result.postData;
done();
@@ -188,12 +204,24 @@ describe('Topic\'s', function() {
describe('.purge/.delete', function() {
var newTopic;
-
+ var followerUid;
before(function(done) {
- topics.post({uid: topic.userId, title: topic.title, content: topic.content, cid: topic.categoryId}, function(err, result) {
- newTopic = result.topicData;
- done();
- });
+ async.waterfall([
+ function(next) {
+ topics.post({uid: topic.userId, title: topic.title, content: topic.content, cid: topic.categoryId}, function(err, result) {
+ assert.ifError(err);
+ newTopic = result.topicData;
+ next();
+ });
+ },
+ function(next) {
+ User.create({username: 'topicFollower', password: '123456'}, next);
+ },
+ function(_uid, next) {
+ followerUid = _uid;
+ topics.follow(newTopic.tid, _uid, next);
+ }
+ ], done);
});
it('should delete the topic', function(done) {
@@ -206,7 +234,11 @@ describe('Topic\'s', function() {
it('should purge the topic', function(done) {
topics.purge(newTopic.tid, 1, function(err) {
assert.ifError(err);
- done();
+ db.isSortedSetMember('uid:' + followerUid + ':followed_tids', newTopic.tid, function(err, isMember) {
+ assert.ifError(err);
+ assert.strictEqual(false, isMember);
+ done();
+ });
});
});
});
@@ -220,6 +252,10 @@ describe('Topic\'s', function() {
async.waterfall([
function(done){
topics.post({uid: topic.userId, title: 'Topic to be ignored', content: 'Just ignore me, please!', cid: topic.categoryId}, function(err, result) {
+ if (err) {
+ return done(err);
+ }
+
newTopic = result.topicData;
newTid = newTopic.tid;
done();
diff --git a/tests/user.js b/tests/user.js
index 30a835fe83..32f43c7dbf 100644
--- a/tests/user.js
+++ b/tests/user.js
@@ -28,6 +28,10 @@ describe('User', function() {
description: 'A test',
order: 1
}, function(err, categoryObj) {
+ if (err) {
+ return done(err);
+ }
+
testCid = categoryObj.cid;
done();
});
@@ -67,6 +71,7 @@ describe('User', function() {
describe('.isModerator()', function() {
it('should return false', function(done) {
User.isModerator(testUid, testCid, function(err, isModerator) {
+ assert.equal(err, null);
assert.equal(isModerator, false);
done();
});
@@ -74,6 +79,7 @@ describe('User', function() {
it('should return two false results', function(done) {
User.isModerator([testUid, testUid], testCid, function(err, isModerator) {
+ assert.equal(err, null);
assert.equal(isModerator[0], false);
assert.equal(isModerator[1], false);
done();
@@ -82,6 +88,7 @@ describe('User', function() {
it('should return two false results', function(done) {
User.isModerator(testUid, [testCid, testCid], function(err, isModerator) {
+ assert.equal(err, null);
assert.equal(isModerator[0], false);
assert.equal(isModerator[1], false);
done();
|