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

Fix Message.findMessages() if private tag passed in, fix QWK export

This commit is contained in:
Bryan Ashby 2020-05-11 21:54:20 -06:00
parent 72b6c5ded3
commit fbec46d1b9
No known key found for this signature in database
GPG Key ID: B49EB437951D2542
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/message.js
View File

@ -288,7 +288,7 @@ module.exports = class Message {
filter.extraFields = []
filter.privateTagUserId = <userId> - if set, only private messages belonging to <userId> are processed
- any other areaTag or confTag filters will be ignored
- areaTags filter ignored
- if NOT present, private areas are skipped
*=NYI
@ -364,20 +364,23 @@ module.exports = class Message {
)`);
} else {
if(filter.areaTag && filter.areaTag.length > 0) {
if(Array.isArray(filter.areaTag)) {
const areaList = filter.areaTag
.filter(t => t != Message.WellKnownAreaTags.Private)
.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}"`);
if (!Array.isArray(filter.areaTag)) {
filter.areaTag = [ filter.areaTag ];
}
}
// explicit exclude of Private
appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`, 'AND');
const areaList = filter.areaTag
.filter(t => t !== Message.WellKnownAreaTags.Private)
.map(t => `"${t}"`).join(', ');
if(areaList.length > 0) {
appendWhereClause(`m.area_tag IN(${areaList})`);
} else {
// nothing to do; no areas remain
return cb(null, []);
}
} else {
// explicit exclude of Private
appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`, 'AND');
}
}
if(_.isNumber(filter.replyToMessageId)) {

5
core/message_base_qwk_export.js
View File

@ -270,7 +270,10 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
},
(callback) => {
// For each public area -> for each message
const userExportAreas = this._getUserQWKExportAreas();
const userExportAreas = this._getUserQWKExportAreas()
.filter(exportArea => {
return exportArea.areaTag !== Message.WellKnownAreaTags.Private;
});
async.eachSeries(userExportAreas, (exportArea, nextExportArea) => {
const area = getMessageAreaByTag(exportArea.areaTag);
if (!area) {