+ MCI: PT - total messages posted today (non-private)

+ MCI: TP - total messages/posts on system (non-private, includes imports, only counts *current*, not all of time)
* Move some stats to startup() calls
* Fix some DATE() comparisons in SQL to use 'localtime' as our timestamps include TZ
* Update luciano_blocktronics SYSSTAT to show more info

art/themes/luciano_blocktronics/theme.hjson

@@ -127,15 +127,16 @@
 			mainMenuSystemStats: {
 				mci: {
 					BN1: { width: 17 }
-					VL2: { width: 17 }
+					VN2: { width: 17 }
 					OS3: { width: 33 }
 					SC4: { width: 33 }
-					DT5: { width: 33 }
-					CT6: { width: 33 }
 					AN7: { width: 6 }
 					ND8: { width: 6 }
 					TC9: { width: 6 }
 					TT11: { width: 6 }
+					PT12: { width: 6 }
+					TP13: { width: 6 }
+					NV14: { width: 17 }
 				}
 			}
 

core/bbs.js

@@ -263,17 +263,6 @@ function initialize(cb) {
                     }
                 );
             },
-            function initFileAreaStats(callback) {
-                const getAreaStats = require('./file_base_area.js').getAreaStats;
-                getAreaStats( (err, stats) => {
-                    if(!err) {
-                        const StatLog = require('./stat_log.js');
-                        StatLog.setNonPersistentSystemStat(SysProps.FileBaseAreaStats, stats);
-                    }
-
-                    return callback(null);
-                });
-            },
             function initCallsToday(callback) {
                 const StatLog = require('./stat_log.js');
                 const filter = {
@@ -289,6 +278,9 @@ function initialize(cb) {
                     return callback(null);
                 });
             },
+            function initMessageStats(callback) {
+                return require('./message_area.js').startup(callback);
+            },
             function initMCI(callback) {
                 return require('./predefined_mci.js').init(callback);
             },

core/file_base_area.js

