diff --git a/Makefile b/Makefile index 386c3a3..d5533d0 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ -#******************************************************************************# +# **************************************************************************** # # # # ::: :::::::: # # Makefile :+: :+: :+: # # +:+ +:+ +:+ # -# By: omoudni +#+ +:+ +#+ # +# By: sben-tay +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/05/02 15:40:00 by rparodi #+# #+# # -# Updated: 2025/06/05 22:54:26 by rparodi ### ########.fr # +# Updated: 2025/06/08 21:10:25 by sben-tay ### ########.fr # # # -#******************************************************************************# +# **************************************************************************** # # Name @@ -35,6 +35,7 @@ SRC = sources/channel/channel.cpp \ sources/commands/ping.cpp \ sources/commands/pong.cpp \ sources/commands/privmsg.cpp \ + sources/commands/userCmd.cpp \ sources/core/PollManager.cpp \ sources/core/Server.cpp \ sources/core/check.cpp \ diff --git a/diagram.puml b/diagram.puml index dc9e88b..d1851b0 100644 --- a/diagram.puml +++ b/diagram.puml @@ -149,6 +149,9 @@ package "Command" <> { class UNKNOWN { + execute(user : User, args : vector) : void } + class CAP { + + execute(user : User, args : vector) : void + } } ' ======================== diff --git a/include/commands.hpp b/include/commands.hpp index a133468..206f5b1 100644 --- a/include/commands.hpp +++ b/include/commands.hpp @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* commands.hpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ +/* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/20 23:31:58 by rparodi #+# #+# */ -/* Updated: 2025/06/05 22:55:54 by rparodi ### ########.fr */ +/* Updated: 2025/06/08 22:19:40 by sben-tay ### ########.fr */ /* */ /* ************************************************************************** */ @@ -60,7 +60,9 @@ namespace cmd class Quit; class Topic; class Unknown; - class cmdUser; + class userCmd; + class Pass; + class Cap; }; #include "./commands/commands.tpp" diff --git a/include/commands/cap.hpp b/include/commands/cap.hpp new file mode 100644 index 0000000..ca66fd1 --- /dev/null +++ b/include/commands/cap.hpp @@ -0,0 +1,21 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* cap.hpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: sben-tay +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/06/08 22:08:44 by sben-tay #+# #+# */ +/* Updated: 2025/06/08 22:16:14 by sben-tay ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#pragma once + +#include "commands.hpp" + +class cmd::Cap : public ACommand { + public: + Cap(User *user, Channel *channel, Server *server, const std::string &line) : ACommand(user, channel, server, line) {} + virtual void execute(); +}; \ No newline at end of file diff --git a/include/commands/nick.hpp b/include/commands/nick.hpp index 5d2433a..ee2234a 100644 --- a/include/commands/nick.hpp +++ b/include/commands/nick.hpp @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* nick.hpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ +/* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/24 17:17:31 by rparodi #+# #+# */ -/* Updated: 2025/06/02 00:40:18 by rparodi ### ########.fr */ +/* Updated: 2025/06/08 22:13:30 by sben-tay ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,5 +18,5 @@ class cmd::Nick : public ACommand { public: Nick(User *user, Channel *channel, Server *server, const std::string &line) : ACommand(user, channel, server, line) {} virtual void execute(void); - virtual e_code checkArgs(); + virtual e_code checkArgs(void); }; diff --git a/include/commands/userCmd.hpp b/include/commands/userCmd.hpp new file mode 100644 index 0000000..d27efe1 --- /dev/null +++ b/include/commands/userCmd.hpp @@ -0,0 +1,22 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* userCmd.hpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: sben-tay +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/06/08 19:19:47 by sben-tay #+# #+# */ +/* Updated: 2025/06/08 22:02:24 by sben-tay ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#pragma once + +#include "commands.hpp" + +class cmd::userCmd : public ACommand { + public: + userCmd(User *user, Channel *channel, Server *server, const std::string &line) : ACommand(user, channel, server, line) {} + virtual void execute(); + virtual e_code checkArgs(); +}; \ No newline at end of file diff --git a/include/user.hpp b/include/user.hpp index a002556..13cf52b 100644 --- a/include/user.hpp +++ b/include/user.hpp @@ -1,14 +1,14 @@ -/******************************************************************************/ +/* ************************************************************************** */ /* */ /* ::: :::::::: */ /* user.hpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: omoudni +#+ +:+ +#+ */ +/* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/20 21:57:49 by rparodi #+# #+# */ -/* Updated: 2025/05/29 12:37:11 by rparodi ### ########.fr */ +/* Updated: 2025/06/08 21:59:53 by sben-tay ### ########.fr */ /* */ -/******************************************************************************/ +/* ************************************************************************** */ #pragma once @@ -26,6 +26,7 @@ class User std::string _username; bool _hasNick; bool _hasUser; + bool _hasPass; // to check if the user has sent a PASS command public: User(short unsigned fd); @@ -40,4 +41,17 @@ class User void setNickname(const std::string &nickname); void setUsername(const std::string &username); void checkRegistration(); + + // setters and getters + void setHasNick(bool value); + void setHasUser(bool value); + void setHasPass(bool value); + bool getHasPass() const; + std::string getNickname() const; + + bool hasDataToSend() const; + std::string getWriteBuffer() const; + void clearWriteBuffer(); + + std::string getPrefix() const; }; diff --git a/sources/commands/cap.cpp b/sources/commands/cap.cpp new file mode 100644 index 0000000..a30f546 --- /dev/null +++ b/sources/commands/cap.cpp @@ -0,0 +1,31 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* cap.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: sben-tay +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/06/08 22:10:24 by sben-tay #+# #+# */ +/* Updated: 2025/06/08 22:16:23 by sben-tay ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "cap.hpp" +#include "logs.hpp" + +using namespace cmd; + +cmd::Cap::Cap(User *user, Channel *channel, Server *server, const std::string &line) + : ACommand(user, channel, server, line) +{ + _args = split(line); + _command = "CAP"; +} + +void cmd::Cap::execute() { + if (_args.size() >= 2 && _args[1] == "LS") { + std::string reply = "CAP * LS :\r\n"; + _sender->appendToWriteBuffer(reply); + DEBUG_MSG("Replied to CAP LS"); + } +} diff --git a/sources/commands/commands.cpp b/sources/commands/commands.cpp index 9c1ce9a..467924b 100644 --- a/sources/commands/commands.cpp +++ b/sources/commands/commands.cpp @@ -1,12 +1,12 @@ -/* ************************************************************************** */ + /* ************************************************************************** */ /* */ /* ::: :::::::: */ /* commands.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ +/* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/24 16:11:56 by rparodi #+# #+# */ -/* Updated: 2025/06/03 16:46:58 by rparodi ### ########.fr */ +/* Updated: 2025/06/08 20:20:11 by sben-tay ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,9 @@ #include "logs.hpp" #include "pass.hpp" #include "ping.hpp" +#include "nick.hpp" +#include "userCmd.hpp" + /** * @brief To send the line where a command is invoqued to execute @@ -68,6 +71,11 @@ void cmd::dispatch(::User *user, Channel *channel, Server *server, const std::st return; } switch (command_name[0]) { + case 'c': + if (command_name == "CAP") { + Cap(user, channel, server, line).execute(); + } + break; case 'i': // if (command_name == "invite") { // Invite(user, channel, server, line).execute(); @@ -94,23 +102,28 @@ void cmd::dispatch(::User *user, Channel *channel, Server *server, const std::st // } break; case 'n': - // if (command_name == "nick") { - // Nick(user, channel, server, line).execute(); + if (command_name == "NICK") { + Nick(user, channel, server, line).execute(); // } else if (command_name == "notice") { // Notice(user, channel, server, line).execute(); - // } + } break; case 'p': - if (command_name == "pass") { + if (command_name == "PASS") { Pass(user, channel, server, line).execute(); } - if (command_name == "ping") { + if (command_name == "PING") { Ping(user, channel, server, line).execute(); } // if (command_name == "part") { // Part(user, channel, server, line).execute(); // } break; + case 'u': + if (command_name == "USER") { + userCmd(user, channel, server, line).execute(); + } + break; default: WARNING_MSG("Unknown command: " << command_name); } diff --git a/sources/commands/nick.cpp b/sources/commands/nick.cpp index 2227526..c54fd10 100644 --- a/sources/commands/nick.cpp +++ b/sources/commands/nick.cpp @@ -3,32 +3,30 @@ /* ::: :::::::: */ /* nick.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ +/* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ -/* Updated: 2025/06/05 22:48:17 by rparodi ### ########.fr */ +/* Updated: 2025/06/08 22:18:49 by sben-tay ### ########.fr */ /* */ /* ************************************************************************** */ #include "nick.hpp" -#include "commands.hpp" #include "logs.hpp" using namespace cmd; -e_code Nick::checkArgs() { - if (this->_uTarget->isRegistered() == false) { - WARNING_MSG("User is not registered for Nick command"); - INFO_MSG("You can only Nick registered users"); - return ERR_NOSUCHNICK; +e_code cmd::Nick::checkArgs() { + if (_args.size() < 2 || _args[1].empty()) { + WARNING_MSG("Nick: Not enough arguments"); + return ERR_NONICKNAMEGIVEN; } - if (_args.size() < 2) { - WARNING_MSG("Not enough arguments for Nick command"); - return ERR_NEEDMOREPARAMS; + if (_sender->isRegistered()) { + WARNING_MSG(_sender->getName() << " is already registered"); + return ERR_ALREADYREGISTERED; } - _uTarget = searchList(this->_users, _args.at(1)); - if (this->_uTarget != NULL) { - WARNING_MSG(_uTarget->getName() << " is already taken") + User* existing = searchList(_users, _args[1]); // à adapter si besoin + if (existing != NULL) { + WARNING_MSG("Nick already in use: " << _args[1]); return ERR_NICKNAMEINUSE; } return _PARSING_OK; @@ -38,10 +36,13 @@ e_code Nick::checkArgs() { * @brief Execute the Nick command * @note To change the nickname of the user */ -void Nick::execute() { +void cmd::Nick::execute() { if (checkArgs() == _PARSING_OK) { ERROR_MSG("Invalid arguments for Nick command (see warning message)"); return; } - // check how the com + DEBUG_MSG("Setting nickname to " << _args[1]); + _sender->setNickname(_args[1]); + _sender->setHasNick(true); + _sender->checkRegistration(); } diff --git a/sources/commands/pass.cpp b/sources/commands/pass.cpp index bd8a8d2..128fef9 100644 --- a/sources/commands/pass.cpp +++ b/sources/commands/pass.cpp @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* pass.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ +/* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ -/* Updated: 2025/06/04 23:59:57 by rparodi ### ########.fr */ +/* Updated: 2025/06/08 20:10:47 by sben-tay ### ########.fr */ /* */ /* ************************************************************************** */ @@ -33,6 +33,7 @@ e_code Pass::checkArgs() { * @brief Execute the Pass command * @note To connect a user with the password */ + void Pass::execute() { if (checkArgs() == _PARSING_OK) { ERROR_MSG("Invalid arguments for Pass command (see warning message)"); @@ -44,5 +45,5 @@ void Pass::execute() { ERROR_MSG("The password is incorrect"); return; } - _sender->setRegistered(); + _sender->setHasPass(true); } diff --git a/sources/commands/ping.cpp b/sources/commands/ping.cpp index a5c2e36..9ef7b27 100644 --- a/sources/commands/ping.cpp +++ b/sources/commands/ping.cpp @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* ping.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ +/* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ -/* Updated: 2025/06/04 23:54:56 by rparodi ### ########.fr */ +/* Updated: 2025/06/08 20:13:52 by sben-tay ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,6 +30,7 @@ e_code Ping::checkArgs() { * @brief Execute the Ping * @note To send a private message to a user / a channel */ + void Ping::execute() { clock_t start = clock() / CLOCKS_PER_SEC; if (checkArgs() == _PARSING_OK) { @@ -38,5 +39,4 @@ void Ping::execute() { } clock_t diff = Pong().answer(start); INFO_MSG(diff); - // check how the com } diff --git a/sources/commands/userCmd.cpp b/sources/commands/userCmd.cpp new file mode 100644 index 0000000..d29f57a --- /dev/null +++ b/sources/commands/userCmd.cpp @@ -0,0 +1,40 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* userCmd.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: sben-tay +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/06/08 19:16:10 by sben-tay #+# #+# */ +/* Updated: 2025/06/08 22:19:02 by sben-tay ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "userCmd.hpp" +#include "logs.hpp" + +using namespace cmd; + +e_code cmd::userCmd::checkArgs() { + if (_args.size() < 5) { + WARNING_MSG("USER: Not enough parameters"); + return ERR_NEEDMOREPARAMS; + } + if (_sender->isRegistered()) { + WARNING_MSG(_sender->getName() << " is already registered"); + return ERR_ALREADYREGISTERED; + } + return _PARSING_OK; +} + +void cmd::userCmd::execute() { + if (checkArgs() != _PARSING_OK) { + ERROR_MSG("USER: bad args"); + return; + } + + DEBUG_MSG("Setting username to " << _args[1]); + _sender->setUsername(_args[1]); + _sender->setHasUser(true); + _sender->checkRegistration(); +} diff --git a/sources/user/user.cpp b/sources/user/user.cpp index 5287c7d..e17cd32 100644 --- a/sources/user/user.cpp +++ b/sources/user/user.cpp @@ -1,19 +1,20 @@ -/******************************************************************************/ +/* ************************************************************************** */ /* */ /* ::: :::::::: */ /* user.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: omoudni +#+ +:+ +#+ */ +/* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/21 20:37:12 by omoudni #+# #+# */ -/* Updated: 2025/05/29 13:30:51 by rparodi ### ########.fr */ +/* Updated: 2025/06/08 21:41:26 by sben-tay ### ########.fr */ /* */ -/******************************************************************************/ +/* ************************************************************************** */ #include "core.hpp" // Constructor -User::User(short unsigned int fd) : _fd(fd), _registered(false), _hasNick(false), _hasUser(false) {} +User::User(short unsigned int fd) : _fd(fd), _registered(false), _hasNick(false), _hasUser(false), \ + _hasPass(false) {} /** * @brief Getter for the fd @@ -82,9 +83,13 @@ void User::appendToWriteBuffer(const std::string &data) // Check registration void User::checkRegistration() { - if (!_registered && _hasNick && _hasUser) + if (!_registered && _hasNick && _hasUser && _hasPass) { _registered = true; + std::string welcome = ":localhost 001 " + _nickname + + " :Welcome to the IRC server " + getPrefix() + "\r\n"; + + appendToWriteBuffer(welcome); } } @@ -109,3 +114,23 @@ std::string User::extractFullCommand() { } return command; } + +void User::setHasNick(bool value) { _hasNick = value; } + +void User::setHasUser(bool value) { _hasUser = value; } + +void User::setHasPass(bool value) { _hasPass = value; } + +bool User::getHasPass() const { return _hasPass; } + +std::string User::getNickname() const { return _nickname; } + +bool User::hasDataToSend() const { return !_write_buffer.empty(); } + +std::string User::getWriteBuffer() const { return _write_buffer; } + +void User::clearWriteBuffer() { _write_buffer.clear(); } + +std::string User::getPrefix() const { + return _nickname + "!" + _username + "@localhost"; +}