Major commit for new message network WIP

mods/abracadabra.js

@@ -177,12 +177,6 @@ function AbracadabraModule(options) {
 
 require('util').inherits(AbracadabraModule, MenuModule);
 
-/*
-AbracadabraModule.prototype.enter = function(client) {
-	AbracadabraModule.super_.prototype.enter.call(this, client);
-};
-*/
-
 AbracadabraModule.prototype.leave = function() {
 	AbracadabraModule.super_.prototype.leave.call(this);
 

mods/menu.hjson

@@ -393,7 +393,7 @@
 				},
 				editorMode: edit
 				editorType: email
-				messageAreaName: private_mail
+				messageAreaTag: private_mail
 				toUserId: 1 /* always to +op */
 			}
 			form: {
@@ -806,7 +806,7 @@
 				},
 				editorMode: edit
 				editorType: email
-				messageAreaName: private_mail
+				messageAreaTag: private_mail
 				toUserId: 1 /* always to +op */
 			}
 			form: {
@@ -1019,6 +1019,10 @@
 					value: { command: "P" }
 					action: @menu:messageAreaNewPost
 				}
+				{
+					value: { command: "J" }
+					action: @menu:messageAreaChangeCurrentConference
+				}
 				{
 					value: { command: "C" }
 					action: @menu:messageAreaChangeCurrentArea
@@ -1041,7 +1045,39 @@
 				}				
 			]
 		}
+
+		messageAreaChangeCurrentConference: {
+			art: CCHANGE
+			module: msg_conf_list
+			form: {
+				0: {
+					mci: {
+						VM1: {
+							focus: true
+							submit: true
+							argName: conf
+						}
+					}
+					submit: {
+						*: [
+							{
+								value: { conf: null }
+								action: @method:changeConference
+							}
+						]
+					}
+					actionKeys: [
+						{
+							keys: [ "escape", "q", "shift + q" ]
+							action: @systemMethod:prevMenu
+						}
+					]
+				}
+			}
+		}
+
 		messageAreaChangeCurrentArea: {
+			//	:TODO: rename this art to ACHANGE
 			art: CHANGE
 			module: msg_area_list
 			form: {
@@ -1070,6 +1106,7 @@
 				}
 			}
 		}
