moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Bryan Ashby 2016-07-06 20:56:59 -06:00
parent c2b9fb9c0c 0519d9a001
commit a32f810c46
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/database.js
View File

@ -97,6 +97,9 @@ function initializeDatabases(cb) {
} }
function createSystemTables() { function createSystemTables() {
dbs.system.run('PRAGMA foreign_keys = ON;');
dbs.system.run( dbs.system.run(
'CREATE TABLE IF NOT EXISTS system_property (' + 'CREATE TABLE IF NOT EXISTS system_property (' +
' prop_name VARCHAR PRIMARY KEY NOT NULL,' + ' prop_name VARCHAR PRIMARY KEY NOT NULL,' +
@ -120,6 +123,8 @@ function createSystemTables() {
} }
function createUserTables() { function createUserTables() {
dbs.user.run('PRAGMA foreign_keys = ON;');
dbs.user.run( dbs.user.run(
`CREATE TABLE IF NOT EXISTS user ( `CREATE TABLE IF NOT EXISTS user (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
@ -158,6 +163,9 @@ function createUserTables() {
} }
function createMessageBaseTables() { function createMessageBaseTables() {
dbs.message.run('PRAGMA foreign_keys = ON;');
dbs.message.run( dbs.message.run(
`CREATE TABLE IF NOT EXISTS message ( `CREATE TABLE IF NOT EXISTS message (
message_id INTEGER PRIMARY KEY, message_id INTEGER PRIMARY KEY,

34
core/predefined_mci.js
View File

@ -1,17 +1,18 @@
/* jslint node: true */ /* jslint node: true */
'use strict'; 'use strict';
var Config = require('./config.js').config; // ENiGMA½
var Log = require('./logger.js').log; const Config = require('./config.js').config;
var getMessageAreaByTag = require('./message_area.js').getMessageAreaByTag; const Log = require('./logger.js').log;
var clientConnections = require('./client_connections.js'); const getMessageAreaByTag = require('./message_area.js').getMessageAreaByTag;
var sysProp = require('./system_property.js'); const clientConnections = require('./client_connections.js');
const sysProp = require('./system_property.js');
var packageJson = require('../package.json'); // deps
var assert = require('assert'); const packageJson = require('../package.json');
var os = require('os'); const os = require('os');
var _ = require('lodash'); const _ = require('lodash');
var moment = require('moment'); const moment = require('moment');
exports.getPredefinedMCIValue = getPredefinedMCIValue; exports.getPredefinedMCIValue = getPredefinedMCIValue;
@ -68,10 +69,10 @@ function getPredefinedMCIValue(client, code) {
return area ? area.name : ''; return area ? area.name : '';
}, },
ML : function messageAreaDescription() { ML : function messageAreaDescription() {
const area = getMessageAreaByTag(client.user.properties.message_area_tag); const area = getMessageAreaByTag(client.user.properties.message_area_tag);
return area ? area.desc : ''; return area ? area.desc : '';
}, },
SH : function termHeight() { return client.term.termHeight.toString(); }, SH : function termHeight() { return client.term.termHeight.toString(); },
SW : function termWidth() { return client.term.termWidth.toString(); }, SW : function termWidth() { return client.term.termWidth.toString(); },
@ -113,6 +114,11 @@ function getPredefinedMCIValue(client, code) {
AN : function activeNodes() { return clientConnections.getActiveConnections().length.toString(); }, AN : function activeNodes() { return clientConnections.getActiveConnections().length.toString(); },
TC : function totalCalls() { return sysProp.getSystemProperty('login_count').toString(); }, TC : function totalCalls() { return sysProp.getSystemProperty('login_count').toString(); },
//
// Special handling for XY
//
XY : function xyHack() { return; /* nothing */ },
}[code](); // :TODO: Just call toString() here and remove above - DRY }[code](); // :TODO: Just call toString() here and remove above - DRY