Another message area check

2019-09-09 21:44:03 -06:00
parent 24e18b5a7e
commit 8027a73ea5
2 changed files with 12 additions and 3 deletions
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -404,8 +404,15 @@ function getMessageListForArea(client, areaTag, filter, cb)
        Object.assign(filter, { areaTag } );
    }

+    if(client) {
+        const area = getMessageAreaByTag(areaTag);
+        if(!client.acs.hasMessageAreaRead(area)) {
+            return cb(null, []);
+        }
+    }
+
    if(Message.isPrivateAreaTag(areaTag)) {
-        filter.privateTagUserId = client.user.userId;
+        filter.privateTagUserId = client ? client.user.userId : 'INVALID_USER_ID';
    }

    return Message.findMessages(filter, cb);