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

Properly filter out private mail by user ID

This commit is contained in:
Bryan Ashby 2016-07-25 01:00:35 -06:00
parent c3ae30a8aa
commit 820e150708
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/message_area.js
View File

@ -372,7 +372,7 @@ function getNewMessageDataInAreaForUserSql(userId, areaTag, lastMessageId, what)
FROM message
WHERE area_tag = "${areaTag}" AND message_id > ${lastMessageId}`;
if(Message.WellKnownAreaTags.Private === areaTag) {
if(Message.isPrivateAreaTag(areaTag)) {
sql +=
` AND message_id in (
SELECT message_id
@ -426,21 +426,6 @@ function getNewMessagesInAreaForUser(userId, areaTag, cb) {
});
},
function getMessages(lastMessageId, callback) {
/*
let sql =
`SELECT message_id, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, modified_timestamp, view_count
FROM message
WHERE area_tag = "${areaTag}" AND message_id > ${lastMessageId}`;
if(Message.WellKnownAreaTags.Private === areaTag) {
sql +=
` AND message_id in (
SELECT message_id from message_meta where meta_category ="System"
AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${userId})`;
}
sql += ' ORDER BY message_id;';
*/
const sql = getNewMessageDataInAreaForUserSql(userId, areaTag, lastMessageId, 'messages');
msgDb.each(sql, function msgRow(err, row) {
@ -480,11 +465,24 @@ function getMessageListForArea(options, areaTag, cb) {
async.series(
[
function fetchMessages(callback) {
msgDb.each(
let sql =
`SELECT message_id, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, modified_timestamp, view_count
FROM message
WHERE area_tag = ?
ORDER BY message_id;`,
WHERE area_tag = ?`;
if(Message.isPrivateAreaTag(areaTag)) {
sql +=
` AND message_id IN (
SELECT message_id
FROM message_meta
WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${options.client.user.userId}
)`;
}
sql += ' ORDER BY message_id;';
msgDb.each(
sql,
[ areaTag.toLowerCase() ],
(err, row) => {
if(!err) {