@@ -57,7 +57,25 @@ const WellKnownAreaTags                 = exports.WellKnownAreaTags = {
 };
 
 function startup(cb) {
-    return cleanUpTempSessionItems(cb);
+    async.series(
+        [
+            (callback) => {
+                return cleanUpTempSessionItems(callback);
+            },
+            (callback) => {
+                getAreaStats( (err, stats) => {
+                    if(!err) {
+                        StatLog.setNonPersistentSystemStat(SysProps.FileBaseAreaStats, stats);
+                    }
+
+                    return callback(null);
+                });
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 function isInternalArea(areaTag) {

core/fse.js

@@ -25,6 +25,7 @@ const Config                    = require('./config.js').get;
 const { getAddressedToInfo }    = require('./mail_util.js');
 const Events                    = require('./events.js');
 const UserProps                 = require('./user_property.js');
+const SysProps                  = require('./system_property.js');
 
 //  deps
 const async                     = require('async');
@@ -470,7 +471,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         );
     }
 
-    updateUserStats(cb) {
+    updateUserAndSystemStats(cb) {
         if(Message.isPrivateAreaTag(this.message.areaTag)) {
             Events.emit(Events.getSystemEvents().UserSendMail, { user : this.client.user });
             if(cb) {
@@ -480,6 +481,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         }
 
         Events.emit(Events.getSystemEvents().UserPostMessage, { user : this.client.user, areaTag : this.message.areaTag });
+
+        StatLog.incrementNonPersistentSystemStat(SysProps.MessageTotalCount, 1);
+        StatLog.incrementNonPersistentSystemStat(SysProps.MessagesToday, 1);
         return StatLog.incrementUserStat(this.client.user, UserProps.MessagePostCount, 1, cb);
     }
 

core/message.js

@@ -239,7 +239,10 @@ module.exports = class Message {
         filter.toUserName
         filter.fromUserName
         filter.replyToMesageId
-        filter.newerThanTimestamp
+
+        filter.newerThanTimestamp - may not be used with |date|
+        filter.date - moment object - may not be used with |newerThanTimestamp|
+
         filter.newerThanMessageId
         filter.areaTag - note if you want by conf, send in all areas for a conf
         *filter.metaTuples - {category, name, value}
@@ -356,7 +359,10 @@ module.exports = class Message {
         });
 
         if(_.isString(filter.newerThanTimestamp) && filter.newerThanTimestamp.length > 0) {
+            //  :TODO: should be using "localtime" here?
             appendWhereClause(`DATETIME(m.modified_timestamp) > DATETIME("${filter.newerThanTimestamp}", "+1 seconds")`);
+        } else if(moment.isMoment(filter.date)) {
+            appendWhereClause(`DATE(m.modified_timestamp, "localtime") = DATE("${filter.date.format('YYYY-MM-DD')}")`);
         }
 
         if(_.isNumber(filter.newerThanMessageId)) {

core/message_area.js

@@ -9,12 +9,17 @@ const Log                       = require('./logger.js').log;
 const msgNetRecord              = require('./msg_network.js').recordMessage;
 const sortAreasOrConfs          = require('./conf_area_util.js').sortAreasOrConfs;
 const UserProps                 = require('./user_property.js');
+const StatLog                   = require('./stat_log.js');
+const SysProps                  = require('./system_property.js');
 
 //  deps
 const async         = require('async');
 const _             = require('lodash');
 const assert        = require('assert');
+const moment        = require('moment');
 
+exports.startup                             = startup;
+exports.shutdown                            = shutdown;
 exports.getAvailableMessageConferences      = getAvailableMessageConferences;
 exports.getSortedAvailMessageConferences    = getSortedAvailMessageConferences;
 exports.getAvailableMessageAreasByConfTag   = getAvailableMessageAreasByConfTag;
@@ -35,6 +40,37 @@ exports.updateMessageAreaLastReadId         = updateMessageAreaLastReadId;
 exports.persistMessage                      = persistMessage;
 exports.trimMessageAreasScheduledEvent      = trimMessageAreasScheduledEvent;
 
+function startup(cb) {
+    //  by default, private messages are NOT included
+    async.series(
+        [
+            (callback) => {
+                Message.findMessages( { resultType : 'count' }, (err, count) => {
+                    if(count) {
+                        StatLog.setNonPersistentSystemStat(SysProps.MessageTotalCount, count);
+                    }
+                    return callback(err);
+                });
+            },
+            (callback) => {
+                Message.findMessages( { resultType : 'count', date : moment() }, (err, count) => {
+                    if(count) {
+                        StatLog.setNonPersistentSystemStat(SysProps.MessagesToday, count);
+                    }
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
+}
+
+function shutdown(cb) {
+    return cb(null);
+}
+
 function getAvailableMessageConferences(client, options) {
     options = options || { includeSystemInternal : false };
 

core/msg_area_post_fse.js

@@ -38,7 +38,7 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
                         return persistMessage(msg, callback);
                     },
                     function updateStats(callback) {
-                        self.updateUserStats(callback);
+                        self.updateUserAndSystemStats(callback);
                     }
                 ],
                 function complete(err) {

core/predefined_mci.js

@@ -155,13 +155,14 @@ const PREDEFINED_MCI_GENERATORS = {
     //
     //  Date/Time
     //
-    //  :TODO: change to CD for 'Current Date'
     DT  : function date(client) { return moment().format(client.currentTheme.helpers.getDateFormat()); },
     CT  : function time(client) { return moment().format(client.currentTheme.helpers.getTimeFormat()) ;},
 
     //
     //  OS/System Info
     //
+    //  https://github.com/nodejs/node-v0.x-archive/issues/25769
+    //
     OS  : function operatingSystem() {
         return {
             linux   : 'Linux',
@@ -169,6 +170,9 @@ const PREDEFINED_MCI_GENERATORS = {
             win32   : 'Windows',
             sunos   : 'SunOS',
             freebsd : 'FreeBSD',
+            android : 'Android',
+            openbsd : 'OpenBSD',
+            aix     : 'IBM AIX',
         }[os.platform()] || os.type();
     },
 
@@ -227,14 +231,16 @@ const PREDEFINED_MCI_GENERATORS = {
         const totalBytes    = parseInt(_.get(areaStats, 'totalBytes', 0));
         return formatByteSize(totalBytes, true);    //  true=withAbbr
     },
+    PT  : function messagesPostedToday() {  //  Obv/2
+        return sysStatAsString(SysProps.MessagesToday, 0);
+    },
+    TP  : function totalMessagesOnSystem() {    //  Obv/2
+        return sysStatAsString(SysProps.MessageTotalCount, 0);
+    },
 
-    //  :TODO: PT - Messages posted *today* (Obv/2)
-    //      -> Include FTN/etc.
     //  :TODO: NT - New users today (Obv/2)
     //  :TODO: FT - Files uploaded/added *today* (Obv/2)
     //  :TODO: DD - Files downloaded *today* (iNiQUiTY)
-    //  :TODO: TP - total message/posts on the system (Obv/2)
-    //      -> Include FTN/etc.
     //  :TODO: LC - name of last caller to system (Obv/2)
     //  :TODO: TZ - Average *system* post/call ratio (iNiQUiTY)
 

core/scanner_tossers/ftn_bso.js

@@ -21,6 +21,8 @@ const copyFileWithCollisionHandling     = require('../file_util.js').copyFileWit
 const getAreaStorageDirectoryByTag      = require('../file_base_area.js').getAreaStorageDirectoryByTag;
 const isValidStorageTag                 = require('../file_base_area.js').isValidStorageTag;
 const User                              = require('../user.js');
+const StatLog                           = require('../stat_log.js');
+const SysProps                          = require('../system_property.js');
 
 //  deps
 const moment                = require('moment');
@@ -1261,12 +1263,12 @@ function FTNMessageScanTossModule() {
                             }
                         }
 
-                        //  we do this after such that error cases can be preseved above
+                        //  we do this after such that error cases can be preserved above
                         if(lookupName !== message.toUserName) {
                             message.toUserName = localUserName;
                         }
 
-                        //  set the meta information - used elsehwere for retrieval
+                        //  set the meta information - used elsewhere for retrieval
                         message.meta.System[Message.SystemMetaNames.LocalToUserID] = localToUserId;
                         return callback(null);
                     });
@@ -1277,6 +1279,10 @@ function FTNMessageScanTossModule() {
 
                     //  save to disc
                     message.persist(err => {
+                        if(!message.isPrivate()) {
+                            StatLog.incrementNonPersistentSystemStat(SysProps.MessageTotalCount, 1);
+                            StatLog.incrementNonPersistentSystemStat(SysProps.MessagesToday, 1);
+                        }
                         return callback(err);
                     });
                 }

core/stat_log.js

@@ -253,7 +253,7 @@ class StatLog {
 
         if(filter.date) {
             filter.date = moment(filter.date);
-            sql += ` AND DATE(timestamp) = DATE("${filter.date.format('YYYY-MM-DD')}")`;
+            sql += ` AND DATE(timestamp, "localtime") = DATE("${filter.date.format('YYYY-MM-DD')}")`;
         }
 
         if('count' !== filter.resultType) {

core/system_property.js

@@ -15,6 +15,9 @@ module.exports = {
     FileUlTotalCount    : 'ul_total_count',
     FileUlTotalBytes    : 'ul_total_bytes',
 
+    MessageTotalCount   : 'message_post_total_count',   //  total non-private messages on the system; non-persistent
+    MessagesToday       : 'message_post_today',         //  non-private messages posted/imported today; non-persistent
+
     //  begin +op non-persistent...
     SysOpUsername       : 'sysop_username',
     SysOpRealName       : 'sysop_real_name',