Merge branch '0.0.9-alpha' of github.com:NuSkooler/enigma-bbs into user-interruptions

This commit is contained in:
Bryan Ashby 2018-11-25 10:42:12 -07:00
commit 596026d1ce
3 changed files with 6 additions and 2 deletions

View File

@ -91,7 +91,10 @@ const PREDEFINED_MCI_GENERATORS = {
UE : function emailAddres(client) { return userStatAsString(client, UserProps.EmailAddress, ''); }, UE : function emailAddres(client) { return userStatAsString(client, UserProps.EmailAddress, ''); },
UW : function webAddress(client) { return userStatAsString(client, UserProps.WebAddress, ''); }, UW : function webAddress(client) { return userStatAsString(client, UserProps.WebAddress, ''); },
UF : function affils(client) { return userStatAsString(client, UserProps.Affiliations, ''); }, 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); }, UC : function loginCount(client) { return userStatAsString(client, UserProps.LoginCount, 0); },
ND : function connectedNode(client) { return client.node.toString(); }, 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 IP : function clientIpAddress(client) { return client.remoteAddress.replace(/^::ffff:/, ''); }, // convert any :ffff: IPv4's to 32bit version

View File

@ -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 | | `UE` | Current user's email address |
| `UW` | Current user's web address | | `UW` | Current user's web address |
| `UF` | Current user's affiliations | | `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 | | `UC` | Current user's login/call count |
| `ND` | Current user's connected node number | | `ND` | Current user's connected node number |
| `IP` | Current user's IP address | | `IP` | Current user's IP address |