From a429dce5dd962b0d88526e42fbd6f22b2d824e7b Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 21 Nov 2014 08:25:35 -0700 Subject: [PATCH] fix(private-messages): blocker can't message blockee --- src/controllers/members.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/controllers/members.js b/src/controllers/members.js index 6789868530..9d3017960f 100644 --- a/src/controllers/members.js +++ b/src/controllers/members.js @@ -21,7 +21,9 @@ api.sendPrivateMessage = function(req,res,next){ }, function(member, cb){ if (!member) return cb({code:404, err: 'User not found'}); - if (~member.inbox.blocks.indexOf(res.locals.user._id) || member.inbox.optOut) { + if (~member.inbox.blocks.indexOf(res.locals.user._id) // can't send message if that user blocked me + || ~res.locals.user.inbox.blocks.indexOf(member._id) // or if I blocked them + || member.inbox.optOut) { // or if they've opted out of messaging return cb({code:401, err: "Can't send message to this user."}); }