Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-27 00:55:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into chat-kick-support

Browse Source
This commit is contained in:
Julian Lam
2018-04-30 12:43:49 -04:00
parent a08572b800 054755d3d4
commit 5dc25a3c00
487 changed files with 2044 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/messaging.js
View File

@@ -220,6 +220,9 @@ Messaging.getTeaser = function (uid, roomId, callback) {
Messaging.getMessageFields(mids[0], ['fromuid', 'content', 'timestamp'], next);
},
function (teaser, next) {
if (!teaser) {
return callback();
}
user.blocks.is(teaser.fromuid, uid, function (err, blocked) {
if (err || blocked) {
return callback(err);

11
src/middleware/user.js
View File

@@ -221,17 +221,6 @@ module.exports = function (middleware) {
}
};
middleware.exposeUid = function (req, res, next) {
if (!req.params.userslug) {
return next();
}
user.getUidByUserslug(req.params.userslug, function (err, uid) {
res.locals.uid = uid;
next(err, uid);
});
};
middleware.handleBlocking = function (req, res, next) {
user.blocks.is(res.locals.uid, req.uid, function (err, blocked) {
if (err) {

2
src/user/blocks.js
View File

@@ -76,7 +76,7 @@ module.exports = function (User) {
property = 'uid';
}
if (!Array.isArray(set) || !(set[0].hasOwnProperty(property) || typeof set[0] === 'number' || typeof set[0] === 'string')) {
if (!Array.isArray(set) || !set.length || !(set[0].hasOwnProperty(property) || typeof set[0] === 'number' || typeof set[0] === 'string')) {
return callback(null, set);
}