Merge branch 'master' into bugfix/scrolling_updates

core/door.js

@@ -57,8 +57,10 @@ module.exports = class Door {
     run(exeInfo, cb) {
         this.encoding = (exeInfo.encoding || 'cp437').toLowerCase();
 
-        if ('socket' === this.io && !this.sockServer) {
+        if ('socket' === this.io) {
+            if(!this.sockServer) {
                 return cb(Errors.UnexpectedState('Socket server is not running'));
+            }
         } else if ('stdio' !== this.io) {
             return cb(Errors.Invalid(`"${this.io}" is not a valid io type!`));
         }

core/fse.js

@@ -183,6 +183,13 @@ exports.FullScreenEditorModule =
                     return cb(null);
                 },
                 editModeEscPressed: function (formData, extraArgs, cb) {
+                    const errMsgView = self.viewControllers.header.getView(
+                        MciViewIds.header.errorMsg
+                    );
+                    if (errMsgView) {
+                        errMsgView.clearText();
+                    }
+
                     self.footerMode =
                         'editor' === self.footerMode ? 'editorMenu' : 'editor';
 

core/message.js

@@ -763,6 +763,11 @@ module.exports = class Message {
     }
 
     persist(cb) {
+        const containsNonWhitespaceCharacterRegEx = /\S/;
+        if (!containsNonWhitespaceCharacterRegEx.test(this.message)) {
+            return cb(Errors.Invalid('Empty message'));
+        }
+
         if (!this.isValid()) {
             return cb(Errors.Invalid('Cannot persist invalid message!'));
         }

core/msg_area_post_fse.js

@@ -14,6 +14,39 @@ exports.moduleInfo = {
     author: 'NuSkooler',
 };
 
+const MciViewIds = {
+    header: {
+        from: 1,
+        to: 2,
+        subject: 3,
+        errorMsg: 4,
+        modTimestamp: 5,
+        msgNum: 6,
+        msgTotal: 7,
+
+        customRangeStart: 10, //  10+ = customs
+    },
+
+    body: {
+        message: 1,
+    },
+
+    //  :TODO: quote builder MCIs - remove all magic #'s
+
+    //  :TODO: consolidate all footer MCI's - remove all magic #'s
+    ViewModeFooter: {
+        MsgNum: 6,
+        MsgTotal: 7,
+        //  :TODO: Just use custom ranges
+    },
+
+    quoteBuilder: {
+        quotedMsg: 1,
+        //  2 NYI
+        quoteLines: 3,
+    },
+};
+
 exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
     constructor(options) {
         super(options);
@@ -42,8 +75,15 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
                 ],
                 function complete(err) {
                     if (err) {
-                        //  :TODO:... sooooo now what?
-                    } else {
+                        const errMsgView = self.viewControllers.header.getView(
+                            MciViewIds.header.errorMsg
+                        );
+                        if (errMsgView) {
+                            errMsgView.setText(err.message);
+                        }
+                        return cb(err);
+                    }
+
                     //  note: not logging 'from' here as it's part of client.log.xxxx()
                     self.client.log.info(
                         {
@@ -53,7 +93,6 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
                         },
                         `User "${self.client.user.username}" posted message to "${msg.toUserName}" (${msg.areaTag})`
                     );
-                    }
 
                     return self.nextMenu(cb);
                 }