moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent private mail in message search results

This commit is contained in:
Bryan Ashby 2018-01-31 23:01:42 -07:00
parent 837326e15a
commit 5c580c1ecd
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/message.js
View File

@ -228,7 +228,8 @@ module.exports = class Message {
filter.extraFields = [] filter.extraFields = []
filter.privateTagUserId = <userId> - if set, only private messages belonging to <userId> are processed filter.privateTagUserId = <userId> - if set, only private messages belonging to <userId> are processed
(any other areaTag or confTag filters will be ignored) - any other areaTag or confTag filters will be ignored
- if NOT present, private areas are skipped
*=NYI *=NYI
*/ */
@ -301,14 +302,21 @@ module.exports = class Message {
WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${filter.privateTagUserId} WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${filter.privateTagUserId}
)`); )`);
} else { } else {
if(filter.areaTag && filter.areaTag.length > 0) { if(filter.areaTag && filter.areaTag.length > 0) {
if(Array.isArray(filter.areaTag)) { if(Array.isArray(filter.areaTag)) {
const areaList = filter.areaTag.map(t => `"${t}"`).join(', '); const areaList = filter.areaTag
appendWhereClause(`m.area_tag IN(${areaList})`); .filter(t => t != Message.WellKnownAreaTags.Private)
} else if(_.isString(filter.areaTag)) { .map(t => `"${t}"`).join(', ');
if(areaList.length > 0) {
appendWhereClause(`m.area_tag IN(${areaList})`);
}
} else if(_.isString(filter.areaTag) && Message.WellKnownAreaTags.Private !== filter.areaTag) {
appendWhereClause(`m.area_tag = "${filter.areaTag}"`); appendWhereClause(`m.area_tag = "${filter.areaTag}"`);
} }
} }
// explicit exclude of Private
appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`);
} }
if(_.isNumber(filter.replyToMessageId)) { if(_.isNumber(filter.replyToMessageId)) {