From 66bd57bfde30d037f3c7db49d27ce70d2fecd856 Mon Sep 17 00:00:00 2001
From: aortigos <aortigos@student.42malaga.com>
Date: Sat, 16 May 2026 11:47:45 +0200
Subject: [PATCH] Improving commands and added quit

---
 Makefile          |  2 +-
 Server/Server.cpp | 16 ++++++++++++++--
 Server/Server.hpp |  5 ++++-
 User/User.cpp     | 22 ++++++++++++++++++++++
 User/User.hpp     |  9 +++++++++
 cmds/join.cpp     |  6 +++++-
 cmds/nick.cpp     | 13 +++++++++----
 cmds/privmsg.cpp  |  4 ++--
 cmds/quit.cpp     | 42 ++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 108 insertions(+), 11 deletions(-)
 create mode 100644 cmds/quit.cpp

diff --git a/Makefile b/Makefile
index 142239d..28e2dab 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ NAME = ircserv
 SRC = main.cpp Server/Server.cpp User/User.cpp \
 		Channel/Channel.cpp \
 		cmds/pass.cpp cmds/nick.cpp cmds/user.cpp \
-		cmds/join.cpp cmds/privmsg.cpp \
+		cmds/join.cpp cmds/privmsg.cpp cmds/quit.cpp \
 
 HEADERS = Server/Server.hpp User/User.hpp
 
