hackchat-server 2.3 update

commands/admin/addmod.js

@@ -24,7 +24,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // add new trip to config

commands/admin/listusers.js

@@ -23,7 +23,7 @@ import {
 export async function run({ server, socket }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // find all users currently in a channel

commands/admin/reload.js

@@ -22,7 +22,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // do command reload and store results

commands/admin/removemod.js

@@ -24,7 +24,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // remove trip from config

commands/admin/saveconfig.js

@@ -20,7 +20,7 @@ import {
 export async function run({ core, server, socket }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // attempt save, notify of failure

commands/admin/shout.js

@@ -19,7 +19,7 @@ import {
 export async function run({ server, socket, payload }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // send text to all channels

commands/core/changecolor.js

@@ -30,7 +30,7 @@ export async function run({
 }) {
   const { channel } = socket;
 
-  if (server.police.frisk(socket.address, 1)) {
+  if (server.police.frisk(socket, 1)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are changing colors too fast. Wait a moment before trying again.',

commands/core/changenick.js

@@ -24,7 +24,7 @@ export async function run({
 }) {
   const { channel } = socket;
 
-  if (server.police.frisk(socket.address, 6)) {
+  if (server.police.frisk(socket, 6)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are changing nicknames too fast. Wait a moment before trying again.',

commands/core/chat.js

@@ -88,12 +88,12 @@ export async function run({
 
   if (!text) {
     // lets not send objects or empty text, yea?
-    return server.police.frisk(socket.address, 13);
+    return server.police.frisk(socket, 13);
   }
 
   // check for spam
   const score = text.length / 83 / 4;
-  if (server.police.frisk(socket.address, score)) {
+  if (server.police.frisk(socket, score)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are sending too much text. Wait a moment and try again.\nPress the up arrow key to restore your last message.',
@@ -105,7 +105,7 @@ export async function run({
 
   if (typeof (customId) === 'string' && customId.length > MAX_MESSAGE_ID_LENGTH) {
     // There's a limit on the custom id length.
-    return server.police.frisk(socket.address, 13);
+    return server.police.frisk(socket, 13);
   }
 
   // build chat payload

commands/core/emote.js

@@ -41,12 +41,12 @@ export async function run({ server, socket, payload }) {
 
   if (!text) {
     // lets not send objects or empty text, yea?
-    return server.police.frisk(socket.address, 8);
+    return server.police.frisk(socket, 8);
   }
 
   // check for spam
   const score = text.length / 83 / 4;
-  if (server.police.frisk(socket.address, score)) {
+  if (server.police.frisk(socket, score)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are sending too much text. Wait a moment and try again.\nPress the up arrow key to restore your last message.',

commands/core/help.js

@@ -16,7 +16,7 @@ export async function run({
   core, server, socket, payload,
 }) {
   // check for spam
-  if (server.police.frisk(socket.address, 2)) {
+  if (server.police.frisk(socket, 2)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are sending too much text. Wait a moment and try again.\nPress the up arrow key to restore your last message.',

commands/core/invite.js

@@ -40,7 +40,7 @@ export async function run({
   core, server, socket, payload,
 }) {
   // check for spam
-  if (server.police.frisk(socket.address, 2)) {
+  if (server.police.frisk(socket, 2)) {
     return server.reply({
       cmd: 'warn',
       text: 'You are sending invites too fast. Wait a moment before trying again.',

commands/core/join.js

@@ -39,7 +39,7 @@ export async function run({
   core, server, socket, payload,
 }) {
   // check for spam
-  if (server.police.frisk(socket.address, 3)) {
+  if (server.police.frisk(socket, 3)) {
     return server.reply({
       cmd: 'warn',
       text: 'You are joining channels too fast. Wait a moment and try again.',

commands/core/updateMessage.js

@@ -36,15 +36,15 @@ export async function run({
   }
 
   if (mode !== 'overwrite' && mode !== 'append' && mode !== 'prepend' && mode !== 'complete') {
-    return server.police.frisk(socket.address, 13);
+    return server.police.frisk(socket, 13);
   }
 
   if (!customId || typeof customId !== 'string' || customId.length > MAX_MESSAGE_ID_LENGTH) {
-    return server.police.frisk(socket.address, 13);
+    return server.police.frisk(socket, 13);
   }
 
   if (typeof (text) !== 'string') {
-    return server.police.frisk(socket.address, 13);
+    return server.police.frisk(socket, 13);
   }
 
   if (mode === 'overwrite') {
@@ -56,7 +56,7 @@ export async function run({
   }
 
   if (!text) {
-    return server.police.frisk(socket.address, 13);
+    return server.police.frisk(socket, 13);
   }
 
   // TODO: What score should we use for this? It isn't as space filling as chat messages.
@@ -77,7 +77,7 @@ export async function run({
   }
 
   if (!message) {
-    return server.police.frisk(socket.address, 6);
+    return server.police.frisk(socket, 6);
   }
 
   const outgoingPayload = {

commands/core/whisper.js

@@ -59,12 +59,12 @@ export async function run({ server, socket, payload }) {
 
   if (!text) {
     // lets not send objects or empty text, yea?
-    return server.police.frisk(socket.address, 13);
+    return server.police.frisk(socket, 13);
   }
 
   // check for spam
   const score = text.length / 83 / 4;
-  if (server.police.frisk(socket.address, score)) {
+  if (server.police.frisk(socket, score)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are sending too much text. Wait a moment and try again.\nPress the up arrow key to restore your last message.',

commands/internal/disconnect.js

@@ -19,7 +19,7 @@ import {
 export async function run({ server, socket, payload }) {
   if (payload.cmdKey !== server.cmdKey) {
     // internal command attempt by client, increase rate limit chance and ignore
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // send leave notice to client peers

commands/internal/socketreply.js

@@ -16,7 +16,7 @@
 export async function run({ server, socket, payload }) {
   if (payload.cmdKey !== server.cmdKey) {
     // internal command attempt by client, increase rate limit chance and ignore
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // send warning to target socket

commands/mod/ban.js

@@ -29,7 +29,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // check user input

commands/mod/disablecaptcha.js

@@ -34,7 +34,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   let targetChannel;

commands/mod/dumb.js

@@ -82,7 +82,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // check user input
@@ -205,7 +205,7 @@ export function chatCheck({
       * May expose the ratelimiting lines from `chat` and use that
       * @todo one day #lazydev
       */
-    server.police.frisk(socket.address, 9);
+    server.police.frisk(socket, 9);
 
     return false;
   }
@@ -227,7 +227,7 @@ export function inviteCheck({
 }) {
   if (core.muzzledHashes[socket.hash]) {
     // check for spam
-    if (server.police.frisk(socket.address, 2)) {
+    if (server.police.frisk(socket, 2)) {
       return server.reply({
         cmd: 'warn',
         text: 'You are sending invites too fast. Wait a moment before trying again.',
@@ -308,12 +308,12 @@ export function whisperCheck({
 
     if (!text) {
       // lets not send objects or empty text, yea?
-      return server.police.frisk(socket.address, 13);
+      return server.police.frisk(socket, 13);
     }
 
     // check for spam
     const score = text.length / 83 / 4;
-    if (server.police.frisk(socket.address, score)) {
+    if (server.police.frisk(socket, score)) {
       return server.reply({
         cmd: 'warn', // @todo Add numeric error code as `id`
         text: 'You are sending too much text. Wait a moment and try again.\nPress the up arrow key to restore your last message.',

commands/mod/enablecaptcha.js

@@ -51,7 +51,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   let targetChannel;
@@ -141,7 +141,7 @@ export function chatCheck({
         return false;
       }
 
-      server.police.frisk(socket.address, 7);
+      server.police.frisk(socket, 7);
       socket.terminate();
 
       return false;

commands/mod/forcecolor.js

@@ -37,7 +37,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   const { channel } = socket;

commands/mod/kick.js

@@ -29,7 +29,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // check user input

commands/mod/lockroom.js

@@ -72,7 +72,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   let targetChannel;

commands/mod/speak.js

@@ -35,7 +35,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // check user input

commands/mod/unban.js

@@ -21,7 +21,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // check user input

commands/mod/unbanall.js

@@ -19,7 +19,7 @@ import {
 export async function run({ core, server, socket }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // remove arrest records

commands/mod/unlockroom.js

@@ -35,7 +35,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   let targetChannel;

documentation/admin_addmod.js.html

@@ -52,7 +52,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // add new trip to config

documentation/admin_listusers.js.html

@@ -51,7 +51,7 @@ import {
 export async function run({ server, socket }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // find all users currently in a channel

documentation/admin_reload.js.html

@@ -50,7 +50,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // do command reload and store results

documentation/admin_removemod.js.html

@@ -52,7 +52,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // remove trip from config

documentation/admin_saveconfig.js.html

@@ -48,7 +48,7 @@ import {
 export async function run({ core, server, socket }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // attempt save, notify of failure

documentation/admin_shout.js.html

@@ -47,7 +47,7 @@ import {
 export async function run({ server, socket, payload }) {
   // increase rate limit chance and ignore if not admin
   if (!isAdmin(socket.level)) {
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // send text to all channels

documentation/core_changecolor.js.html

@@ -58,7 +58,7 @@ export async function run({
 }) {
   const { channel } = socket;
 
-  if (server.police.frisk(socket.address, 1)) {
+  if (server.police.frisk(socket, 1)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are changing colors too fast. Wait a moment before trying again.',

documentation/core_changenick.js.html

@@ -52,7 +52,7 @@ export async function run({
 }) {
   const { channel } = socket;
 
-  if (server.police.frisk(socket.address, 6)) {
+  if (server.police.frisk(socket, 6)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are changing nicknames too fast. Wait a moment before trying again.',
@@ -80,7 +80,7 @@ export async function run({
   // prevent admin impersonation
   // @todo prevent mod impersonation
   if (newNick.toLowerCase() === core.config.adminName.toLowerCase()) {
-    server.police.frisk(socket.address, 4);
+    server.police.frisk(socket, 4);
 
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`

documentation/core_chat.js.html

@@ -76,12 +76,12 @@ export async function run({
 
   if (!text) {
     // lets not send objects or empty text, yea?
-    return server.police.frisk(socket.address, 13);
+    return server.police.frisk(socket, 13);
   }
 
   // check for spam
   const score = text.length / 83 / 4;
-  if (server.police.frisk(socket.address, score)) {
+  if (server.police.frisk(socket, score)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are sending too much text. Wait a moment and try again.\nPress the up arrow key to restore your last message.',

documentation/core_emote.js.html

@@ -69,12 +69,12 @@ export async function run({ server, socket, payload }) {
 
   if (!text) {
     // lets not send objects or empty text, yea?
-    return server.police.frisk(socket.address, 8);
+    return server.police.frisk(socket, 8);
   }
 
   // check for spam
   const score = text.length / 83 / 4;
-  if (server.police.frisk(socket.address, score)) {
+  if (server.police.frisk(socket, score)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are sending too much text. Wait a moment and try again.\nPress the up arrow key to restore your last message.',

documentation/core_help.js.html

@@ -44,7 +44,7 @@ export async function run({
   core, server, socket, payload,
 }) {
   // check for spam
-  if (server.police.frisk(socket.address, 2)) {
+  if (server.police.frisk(socket, 2)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are sending too much text. Wait a moment and try again.\nPress the up arrow key to restore your last message.',

documentation/core_invite.js.html

@@ -68,7 +68,7 @@ export async function run({
   core, server, socket, payload,
 }) {
   // check for spam
-  if (server.police.frisk(socket.address, 2)) {
+  if (server.police.frisk(socket, 2)) {
     return server.reply({
       cmd: 'warn',
       text: 'You are sending invites too fast. Wait a moment before trying again.',

documentation/core_join.js.html

@@ -63,7 +63,7 @@ export async function run({
   core, server, socket, payload,
 }) {
   // check for spam
-  if (server.police.frisk(socket.address, 3)) {
+  if (server.police.frisk(socket, 3)) {
     return server.reply({
       cmd: 'warn',
       text: 'You are joining channels too fast. Wait a moment and try again.',

documentation/core_whisper.js.html

@@ -87,12 +87,12 @@ export async function run({ server, socket, payload }) {
 
   if (!text) {
     // lets not send objects or empty text, yea?
-    return server.police.frisk(socket.address, 13);
+    return server.police.frisk(socket, 13);
   }
 
   // check for spam
   const score = text.length / 83 / 4;
-  if (server.police.frisk(socket.address, score)) {
+  if (server.police.frisk(socket, score)) {
     return server.reply({
       cmd: 'warn', // @todo Add numeric error code as `id`
       text: 'You are sending too much text. Wait a moment and try again.\nPress the up arrow key to restore your last message.',

documentation/internal_disconnect.js.html

@@ -43,7 +43,7 @@
 export async function run({ server, socket, payload }) {
   if (payload.cmdKey !== server.cmdKey) {
     // internal command attempt by client, increase rate limit chance and ignore
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // send leave notice to client peers

documentation/internal_socketreply.js.html

@@ -44,7 +44,7 @@
 export async function run({ server, socket, payload }) {
   if (payload.cmdKey !== server.cmdKey) {
     // internal command attempt by client, increase rate limit chance and ignore
-    return server.police.frisk(socket.address, 20);
+    return server.police.frisk(socket, 20);
   }
 
   // send warning to target socket

documentation/mod_ban.js.html

@@ -57,7 +57,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // check user input

documentation/mod_dumb.js.html

@@ -110,7 +110,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // check user input
@@ -233,7 +233,7 @@ export function chatCheck({
       * May expose the ratelimiting lines from `chat` and use that
       * @todo one day #lazydev
       */
-    server.police.frisk(socket.address, 9);
+    server.police.frisk(socket, 9);
 
     return false;
   }
@@ -255,7 +255,7 @@ export function inviteCheck({
 }) {
   if (core.muzzledHashes[socket.hash]) {
     // check for spam
-    if (server.police.frisk(socket.address, 2)) {
+    if (server.police.frisk(socket, 2)) {
       return server.reply({
         cmd: 'warn',
         text: 'You are sending invites too fast. Wait a moment before trying again.',
@@ -336,12 +336,12 @@ export function whisperCheck({
 
     if (!text) {
       // lets not send objects or empty text, yea?
-      return server.police.frisk(socket.address, 13);
+      return server.police.frisk(socket, 13);
     }
 
     // check for spam
     const score = text.length / 83 / 4;
-    if (server.police.frisk(socket.address, score)) {
+    if (server.police.frisk(socket, score)) {
       return server.reply({
         cmd: 'warn', // @todo Add numeric error code as `id`
         text: 'You are sending too much text. Wait a moment and try again.\nPress the up arrow key to restore your last message.',

documentation/mod_forcecolor.js.html

@@ -65,7 +65,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   const { channel } = socket;

documentation/mod_kick.js.html

@@ -57,7 +57,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // check user input

documentation/mod_speak.js.html

@@ -63,7 +63,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // check user input

documentation/mod_unban.js.html

@@ -49,7 +49,7 @@ export async function run({
 }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // check user input

documentation/mod_unbanall.js.html

@@ -47,7 +47,7 @@ import {
 export async function run({ core, server, socket }) {
   // increase rate limit chance and ignore if not admin or mod
   if (!isModerator(socket.level)) {
-    return server.police.frisk(socket.address, 10);
+    return server.police.frisk(socket, 10);
   }
 
   // remove arrest records

package.json

@@ -32,7 +32,7 @@
   "dependencies": {
     "ascii-captcha": "^0.0.3",
     "enquirer": "^2.3.6",
-    "hackchat-server": "^2.2.27",
+    "hackchat-server": "^2.3.0",
     "http-server": "^14.1.0",
     "jsonwebtoken": "^9.0.2",
     "lowdb": "^3.0.0",