diff --git a/core/message_area.js b/core/message_area.js index 2653291c..9a460c67 100644 --- a/core/message_area.js +++ b/core/message_area.js @@ -16,21 +16,38 @@ exports.changeMessageArea = changeMessageArea; exports.getMessageListForArea = getMessageListForArea; exports.gotoMsgAreaFSEModuleForMessage = gotoMsgAreaFSEModuleForMessage; -function getAvailableMessageAreas() { +function getAvailableMessageAreas(options) { // example: [ { "name" : "local_music", "desc" : "Music Discussion", "groups" : ["somegroup"] }, ... ] - return Config.messages.areas; + options = options || {}; + + var areas = Config.messages.areas; + var avail = []; + for(var i = 0; i < areas.length; ++i) { + if(true !== options.includePrivate && + Message.WellKnownAreaNames.Private === areas[i].name) + { + continue; + } + + avail.push(areas[i]); + } + + return avail; } function getDefaultMessageArea() { // // Return first non-private/etc. area name. This will be from config.hjson // + return getAvailableMessageAreas()[0]; + /* var avail = getAvailableMessageAreas(); for(var i = 0; i < avail.length; ++i) { if(Message.WellKnownAreaNames.Private !== avail[i].name) { return avail[i]; } } + */ } function getMessageAreaByName(areaName) { diff --git a/core/predefined_mci.js b/core/predefined_mci.js index 65d688ff..862dc278 100644 --- a/core/predefined_mci.js +++ b/core/predefined_mci.js @@ -91,7 +91,12 @@ function getPredefinedMCIValue(client, code) { }, OA : function systemArchitecture() { return os.arch(); }, - SC : function systemCpuModel() { return os.cpus()[0].model; }, + SC : function systemCpuModel() { + // + // Clean up CPU strings a bit for better display + // + return os.cpus()[0].model.replace(/\s+(?= )|\(R\)|\(TM\)|CPU/g, ''); + }, // :TODO: cpu load average (over N seconds): http://stackoverflow.com/questions/9565912/convert-the-output-of-os-cpus-in-node-js-to-percentage diff --git a/mods/msg_area_list.js b/mods/msg_area_list.js index 6a119e74..d9afe19d 100644 --- a/mods/msg_area_list.js +++ b/mods/msg_area_list.js @@ -104,6 +104,8 @@ MessageAreaListModule.prototype.mciReady = function(mciData, cb) { var areaListItems = []; var focusListItems = []; + + // :TODO: use _.map() here for(var i = 0; i < self.messageAreas.length; ++i) { areaListItems.push(listFormat.format( { index : i, name : self.messageAreas[i].name, desc : self.messageAreas[i].desc } ) diff --git a/mods/themes/luciano_blocktronics/IDLELOG.ANS b/mods/themes/luciano_blocktronics/IDLELOG.ANS new file mode 100644 index 00000000..062f99a1 Binary files /dev/null and b/mods/themes/luciano_blocktronics/IDLELOG.ANS differ diff --git a/mods/themes/luciano_blocktronics/SYSSTAT.ANS b/mods/themes/luciano_blocktronics/SYSSTAT.ANS index 1dfa0026..2f3b7044 100644 Binary files a/mods/themes/luciano_blocktronics/SYSSTAT.ANS and b/mods/themes/luciano_blocktronics/SYSSTAT.ANS differ