From 140990811a5ad6f5374e751ef4ca155c4c5396be Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Wed, 26 Aug 2015 23:25:49 -0600 Subject: [PATCH] * Start some work on message list fetching --- core/message_area.js | 60 +++++++++++++++++++++++++++++++++----------- mods/msg_list.js | 3 +++ 2 files changed, 48 insertions(+), 15 deletions(-) diff --git a/core/message_area.js b/core/message_area.js index 55a4b904..89069ca6 100644 --- a/core/message_area.js +++ b/core/message_area.js @@ -34,22 +34,8 @@ function changeMessageArea(client, areaName, cb) { async.waterfall( [ function getArea(callback) { - /* - var availAreas = getAvailableMessageAreas(); - - areaName = areaName.toLowerCase(); // always lookup lowercase - var index = _.findIndex(availAreas, function pred(a) { - return a.name === areaName; - }); - - if(index > -1) { - callback(null, availAreas[index]); - } else { - callback(new Error('Invalid message area')); - } - */ - var area = getMessageAreaByName(areaName); + if(area) { callback(null, area); } else { @@ -77,3 +63,47 @@ function changeMessageArea(client, areaName, cb) { } ); } + +function getMessageListForArea(options, areaName, cb) { + // + // options.client (required) + // + + assert(_.isObject(options.client)); + + /* + [ + { + messageId, messageUuid, replyToId, toUserName, fromUserName, subject, modTimestamp, + status(new|old), + viewCount + } + ] + */ + + var msgList = []; + + async.series( + [ + function fetchMessages(callback) { + msgDb.each( + 'SELECT message_id, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, modified_timestamp, view_count ' + 'FROM message ' + 'WHERE area_name=? ' + 'ORDER BY message_id;', + [ areaName.toLowerCase() ], + function msgRow(err, row) { + if(!err) { + msgList.push( { + id : row.message_id, + uuid : row.message_uuid, + replyToId : row.reply_to_message_id, + } ); + } + }, + callback + ); + } + ] + ); +} diff --git a/mods/msg_list.js b/mods/msg_list.js index 1062ec40..6a90083d 100644 --- a/mods/msg_list.js +++ b/mods/msg_list.js @@ -64,6 +64,9 @@ MessageListModule.prototype.mciReady = function(mciData, cb) { }; vc.loadFromMenuConfig(loadOpts, callback); + }, + function fetchMessagesInArea(callback) { + } ], function complete(err) {