1 files changed, 34 insertions, 33 deletions

diff --git a/server/src/commands/core/changenick.js b/server/src/commands/core/changenick.js
index cb6d1d0..632da83 100644
--- a/server/src/commands/core/changenick.js
+++ b/server/src/commands/core/changenick.js
@@ -6,43 +6,43 @@
 const verifyNickname = (nick) => /^[a-zA-Z0-9_]{1,24}$/.test(nick);
 
 // module main
-exports.run = async (core, server, socket, data) => {
-  if (server.police.frisk(socket.remoteAddress, 6)) {
+export async function run(core, server, socket, data) {
+  if (server.police.frisk(socket.address, 6)) {
     return server.reply({
       cmd: 'warn',
-      text: 'You are changing nicknames too fast. Wait a moment before trying again.'
+      text: 'You are changing nicknames too fast. Wait a moment before trying again.',
     }, socket);
   }
 
   // verify user data is string
   if (typeof data.nick !== 'string') {
-    return;
+    return true;
   }
 
   // make sure requested nickname meets standards
-  let newNick = data.nick.trim();
+  const newNick = data.nick.trim();
   if (!verifyNickname(newNick)) {
     return server.reply({
       cmd: 'warn',
-      text: 'Nickname must consist of up to 24 letters, numbers, and underscores'
+      text: 'Nickname must consist of up to 24 letters, numbers, and underscores',
     }, socket);
   }
 
   // prevent admin impersonation
   // TODO: prevent mod impersonation
-  if (newNick.toLowerCase() == core.config.adminName.toLowerCase()) {
-    server.police.frisk(socket.remoteAddress, 4);
+  if (newNick.toLowerCase() === core.config.adminName.toLowerCase()) {
+    server.police.frisk(socket.address, 4);
 
     return server.reply({
       cmd: 'warn',
-      text: 'You are not the admin, liar!'
+      text: 'You are not the admin, liar!',
     }, socket);
   }
 
   // find any sockets that have the same nickname
-  let userExists = server.findSockets({
+  const userExists = server.findSockets({
     channel: socket.channel,
-    nick: (targetNick) => targetNick.toLowerCase() === newNick.toLowerCase()
+    nick: (targetNick) => targetNick.toLowerCase() === newNick.toLowerCase(),
   });
 
   // return error if found
@@ -50,82 +50,83 @@ exports.run = async (core, server, socket, data) => {
     // That nickname is already in that channel
     return server.reply({
       cmd: 'warn',
-      text: 'Nickname taken'
+      text: 'Nickname taken',
     }, socket);
   }
 
   // build join and leave notices
   // TODO: this is a legacy client holdover, name changes in the future will
   //       have thieir own event
-  let leaveNotice = {
+  const leaveNotice = {
     cmd: 'onlineRemove',
-    nick: socket.nick
+    nick: socket.nick,
   };
 
-  let joinNotice = {
+  const joinNotice = {
     cmd: 'onlineAdd',
     nick: newNick,
     trip: socket.trip || 'null',
-    hash: socket.hash
+    hash: socket.hash,
   };
 
   // broadcast remove event and join event with new name, this is to support legacy clients and bots
-  server.broadcast( leaveNotice, { channel: socket.channel });
-  server.broadcast( joinNotice, { channel: socket.channel });
+  server.broadcast(leaveNotice, { channel: socket.channel });
+  server.broadcast(joinNotice, { channel: socket.channel });
 
   // notify channel that the user has changed their name
-  server.broadcast( {
+  server.broadcast({
     cmd: 'info',
-    text: `${socket.nick} is now ${newNick}`
+    text: `${socket.nick} is now ${newNick}`,
   }, { channel: socket.channel });
 
   // commit change to nickname
   socket.nick = newNick;
-};
+
+  return true;
+}
 
 // module hook functions
-exports.initHooks = (server) => {
+export function initHooks(server) {
   server.registerHook('in', 'chat', this.nickCheck, 29);
-};
+}
 
 // hooks chat commands checking for /nick
-exports.nickCheck = (core, server, socket, payload) => {
+export function nickCheck(core, server, socket, payload) {
   if (typeof payload.text !== 'string') {
     return false;
   }
 
   if (payload.text.startsWith('/nick')) {
-    let input = payload.text.split(' ');
+    const input = payload.text.split(' ');
 
     // If there is no nickname target parameter
     if (input[1] === undefined) {
       server.reply({
         cmd: 'warn',
-        text: 'Refer to `/help nick` for instructions on how to use this command.'
+        text: 'Refer to `/help nick` for instructions on how to use this command.',
       }, socket);
 
       return false;
     }
 
-    let newNick = input[1].replace(/@/g, '');
+    const newNick = input[1].replace(/@/g, '');
 
     this.run(core, server, socket, {
       cmd: 'changenick',
-      nick: newNick
+      nick: newNick,
     });
 
     return false;
   }
 
   return payload;
-};
+}
 
-// module meta
-exports.requiredData = ['nick'];
-exports.info = {
+export const requiredData = ['nick'];
+export const info = {
   name: 'changenick',
   description: 'This will change your current connections nickname',
   usage: `
     API: { cmd: 'changenick', nick: '<new nickname>' }
-    Text: /nick <new nickname>`
+    Text: /nick <new nickname>`,
 };