+
 		messageAreaMessageList: {
 			module: msg_list
 			art: MSGLIST

mods/msg_area_list.js

@@ -5,7 +5,6 @@ var MenuModule			= require('../core/menu_module.js').MenuModule;
 var ViewController		= require('../core/view_controller.js').ViewController;
 var messageArea			= require('../core/message_area.js');
 var strUtil				= require('../core/string_util.js');
-//var msgDb				= require('./database.js').dbs.message;
 
 var async				= require('async');
 var assert				= require('assert');
@@ -43,30 +42,33 @@ function MessageAreaListModule(options) {
 
 	var self = this;
 
-	this.messageAreas = messageArea.getAvailableMessageAreas();
+    this.messageAreas = messageArea.getSortedAvailMessageAreasByConfTag(
+         self.client.user.properties.message_conf_tag,
+        { client : self.client }
+    );
 
 	this.menuMethods = {
 		changeArea : function(formData, extraArgs) {
 			if(1 === formData.submitId) {
-				var areaName = self.messageAreas[formData.value.area].name;
+				const areaTag = self.messageAreas[formData.value.area].areaTag;
 
-			messageArea.changeMessageArea(self.client, areaName, function areaChanged(err) {
-					if(err) {
-						self.client.term.pipeWrite('\n|00Cannot change area: ' + err.message + '\n');
+                messageArea.changeMessageArea(self.client, areaTag, function areaChanged(err) {
+                    if(err) {
+                        self.client.term.pipeWrite('\n|00Cannot change area: ' + err.message + '\n');
 
-						setTimeout(function timeout() {
-							self.prevMenu();
-						}, 1000);
-					} else {
-						self.prevMenu();
-					}
-				});
+                        setTimeout(function timeout() {
+                            self.prevMenu();
+                        }, 1000);
+                    } else {
+                        self.prevMenu();
+                    }
+                });
 			}
 		}
 	};
 
 	this.setViewText = function(id, text) {
-		var v = self.viewControllers.areaList.getView(id);
+		const v = self.viewControllers.areaList.getView(id);
 		if(v) {
 			v.setText(text);
 		}
@@ -78,7 +80,7 @@ require('util').inherits(MessageAreaListModule, MenuModule);
 
 MessageAreaListModule.prototype.mciReady = function(mciData, cb) {
 	var self	= this;
-	var vc		= self.viewControllers.areaList = new ViewController( { client : self.client } );
+	const vc	= self.viewControllers.areaList = new ViewController( { client : self.client } );
 
 	async.series(
 		[
@@ -99,26 +101,29 @@ MessageAreaListModule.prototype.mciReady = function(mciData, cb) {
 				});
 			},
 			function populateAreaListView(callback) {
-				var listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {desc}';
-				var focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
-
-				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	} )
-					);
-					focusListItems.push(focusListFormat.format(
-						{ index : i, name : self.messageAreas[i].name, desc : self.messageAreas[i].desc	} )
-					);
-				}
-
-				var areaListView = vc.getView(1);
-				
-				areaListView.setItems(areaListItems);
-				areaListView.setFocusItems(focusListItems);
+				const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
+				const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
+                
+                const areaListView = vc.getView(1);
+                let i = 1;
+                areaListView.setItems(_.map(self.messageAreas, v => {
+                    return listFormat.format({
+                        index   : i++,
+                        areaTag : v.area.areaTag,
+                        name    : v.area.name,
+                        desc    : v.area.desc, 
+                    });
+                }));
+                
+                i = 1;
+                areaListView.setFocusItems(_.map(self.messageAreas, v => {
+                    return focusListFormat.format({
+                        index   : i++,
+                        areaTag : v.area.areaTag,
+                        name    : v.area.name,
+                        desc    : v.area.desc, 
+                    })
+                }));
 
 				areaListView.redraw();
 

mods/msg_area_post_fse.js

@@ -56,11 +56,11 @@ function AreaPostFSEModule(options) {
 
 require('util').inherits(AreaPostFSEModule, FullScreenEditorModule);
 
-AreaPostFSEModule.prototype.enter = function(client) {	
+AreaPostFSEModule.prototype.enter = function() {	
 
-	if(_.isString(client.user.properties.message_area_name) && !_.isString(this.messageAreaName)) {
-		this.messageAreaName = client.user.properties.message_area_name;
+	if(_.isString(this.client.user.properties.message_area_tag) && !_.isString(this.messageAreaTag)) {
+		this.messageAreaTag = this.client.user.properties.message_area_tag;
 	}
 	
-	AreaPostFSEModule.super_.prototype.enter.call(this, client);
+	AreaPostFSEModule.super_.prototype.enter.call(this);
 };

mods/msg_area_view_fse.js

@@ -72,7 +72,7 @@ function AreaViewFSEModule(options) {
 		if(_.isString(extraArgs.menu)) {
 			var modOpts = {
 				extraArgs : {
-					messageAreaName		: self.messageAreaName,
+					messageAreaTag		: self.messageAreaTag,
 					replyToMessage		: self.message,	
 				}				
 			};

mods/msg_conf_list.js

@@ -0,0 +1,122 @@
+/* jslint node: true */
+'use strict';
+
+var MenuModule			= require('../core/menu_module.js').MenuModule;
+var ViewController		= require('../core/view_controller.js').ViewController;
+var messageArea			= require('../core/message_area.js');
+
+var async				= require('async');
+var assert				= require('assert');
+var _					= require('lodash');
+
+exports.getModule		= MessageConfListModule;
+
+exports.moduleInfo = {
+	name	: 'Message Conference List',
+	desc	: 'Module for listing / choosing message conferences',
+	author	: 'NuSkooler',
+};
+
+var MciCodesIds = {
+	ConfList	: 1,
+	CurrentConf	: 2,
+	
+	//	:TODO:
+	//	# areas in con
+	//	
+};
+
+function MessageConfListModule(options) {
+	MenuModule.call(this, options);
+
+	var self = this;
+
+	this.messageConfs = messageArea.getSortedAvailMessageConferences(self.client);
+
+	this.menuMethods = {
+		changeConference : function(formData, extraArgs) {
+			if(1 === formData.submitId) {
+				const confTag = self.messageConfs[formData.value.conf].confTag;
+
+				messageArea.changeMessageConference(self.client, confTag, err => {
+					if(err) {						
+						self.client.term.pipeWrite(`\n|00Cannot change conference: ${err.message}\n`);
+
+						setTimeout(function timeout() {
+                            self.prevMenu();
+                        }, 1000);
+					} else {
+						self.prevMenu();
+					}
+				});
+			}
+		}
+	};
+
+	this.setViewText = function(id, text) {
+		const v = self.viewControllers.areaList.getView(id);
+		if(v) {
+			v.setText(text);
+		}
+	};
+}
+
+require('util').inherits(MessageConfListModule, MenuModule);
+
+MessageConfListModule.prototype.mciReady = function(mciData, cb) {
+	var self	= this;
+	const vc	= self.viewControllers.areaList = new ViewController( { client : self.client } );
+
+	async.series(
+		[
+			function callParentMciReady(callback) {
+				MessageConfListModule.super_.prototype.mciReady.call(this, mciData, callback);
+			},
+			function loadFromConfig(callback) {
+				let loadOpts = {
+					callingMenu	: self,
+					mciMap		: mciData.menu,
+					formId		: 0,
+				};
+
+				vc.loadFromMenuConfig(loadOpts, callback);
+			},
+			function populateConfListView(callback) {
+				const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
+				const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
+                
+                const confListView = vc.getView(1);
+                let i = 1;
+                confListView.setItems(_.map(self.messageConfs, v => {
+                    return listFormat.format({
+                        index   : i++,
+                        confTag : v.conf.confTag,
+                        name    : v.conf.name,
+                        desc    : v.conf.desc, 
+                    });
+                }));
+                
+                i = 1;
+                confListView.setFocusItems(_.map(self.messageConfs, v => {
+                    return focusListFormat.format({
+                        index   : i++,
+                        confTag : v.conf.confTag,
+                        name    : v.conf.name,
+                        desc    : v.conf.desc, 
+                    })
+                }));
+
+				confListView.redraw();
+
+				callback(null);
+			},
+			function populateTextViews(callback) {
+				//	:TODO: populate other avail MCI, e.g. current conf name
+				callback(null);
+			}
+		],
+		function complete(err) {
+			cb(err);
+		}
+	);
+};

mods/msg_list.js

@@ -52,15 +52,15 @@ function MessageListModule(options) {
 	var self	= this;
 	var config	= this.menuConfig.config;
 
-	this.messageAreaName = config.messageAreaName;
+	this.messageAreaTag = config.messageAreaTag;
 
 	if(options.extraArgs) {
 		//
-		//	|extraArgs| can override |messageAreaName| provided by config
+		//	|extraArgs| can override |messageAreaTag| provided by config
 		//	as well as supply a pre-defined message list
 		//
-		if(options.extraArgs.messageAreaName) {
-			this.messageAreaName = options.extraArgs.messageAreaName;
+		if(options.extraArgs.messageAreaTag) {
+			this.messageAreaTag = options.extraArgs.messageAreaTag;
 		}
 
 		if(options.extraArgs.messageList) {
@@ -73,7 +73,7 @@ function MessageListModule(options) {
 			if(1 === formData.submitId) {
 				var modOpts = {
 					extraArgs 	: {
-						messageAreaName		: self.messageAreaName,
+						messageAreaTag		: self.messageAreaTag,
 						messageList			: self.messageList,
 						messageIndex		: formData.value.message,
 					}
@@ -94,15 +94,15 @@ function MessageListModule(options) {
 
 require('util').inherits(MessageListModule, MenuModule);
 
-MessageListModule.prototype.enter = function(client) {
-	MessageListModule.super_.prototype.enter.call(this, client);
+MessageListModule.prototype.enter = function() {
+	MessageListModule.super_.prototype.enter.call(this);
 
 	//
-	//	Config can specify |messageAreaName| else it comes from
+	//	Config can specify |messageAreaTag| else it comes from
 	//	the user's current area
 	//
-	if(!this.messageAreaName) {
-		this.messageAreaName = client.user.properties.message_area_name;
+	if(!this.messageAreaTag) {
+		this.messageAreaTag = this.client.user.properties.message_area_tag;
 	}
 };
 
@@ -110,6 +110,8 @@ MessageListModule.prototype.mciReady = function(mciData, cb) {
 	var self	= this;
 	var vc		= self.viewControllers.allViews = new ViewController( { client : self.client } );
 
+	var firstNewEntryIndex;
+
 	async.series(
 		[
 			function callParentMciReady(callback) {
@@ -130,7 +132,7 @@ MessageListModule.prototype.mciReady = function(mciData, cb) {
 				if(_.isArray(self.messageList)) {
 					callback(0 === self.messageList.length ? new Error('No messages in area') : null);
 				} else {
-					messageArea.getMessageListForArea( { client : self.client }, self.messageAreaName, function msgs(err, msgList) {
+					messageArea.getMessageListForArea( { client : self.client }, self.messageAreaTag, function msgs(err, msgList) {
 						if(msgList && 0 === msgList.length) {
 							callback(new Error('No messages in area'));
 						} else {
@@ -141,7 +143,7 @@ MessageListModule.prototype.mciReady = function(mciData, cb) {
 				}
 			},
 			function getLastReadMesageId(callback) {
-				messageArea.getMessageAreaLastReadId(self.client.user.userId, self.messageAreaName, function lastRead(err, lastReadId) {
+				messageArea.getMessageAreaLastReadId(self.client.user.userId, self.messageAreaTag, function lastRead(err, lastReadId) {
 					self.lastReadId = lastReadId || 0;
 					callback(null);	//	ignore any errors, e.g. missing value
 				});
@@ -158,6 +160,13 @@ MessageListModule.prototype.mciReady = function(mciData, cb) {
 				var msgNum = 1;
 
 				function getMsgFmtObj(mle) {
+
+					if(_.isUndefined(firstNewEntryIndex) &&
+						mle.messageId > self.lastReadId)
+					{
+						firstNewEntryIndex = msgNum - 1;
+					}
+
 					return {
 						msgNum			: msgNum++, 
 						subj			: mle.subject,
@@ -180,14 +189,18 @@ MessageListModule.prototype.mciReady = function(mciData, cb) {
 				msgListView.on('index update', function indexUpdated(idx) {
 					self.setViewText(MciCodesIds.MsgSelNum, (idx + 1).toString());
 				});
-
+				
 				msgListView.redraw();
+				
+				if(firstNewEntryIndex > 0) {
+					msgListView.setFocusItemIndex(firstNewEntryIndex);
+				}
 
 				callback(null);
 			},
 			function populateOtherMciViews(callback) {
 
-				self.setViewText(MciCodesIds.MsgAreaDesc, messageArea.getMessageAreaByName(self.messageAreaName).desc);
+				self.setViewText(MciCodesIds.MsgAreaDesc, messageArea.getMessageAreaByTag(self.messageAreaTag).name);
 				self.setViewText(MciCodesIds.MsgSelNum, (vc.getView(MciCodesIds.MsgList).getData() + 1).toString());
 				self.setViewText(MciCodesIds.MsgTotal, self.messageList.length.toString());
 

mods/nua.js

@@ -5,7 +5,7 @@ var user					= require('../core/user.js');
 var theme					= require('../core/theme.js');
 var login					= require('../core/system_menu_method.js').login;
 var Config					= require('../core/config.js').config;
-var getDefaultMessageArea	= require('../core/message_area.js').getDefaultMessageArea;
+var messageArea             = require('../core/message_area.js');
 
 var async					= require('async');
 
@@ -65,6 +65,16 @@ function NewUserAppModule(options) {
 
 			newUser.username = formData.value.username;
 
+			//
+			//	We have to disable ACS checks for initial default areas as the user is not yet ready
+			//            
+            var confTag     = messageArea.getDefaultMessageConferenceTag(self.client, true);				//	true=disableAcsCheck
+            var areaTag     = messageArea.getDefaultMessageAreaTagByConfTag(self.client, confTag, true);	//	true=disableAcsCheck
+            
+            //  can't store undefined!
+            confTag = confTag || '';
+            areaTag = areaTag || '';
+			
 			newUser.properties = {
 				real_name			: formData.value.realName,
 				birthdate			: new Date(Date.parse(formData.value.birthdate)).toISOString(),
@@ -74,14 +84,12 @@ function NewUserAppModule(options) {
 				email_address		: formData.value.email,
 				web_address			: formData.value.web,
 				account_created		: new Date().toISOString(),
-
-				message_area_name	: getDefaultMessageArea().name,
+                
+                message_conf_tag    : confTag,
+                message_area_tag    : areaTag,
 
 				term_height			: self.client.term.termHeight,
-				term_width			: self.client.term.termWidth,
-				
-				//	:TODO: This is set in User.create() -- proabbly don't need it here:
-				//account_status	: Config.users.requireActivation ? user.User.AccountStatus.inactive : user.User.AccountStatus.active,
+				term_width			: self.client.term.termWidth,				
 
 				//	:TODO: Other defaults
 				//	:TODO: should probably have a place to create defaults/etc.
@@ -92,8 +100,8 @@ function NewUserAppModule(options) {
 			} else {
 				newUser.properties.theme_id = Config.defaults.theme;
 			}
-
-			//	:TODO: .create() should also validate email uniqueness!
+			
+			//	:TODO: User.create() should validate email uniqueness!
 			newUser.create( { password : formData.value.password }, function created(err) {
 				if(err) {
 					self.client.log.info( { error : err, username : formData.value.username }, 'New user creation failed');

mods/themes/luciano_blocktronics/theme.hjson

@@ -172,8 +172,8 @@
 
 			messageAreaChangeCurrentArea: {
 				config: {
-					listFormat: "|00|15{index} |07- |03{desc}"
-					focusListFormat: "|00|19|15{index} - {desc}"
+					listFormat: "|00|15{index} |07- |03{name}"
+					focusListFormat: "|00|19|15{index} - {name}"
 				}
 				mci: {
 					VM1: {
@@ -310,6 +310,19 @@
 					}
 				}
 			}
+
+			newScanMessageList: {
+				config: {
+					listFormat: "|00|15  {msgNum:<5.5}|03{subj:<29.29} |15{from:<20.20} {ts}"
+					focusListFormat: "|00|19> |15{msgNum:<5.5}{subj:<29.29} {from:<20.20} {ts}"
+					dateTimeFormat: ddd MMM Do
+				}
+				mci: {
+					VM1: {
+						height: 14
+					}
+				}
+			}
 		}
 	}
 }

mods/user_list.js

@@ -2,7 +2,7 @@
 'use strict';
 
 var MenuModule			= require('../core/menu_module.js').MenuModule;
-var userDb				= require('../core/database.js').dbs.user;
+//var userDb				= require('../core/database.js').dbs.user;
 var getUserList			= require('../core/user.js').getUserList;
 var ViewController		= require('../core/view_controller.js').ViewController;
 

mods/whos_online.js

@@ -84,7 +84,6 @@ WhosOnlineModule.prototype.mciReady = function(mciData, cb) {
 					return listFormat.format(oe);
 				}));
 
-				//	:TODO: This is a hack until pipe codes are better implemented
 				onlineListView.focusItems = onlineListView.items;
 
 				onlineListView.redraw();