Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs

This commit is contained in:
Bryan Ashby
2016-06-20 14:44:06 -06:00
16 changed files with 589 additions and 214 deletions

View File

@@ -165,7 +165,7 @@ function AbracadabraModule(options) {
const doorInstance = new door.Door(self.client, exeInfo);
doorInstance.on('finished', () => {
doorInstance.once('finished', () => {
self.prevMenu();
});

View File

@@ -1,18 +1,16 @@
/* jslint node: true */
'use strict';
var MenuModule = require('../core/menu_module.js').MenuModule;
var Log = require('../core/logger.js').log;
var resetScreen = require('../core/ansi_term.js').resetScreen;
const MenuModule = require('../core/menu_module.js').MenuModule;
const resetScreen = require('../core/ansi_term.js').resetScreen;
var async = require('async');
var _ = require('lodash');
var http = require('http');
var net = require('net');
var crypto = require('crypto');
var buffers = require('buffers');
const async = require('async');
const _ = require('lodash');
const http = require('http');
const net = require('net');
const crypto = require('crypto');
var packageJson = require('../package.json');
const packageJson = require('../package.json');
/*
Expected configuration block:

View File

@@ -939,6 +939,10 @@
value: { command: "DL" }
action: @menu:doorDarkLands
}
{
value: { command: "DP" }
action: @menu:doorParty
}
]
}
@@ -1006,6 +1010,16 @@
door: tw
}
}
doorParty: {
desc: Using DoorParty!
module: @systemModule:door_party
config: {
username: XXXXXXXX
password: XXXXXXXX
bbsTag: XX
}
}
///////////////////////////////////////////////////////////////////////
// Message Area Menu
///////////////////////////////////////////////////////////////////////

View File

@@ -133,7 +133,7 @@ MessageListModule.prototype.mciReady = function(mciData, cb) {
callback(0 === self.messageList.length ? new Error('No messages in area') : null);
} else {
messageArea.getMessageListForArea( { client : self.client }, self.messageAreaTag, function msgs(err, msgList) {
if(msgList && 0 === msgList.length) {
if(!msgList || 0 === msgList.length) {
callback(new Error('No messages in area'));
} else {
self.messageList = msgList;
@@ -210,6 +210,7 @@ MessageListModule.prototype.mciReady = function(mciData, cb) {
function complete(err) {
if(err) {
self.client.log.error( { error : err.toString() }, 'Error loading message list');
}
cb(err);
}