1 files changed, 30 insertions, 29 deletions

diff --git a/server/src/commands/mod/moveuser.js b/server/src/commands/mod/moveuser.js
index c7fc4bf..b55c207 100644
--- a/server/src/commands/mod/moveuser.js
+++ b/server/src/commands/mod/moveuser.js
@@ -3,79 +3,79 @@
 */
 
 // module main
-exports.run = async (core, server, socket, data) => {
+export async function run(core, server, socket, data) {
   // increase rate limit chance and ignore if not admin or mod
   if (socket.uType === 'user') {
-    return server.police.frisk(socket.remoteAddress, 10);
+    return server.police.frisk(socket.address, 10);
   }
 
   // check user input
   if (typeof data.nick !== 'string' || typeof data.channel !== 'string') {
-    return;
+    return true;
   }
 
   if (data.channel === socket.channel) {
     // moving them into the same channel? y u do this?
-    return;
+    return true;
   }
 
-  let badClients = server.findSockets({ channel: socket.channel, nick: data.nick });
+  const badClients = server.findSockets({ channel: socket.channel, nick: data.nick });
 
   if (badClients.length === 0) {
     return server.reply({
       cmd: 'warn',
-      text: 'Could not find user in channel'
+      text: 'Could not find user in channel',
     }, socket);
   }
 
-  let badClient = badClients[0];
+  const badClient = badClients[0];
 
   if (badClient.uType !== 'user') {
     return server.reply({
       cmd: 'warn',
-      text: 'Cannot move other mods, how rude'
+      text: 'Cannot move other mods, how rude',
     }, socket);
   }
 
   const currentNick = badClient.nick.toLowerCase();
-  let userExists = server.findSockets({
+  const userExists = server.findSockets({
     channel: data.channel,
-    nick: (targetNick) => targetNick.toLowerCase() === currentNick
+    nick: (targetNick) => targetNick.toLowerCase() === currentNick,
   });
 
   if (userExists.length > 0) {
     // That nickname is already in that channel
-    return;
+    return true;
   }
 
-  let peerList = server.findSockets({ channel: socket.channel });
+  const peerList = server.findSockets({ channel: socket.channel });
 
   if (peerList.length > 1) {
-    for (let i = 0, l = peerList.length; i < l; i++) {
+    for (let i = 0, l = peerList.length; i < l; i += 1) {
       server.reply({
         cmd: 'onlineRemove',
-        nick: peerList[i].nick
+        nick: peerList[i].nick,
       }, badClient);
 
-      if (badClient.nick !== peerList[i].nick){
+      if (badClient.nick !== peerList[i].nick) {
         server.reply({
           cmd: 'onlineRemove',
-          nick: badClient.nick
+          nick: badClient.nick,
         }, peerList[i]);
       }
     }
   }
 
-  let newPeerList = server.findSockets({ channel: data.channel });
-  let moveAnnouncement = {
+  const newPeerList = server.findSockets({ channel: data.channel });
+  const moveAnnouncement = {
     cmd: 'onlineAdd',
     nick: badClient.nick,
     trip: badClient.trip || 'null',
-    hash: server.getSocketHash(badClient)
+    hash: server.getSocketHash(badClient),
   };
-  let nicks = [];
+  const nicks = [];
 
-  for (let i = 0, l = newPeerList.length; i < l; i++) {
+  for (let i = 0, l = newPeerList.length; i < l; i += 1) {
     server.reply(moveAnnouncement, newPeerList[i]);
     nicks.push(newPeerList[i].nick);
   }
@@ -84,22 +84,23 @@ exports.run = async (core, server, socket, data) => {
 
   server.reply({
     cmd: 'onlineSet',
-    nicks: nicks
+    nicks,
   }, badClient);
 
   badClient.channel = data.channel;
 
-  server.broadcast( {
+  server.broadcast({
     cmd: 'info',
-    text: `${badClient.nick} was moved into ?${data.channel}`
+    text: `${badClient.nick} was moved into ?${data.channel}`,
   }, { channel: data.channel });
-};
 
-// module meta
-exports.requiredData = ['nick', 'channel'];
-exports.info = {
+  return true;
+}
+
+export const requiredData = ['nick', 'channel'];
+export const info = {
   name: 'moveuser',
   description: 'This will move the target user nick into another channel',
   usage: `
-    API: { cmd: 'moveuser', nick: '<target nick>', channel: '<new channel>' }`
+    API: { cmd: 'moveuser', nick: '<target nick>', channel: '<new channel>' }`,
 };