auth and :jsonGet

1 files changed, 36 insertions, 7 deletions

diff --git a/commands.js b/commands.js
index 5c7a440..3fbd63e 100644
--- a/commands.js
+++ b/commands.js
@@ -8,10 +8,10 @@ export const commands = {
             if(args.length < 1) return user.socket.send("Error: You need to specify a channel (example: /join #home).");
             if(!args[0].startsWith("#")) return user.socket.send("Error: Channel not found, run /channels to see a list of channels.");
             if(!server.channels.includes(args[0].replace("#", ""))) return user.socket.send("Error: Channel not found, run /channels to see a list of channels.");
-            sendInChannel(`${user.username} left #${user.channel}.`, user.channel)
+            sendInChannel(`${user.name()} left #${user.channel}.`, user.channel)
             user.channel = args[0].replace("#", "");
-            console.info(`${user.username} went to #${user.channel}`)
-            sendInChannel(`${user.username} joined #${user.channel}!`, user.channel)
+            console.info(`${user.name()} went to #${user.channel}`)
+            sendInChannel(`${user.name()} joined #${user.channel}!`, user.channel)
         }
     },
     'channels': {
@@ -29,8 +29,8 @@ export const commands = {
             if(args[0].length < 3 ) return user.socket.send("Error: Nick too short.");
             if(args[0].length > 20) return user.socket.send("Error: Nick too long.");
             if(Object.values(server.users).find(usr => usr.username == args[0])) return user.socket.send("Error: Nick already used.");
-            sendInChannel(`${user.username} changed their nick to ${args[0]}!`, user.channel)
-            user.username = args[0];
+            sendInChannel(`${user.name()} changed their nick to ${args[0]}!`, user.channel)
+            user.nickname = args[0];
         }
     },
     'about': {
@@ -45,7 +45,7 @@ export const commands = {
         aliases: [],
         command: function({user, server, args}) {
             if(args.length < 1) return user.socket.send('Please provide username');
-            if(Object.values(server.users).find(usr => usr.username == args[0])) return user.socket.send('User not found');
+            if(!Object.values(server.users).find(usr => usr.username == args[0])) return user.socket.send('User not found');
             let userFound = Object.values(server.users).find(usr => usr.username == args[0])
             userFound.id = Object.keys(server.users).find(usr => server.users[usr].username == args[0])
             user.socket.send(`${userFound.username}\nClient: ${userFound.client ?? "<Unknown>"}\nID: ${userFound.id}`)
@@ -55,7 +55,7 @@ export const commands = {
         name: 'users',
         aliases: [],
         command: function({user, server, args}) {
-            user.socket.send(`Users${args[0] != "global" ? ` in ${user.channel}` : ""}:\n${Object.values(server.users).filter(usr => (usr.channel == user.channel) || args[0] == "global").map(usr => ` * ${usr.username}`).join("\n")}`)
+            user.socket.send(`Users${args[0] != "global" ? ` in ${user.channel}` : ""}:\n${Object.values(server.users).filter(usr => (usr.channel == user.channel) || args[0] == "global").map(usr => ` * ${usr.name()}`).join("\n")}`)
         }
     },
     'help': {
@@ -65,6 +65,35 @@ export const commands = {
             user.socket.send(`Commands available:\n${Object.values(commands).map(cmd => `* /${cmd.name} (Aliases: ${(cmd.aliases.join(", ")) || "<None>"})`).join("\n")}`)
         }
     },
+    'login': {
+        name: 'login',
+        aliases: ['signin'],
+        command: function({server, args, user, sendInChannel}) {
+            if(args.length < 2) return user.socket.send(`Usage: /login <username> <password>`);
+            if(!server.accounts.checkAccount(args[0])) return user.socket.send(`Account "${args[0]}" not found!`);
+            if(!server.accounts.checkPassword(args[0], args[1])) return user.socket.send(`Password incorrect.`);
+            user.username = args[0];
+            user.nickname = "";
+            user.guest = false;
+            sendInChannel(`${user.name()} logged in as ${args[0]}!`, user.channel)
+        }
+    },
+    'register': {
+        name: 'register',
+        aliases: ['signup'],
+        command: function({server, args, user, sendInChannel}) {
+            if(args.length < 2) return user.socket.send(`Usage: /register <username> <password>`);
+            if(args[0].length < 3)  return user.socket.send(`Username too short!`);
+            if(args[0].length > 20) return user.socket.send(`Username too long!`);
+            if(args[1].length < 6)  return user.socket.send(`Password too short!`);
+            if(server.accounts.checkAccount(args[0])) return user.socket.send(`User with username "${args[0]}" already exists!`);
+            server.accounts.createAccount(args[0], args[1]);
+            user.username = args[0];
+            user.nickname = "";
+            user.guest = false;
+            sendInChannel(`${user.name()} logged in as ${args[0]}!`, user.channel)
+        }
+    },
 }
 
 export function register(cmd, data) {