aortigos/ft_irc
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'less lines, same code' (#27) from re-factoring-code into main

Browse Source 
Reviewed-on: http://gitea.hadi.es/aortigos/ft_irc/pulls/27
This commit is contained in:
Hadi
2026-05-15 20:09:40 +00:00
parent 3bce66fdd0 e95cd82211
commit 9a2d7919fb
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmds/nick.cpp
View File

@@ -6,7 +6,7 @@
/* By: aortigos <aortigos@student.42malaga.com +#+ +:+ +#+ */ /* By: aortigos <aortigos@student.42malaga.com +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2026/05/10 22:06:22 by aortigos #+# #+# */ /* Created: 2026/05/10 22:06:22 by aortigos #+# #+# */
/* Updated: 2026/05/15 12:49:37 by aortigos ### ########.fr */ /* Updated: 2026/05/15 22:08:10 by aortigos ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -32,12 +32,9 @@ void Server::nick_cmd(User &client, std::istringstream &ss)
std::string args; std::string args;
ss >> args; ss >> args;
if (!client.isAuthenticated()) if (!client.isAuthenticated()) return (client.send(":" SERVER_NAME " 451 * :You have not registered\r\n"));
return (client.send(":" SERVER_NAME " 451 * :You have not registered\r\n")); if (args.empty()) return (client.send(":" SERVER_NAME " 431 * :Not nickname given\r\n"));
if (args.empty()) if (!isValidNick(args)) return (client.send(":" SERVER_NAME " 432 * " + args + " Erroneous nickname\r\n"));
return (client.send(":" SERVER_NAME " 431 * :Not nickname given\r\n"));
if (!isValidNick(args))
return (client.send(":" SERVER_NAME " 432 * " + args + " Erroneous nickname\r\n"));
for (std::map<int, User>::iterator it = clients_.begin(); it != clients_.end(); it++) for (std::map<int, User>::iterator it = clients_.begin(); it != clients_.end(); it++)
{ {
if (it->second.getNick() == args) if (it->second.getNick() == args)

12
cmds/pass.cpp
View File

@@ -6,7 +6,7 @@
/* By: aortigos <aortigos@student.42malaga.com +#+ +:+ +#+ */ /* By: aortigos <aortigos@student.42malaga.com +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2026/05/10 22:06:22 by aortigos #+# #+# */ /* Created: 2026/05/10 22:06:22 by aortigos #+# #+# */
/* Updated: 2026/05/14 20:21:31 by aortigos ### ########.fr */ /* Updated: 2026/05/15 22:08:49 by aortigos ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -17,13 +17,11 @@ void Server::pass_cmd(User &client, std::istringstream &ss)
std::string args; std::string args;
ss >> args; ss >> args;
if (args.empty()) if (args.empty()) return (client.send(":" SERVER_NAME " 461 * PASS :Not enough parameters\r\n"));
return (client.send(":" SERVER_NAME " 461 * PASS :Not enough parameters\r\n")); if (client.isAuthenticated()) return (client.send(":" SERVER_NAME " 462 " + client.getNick() + " :Unauthorized command (already registered)\r\n"));
if (client.isAuthenticated())
return (client.send(":" SERVER_NAME " 462 " + client.getNick() + " :Unauthorized command (already registered)\r\n"));
if (this->password_ == args) if (this->password_ == args)
client.setAuthenticated(true); client.setAuthenticated(true);
else { else
client.send(":" SERVER_NAME " 464 * :Password incorrect\r\n"); client.send(":" SERVER_NAME " 464 * :Password incorrect\r\n");
} }
}

8
cmds/user.cpp
View File

@@ -6,7 +6,7 @@
/* By: aortigos <aortigos@student.42malaga.com +#+ +:+ +#+ */ /* By: aortigos <aortigos@student.42malaga.com +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2026/05/10 22:06:22 by aortigos #+# #+# */ /* Created: 2026/05/10 22:06:22 by aortigos #+# #+# */
/* Updated: 2026/05/15 12:49:49 by aortigos ### ########.fr */ /* Updated: 2026/05/15 22:08:59 by aortigos ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -22,10 +22,8 @@ void Server::user_cmd(User &client, std::istringstream &ss)
ss >> username >> hostname >> servername; ss >> username >> hostname >> servername;
std::getline(ss, realname); std::getline(ss, realname);
if (!client.isAuthenticated()) if (!client.isAuthenticated()) return (client.send(":" SERVER_NAME " 451 * :You have not registered\r\n"));
return (client.send(":" SERVER_NAME " 451 * :You have not registered\r\n")); if (client.isRegistered()) return (client.send(":" SERVER_NAME " 462 " + client.getNick() + " :Unauthorized command (already registered)\r\n"));
if (client.isRegistered())
return (client.send(":" SERVER_NAME " 462 " + client.getNick() + " :Unauthorized command (already registered)\r\n"));
if (!realname.empty() && realname[0] == ' ') if (!realname.empty() && realname[0] == ' ')
realname = realname.substr(1); realname = realname.substr(1);