From 2b6e771383f4c6f392b32ce26e4d759b56791132 Mon Sep 17 00:00:00 2001
From: marzavec <admin@marzavec.com>
Date: Thu, 12 Mar 2020 13:28:20 -0500
Subject: Protocol Updates and Bug Fixes

---
 server/src/commands/core/move.js | 45 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'server/src/commands/core/move.js')

diff --git a/server/src/commands/core/move.js b/server/src/commands/core/move.js
index 7eda88c..fdafab4 100644
--- a/server/src/commands/core/move.js
+++ b/server/src/commands/core/move.js
@@ -17,6 +17,13 @@ export async function run(core, server, socket, data) {
     return true;
   }
 
+  if (data.channel === '') {
+    return server.reply({
+      cmd: 'warn',
+      text: 'Cannot move to an empty channel.',
+    }, socket);
+  }
+
   if (data.channel === socket.channel) {
     // they are trying to rejoin the channel
     return true;
@@ -53,6 +60,7 @@ export async function run(core, server, socket, data) {
     }
   }
 
+  // TODO: import function from join module
   // broadcast join notice to new peers
   const newPeerList = server.findSockets({ channel: data.channel });
   const moveAnnouncement = {
@@ -82,10 +90,45 @@ export async function run(core, server, socket, data) {
   return true;
 }
 
+// module hook functions
+export function initHooks(server) {
+  server.registerHook('in', 'chat', this.moveCheck.bind(this), 29);
+}
+
+export function moveCheck(core, server, socket, payload) {
+  if (typeof payload.text !== 'string') {
+    return false;
+  }
+
+  if (payload.text.startsWith('/move ')) {
+    const input = payload.text.split(' ');
+
+    // If there is no channel target parameter
+    if (input[1] === undefined) {
+      server.reply({
+        cmd: 'warn',
+        text: 'Refer to `/help move` for instructions on how to use this command.',
+      }, socket);
+
+      return false;
+    }
+
+    this.run(core, server, socket, {
+      cmd: 'move',
+      channel: input[1],
+    });
+
+    return false;
+  }
+
+  return payload;
+}
+
 export const requiredData = ['channel'];
 export const info = {
   name: 'move',
   description: 'This will change your current channel to the new one provided',
   usage: `
-    API: { cmd: 'move', channel: '<target channel>' }`,
+    API: { cmd: 'move', channel: '<target channel>' }
+    Text: /move <new channel>`,
 };
-- 
cgit v1.2.1