From 4ee7d7a5409b28ac5fe0c0b959b6f5f635bd36e5 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Sun, 25 Nov 2018 10:26:42 -0700 Subject: [PATCH 1/2] Arrange a bit and add global newscan --- art/themes/luciano_blocktronics/MMENU.ANS | Bin 3492 -> 3527 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/art/themes/luciano_blocktronics/MMENU.ANS b/art/themes/luciano_blocktronics/MMENU.ANS index 4a058fc910136e6839ec43a91e6b84fb2c5ac686..75251877665dfef7961dfa9376f8ed1b294279ad 100644 GIT binary patch delta 146 zcmZ1?eO!9ORSq#jGiT{&!(3G-KaCts1?gymTuy+nG$RSq#D183=I!(3G-KaCts1?gymTv+&LZ Js$9gY3IMYXB5nWx From e464f95924204863c0bfb4617583d7db16d03af8 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Sun, 25 Nov 2018 10:35:05 -0700 Subject: [PATCH 2/2] UT MCI now displays theme name, UD displays ID --- core/predefined_mci.js | 5 ++++- docs/art/mci.md | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/predefined_mci.js b/core/predefined_mci.js index c83f8353..cda9f5b4 100644 --- a/core/predefined_mci.js +++ b/core/predefined_mci.js @@ -91,7 +91,10 @@ const PREDEFINED_MCI_GENERATORS = { UE : function emailAddres(client) { return userStatAsString(client, UserProps.EmailAddress, ''); }, UW : function webAddress(client) { return userStatAsString(client, UserProps.WebAddress, ''); }, UF : function affils(client) { return userStatAsString(client, UserProps.Affiliations, ''); }, - UT : function themeId(client) { return userStatAsString(client, UserProps.ThemeId, ''); }, + UT : function themeName(client) { + return _.get(client, 'currentTheme.info.name', userStatAsString(client, UserProps.ThemeId, '')); + }, + UD : function themeId(client) { return userStatAsString(client, UserProps.ThemeId, ''); }, UC : function loginCount(client) { return userStatAsString(client, UserProps.LoginCount, 0); }, ND : function connectedNode(client) { return client.node.toString(); }, IP : function clientIpAddress(client) { return client.remoteAddress.replace(/^::ffff:/, ''); }, // convert any :ffff: IPv4's to 32bit version diff --git a/docs/art/mci.md b/docs/art/mci.md index bc6bab5a..04e177c2 100644 --- a/docs/art/mci.md +++ b/docs/art/mci.md @@ -35,7 +35,8 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et | `UE` | Current user's email address | | `UW` | Current user's web address | | `UF` | Current user's affiliations | -| `UT` | Current user's *theme ID* (e.g. "luciano_blocktronics") | +| `UT` | Current user's theme name | +| `UD` | Current user's *theme ID* (e.g. "luciano_blocktronics") | | `UC` | Current user's login/call count | | `ND` | Current user's connected node number | | `IP` | Current user's IP address |