From 52dee0a4010793b8b0c442141e8cab4160cf00a7 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Oct 2015 21:39:54 -0600
Subject: [PATCH] * Filter Private from area lists/etc. * Clean up CPU string
 for MCI display

---
 core/message_area.js                         |  21 +++++++++++++++++--
 core/predefined_mci.js                       |   7 ++++++-
 mods/msg_area_list.js                        |   2 ++
 mods/themes/luciano_blocktronics/IDLELOG.ANS | Bin 0 -> 421 bytes
 mods/themes/luciano_blocktronics/SYSSTAT.ANS | Bin 2759 -> 2885 bytes
 5 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 mods/themes/luciano_blocktronics/IDLELOG.ANS

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 0000000000000000000000000000000000000000..062f99a1f3a072df2bb58813baeebb36664aea31
GIT binary patch
literal 421
zcmb_XJ&OV{5Z!Hst?W!Qf?&5y+|@0%Qjx<#I5_T_REkjqV?b2!w{E!n6<@OFfpFy|
zFl1ileT-0Cms}T>$vUrBC|S&fD%cQeWn2TKF7a?em24bfHbPZlXkza6I=pGxXnmr?
z_NZxR&$L^g>0&J%?P(v_5X<vC>$J?MA0z|rTNCd*d?4TaIR$Iv1!0632mp2r5B3il
zWzasOJxv1<F*kP&mg&E$hZPZ_ao;|C$T4<`L{9*EAJfnIf|>sBj988(%W9A&Nt(VV
RSrSioIa|@!+qCU|>jTT5WH|r;

literal 0
HcmV?d00001

diff --git a/mods/themes/luciano_blocktronics/SYSSTAT.ANS b/mods/themes/luciano_blocktronics/SYSSTAT.ANS
index 1dfa0026e6fd73f9cb2ad0636e463f920ffff08f..2f3b70443e9566824def202ca92650c73f7614b9 100644
GIT binary patch
delta 749
zcmZWmJxc>Y5an`7?gNub#Sq0c5*0MCcN-HmM3f-d+1N#kpoJ)Bkxu;h3lgTV5D~Ps
zNui~c;*Yq6v$VIdbU)@2PMf=ZGxO%Xefu%?KF*45+Njb7s|Uq4qb>3A1J1=y7M2ks
zT-C5QJwKw_b;R4Hj>109M}PU8M1+t?e7HEq-I}IHoJTpA5ESt}UG676^j^1eT7>C7
z6pVeWpe&pjClxj0`Fdt>5tJI>nDK3NYl;zjAw1`zu!lxMWu8Y#KX939J5*$(v>-~I
z&Po&~Cax>)I@sl-AviR<`C(RGgZaSC>nTZH!8rbtF48x)oRB7=khwR-26)LVYJHgp
zd}Xdw^)Oq}Rr!=~mpx7khjkdWX7b9cd_tj0187>irGyh2^rf^MV{)e+d$u+dlSy%1
z`mubIc`aDCo0FaH!I5}5)mRe;8kBc7Jt|hv7ChQbIJYO%u<b0tC!Y75@|+Axu~1Y7
rhLw<rx2J)`;5o$<qwwS`RO5^^i-g*2f){H0wV~InduzPGgIoRu<)_pn

delta 609
zcmZuuyGjF55GA{2Uok#FlSm3TVlbk`?!Cz-aR~_52<cO~L=e<MiAAsx!OC936c!fR
z<OA{tHlm%qUf9aQ#!nDuHV*=(87?zt&N*}LOX_ubH5)j7(eb&{&Ia5OSXf)iY)}$d
zs-nv`l(Oiat~Fhsdx&uvVi3>h%|$qXN;|Y|JH#UKi9HV|GE7>wjj;clRnaGj?sq*k
zW$L;D{8&q6B>}zI`8;ZpB`>Pjt0|of3fMAfA-gL+BXt=PC44D?J~Rmp^&(vw`IYDp
z?a>Zn0zTA^h5|?c2Qznzl@Sb04***HUh|?Z^x}`u&^C2En2v{Q?FN3et=T9wmr}zf
z)6bG55k*Mhz>}Uc29T<NcfGkzbiCZ2L`4oL{yyn)E}(Ags@xL*23s0W(Nd9Qa2MW;
z8XTIL1x${9ja5g3oLMUzA6=eAkt1{my*TasUb8gpOoFe>ZJ4vBusoZ2b4ZPG{+Q_m
iModI>7!<66QW4OyR?_2kk?tC<;H9_LLu?=HME(zis;OxJ