diff --git a/Server/Server.cpp b/Server/Server.cpp
index 7378a43..890a5c3 100644
--- a/Server/Server.cpp
+++ b/Server/Server.cpp
@@ -6,7 +6,7 @@
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/06 17:19:12 by iherman-          #+#    #+#             */
-/*   Updated: 2026/05/15 22:16:34 by aortigos         ###   ########.fr       */
+/*   Updated: 2026/05/16 11:31:25 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -116,6 +116,7 @@ Server::Server(int port, const std::string& password) :
 	commands_["NICK"] = &Server::nick_cmd;
 	commands_["USER"] = &Server::user_cmd;
 	commands_["JOIN"] = &Server::join_cmd;
+	commands_["QUIT"] = &Server::quit_cmd;
 	commands_["PRIVMSG"] = &Server::privmsg_cmd;
 
 	std::cout << "Server port: " << port_
@@ -151,6 +152,12 @@ void	Server::parseCommand(User& client)
 	
 	args >> command;
 
+	if (command.empty())
+	{
+		client.clearBuffer();
+		return ;
+	}
+
 	std::map<std::string, void (Server::*)(User&, std::istringstream&)>::iterator it = commands_.find(command);
 	if (it == commands_.end())
 	{
@@ -180,7 +187,12 @@ bool	Server::handleClient(User& client)
 		return true;
 	}
 
-	client.appendBuffer(std::string(buffer, recv_amount));
+	std::string	data(buffer, recv_amount);
+	size_t pos = data.find('\r');
+	if (pos != std::string::npos)
+		data.erase(pos, 1);
+
+	client.appendBuffer(data);
 	
 	if (client.getBuffer().find('\n') != std::string::npos)
 		parseCommand(client);
diff --git a/Server/Server.hpp b/Server/Server.hpp
index 1cfe7ce..9cf9cd1 100644
--- a/Server/Server.hpp
+++ b/Server/Server.hpp
@@ -6,7 +6,7 @@
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/06 17:18:11 by iherman-          #+#    #+#             */
-/*   Updated: 2026/05/15 22:16:07 by aortigos         ###   ########.fr       */
+/*   Updated: 2026/05/16 11:45:11 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,6 +25,8 @@
 # include <cctype>
 # include <sstream>
 
+# include <unistd.h>
+
 # include "../User/User.hpp"
 # include "../Channel/Channel.hpp"
 
@@ -64,6 +66,7 @@ class Server
 		void	user_cmd(User &client, std::istringstream &ss);
 		void	join_cmd(User &client, std::istringstream &ss);
 		void	privmsg_cmd(User &client, std::istringstream &ss);
+		void	quit_cmd(User &client, std::istringstream &ss);
 
 
 	public:
diff --git a/User/User.cpp b/User/User.cpp
index 34b2ef2..8be3a76 100644
--- a/User/User.cpp
+++ b/User/User.cpp
@@ -43,6 +43,7 @@ User& User::operator=(const User &other)
         buffer = other.buffer;
         authenticated = other.authenticated;
         registered = other.registered;
+        channels_ = other.channels_;
     }
     // std::cout << "User copy assignment operator called" << std::endl;
     return (*this);
@@ -59,6 +60,27 @@ void    User::send(const std::string &msg)
     ::send(fd, msg.c_str(), msg.size(), 0);
 }
 
+// Channels
+void		User::joinChannel(const std::string &channel)
+{
+    channels_.insert(channel);
+}
+
+void		User::leaveChannel(const std::string &channel)
+{
+    channels_.erase(channel);
+}
+
+bool        User::isInChannel(const std::string &channel) const
+{
+    return (channels_.count(channel) > 0);
+}
+
+const		std::set<std::string> &User::getChannels() const
+{
+    return (channels_);
+}
+
 // Getters
 
 int			User::getFd() const				{ return (this->fd); }
diff --git a/User/User.hpp b/User/User.hpp
index 73dedc6..92a8214 100644
--- a/User/User.hpp
+++ b/User/User.hpp
@@ -16,6 +16,7 @@
 
 # include <iostream>
 # include <sys/socket.h>
+# include <set>
 
 class User
 {
@@ -28,6 +29,8 @@ class User
         bool		authenticated;
         bool		registered;
 
+        std::set<std::string> channels_;
+
     public:
         User();
         User(int fd);
@@ -37,6 +40,12 @@ class User
 
         void	send(const std::string &msg);
 
+        // Channels
+        void		joinChannel(const std::string &channel);
+		void		leaveChannel( const std::string &channel);
+		bool        isInChannel(const std::string &channel) const;
+		const		std::set<std::string> &getChannels() const;
+
         // Getters
 
         int			getFd() const;
diff --git a/cmds/join.cpp b/cmds/join.cpp
index 5e0b822..1b491a5 100644
--- a/cmds/join.cpp
+++ b/cmds/join.cpp
@@ -6,7 +6,7 @@
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/15 15:35:16 by aortigos          #+#    #+#             */
-/*   Updated: 2026/05/15 22:18:52 by aortigos         ###   ########.fr       */
+/*   Updated: 2026/05/16 11:22:00 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,6 +28,7 @@ void	Server::join_cmd(User &client, std::istringstream &ss)
 		channels_[args] = Channel(args);
 		channels_[args].addMember(client.getFd());
 		channels_[args].addOperator(client.getFd());
+		client.joinChannel(args);
 		return (client.send("Channel created\r\n"));
 	}
 	else
@@ -35,6 +36,9 @@ void	Server::join_cmd(User &client, std::istringstream &ss)
 		if (it->second.hasMember(client.getFd()))
 			client.send("You are already in this channel\r\n");
 		else
+		{
+			client.joinChannel(it->first);
 			it->second.addMember(client.getFd());
+		}
 	}
 }
diff --git a/cmds/nick.cpp b/cmds/nick.cpp
index 4b7a794..e87f8ea 100644
--- a/cmds/nick.cpp
+++ b/cmds/nick.cpp
@@ -6,7 +6,7 @@
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/10 22:06:22 by aortigos          #+#    #+#             */
-/*   Updated: 2026/05/15 23:04:35 by aortigos         ###   ########.fr       */
+/*   Updated: 2026/05/16 11:12:12 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -46,9 +46,14 @@ void	Server::nick_cmd(User &client, std::istringstream &ss)
 
 	if (client.isRegistered())
 	{
-		// Change nick to an already registered user
-		// Send message to his channels
-		//client.broadcast(":" + oldNick + "!~" + client.getUsername() + "@hostt NICK " + args + "\r\n");
+		std::string msg = ":" + oldNick + " NICK " + args + "\r\n";
+		const std::set<std::string> &userChannels = client.getChannels();
+		for (std::set<std::string>::const_iterator it = userChannels.begin(); it != userChannels.end(); it++)
+		{
+			std::map<std::string, Channel>::iterator ch = channels_.find(*it);
+			if (ch != channels_.end())
+				ch->second.broadcast(msg, clients_, -1);
+		}
 		return ;
 	}
 
diff --git a/cmds/privmsg.cpp b/cmds/privmsg.cpp
index d57d3a7..4285738 100644
--- a/cmds/privmsg.cpp
+++ b/cmds/privmsg.cpp
@@ -6,7 +6,7 @@
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/15 15:35:16 by aortigos          #+#    #+#             */
-/*   Updated: 2026/05/15 23:09:57 by aortigos         ###   ########.fr       */
+/*   Updated: 2026/05/16 11:28:47 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -36,6 +36,6 @@ void	Server::privmsg_cmd(User &client, std::istringstream &ss)
 	if (message[0] == ' ')
 		message = message.substr(1);
 	
-	std::string	msg = ":" + client.getNick() + " PRIVMSG " + channel + " :" + message + "\r\n";
+	std::string	msg = ":" + client.getNick() + "!" + client.getUsername() + "@localhost PRIVMSG " + channel + " :" + message + "\r\n";
 	return (it->second.broadcast(msg, clients_, client.getFd()));
 }
diff --git a/cmds/quit.cpp b/cmds/quit.cpp
new file mode 100644
index 0000000..2e43e50
--- /dev/null
+++ b/cmds/quit.cpp
@@ -0,0 +1,42 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   quit.cpp                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2026/05/15 15:35:16 by aortigos          #+#    #+#             */
+/*   Updated: 2026/05/16 11:46:45 by aortigos         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+
+#include "../Server/Server.hpp"
+
+void	Server::quit_cmd(User &client, std::istringstream &ss)
+{
+	std::string	reason;
+
+	std::getline(ss, reason);
+
+	if (!reason.empty() && reason[0] == ' ')
+		reason = reason.substr(1);
+	if (!reason.empty() && reason[0] == ':')
+		reason = reason.substr(1);
+	if (reason.empty())
+		reason = "Leaving";
+
+	std::string	msg = ":" + client.getNick() + "!" + client.getUsername() + "@localhost QUIT :" + reason + "\r\n";
+	
+	const std::set<std::string> channels = client.getChannels();
+	for (std::set<std::string>::const_iterator it = channels.begin(); it != channels.end(); it++)
+	{
+		std::map<std::string, Channel>::iterator ch = channels_.find(*it);
+		if (ch != channels_.end())
+		{
+			ch->second.broadcast(msg, clients_, client.getFd());
+			ch->second.removeMember(client.getFd());
+		}
+	}
+	close(client.getFd());
+}
-- 
2.49.1