Namonay/42_irc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bot

Browse Source
This commit is contained in:
Namonay
2024-01-30 02:40:37 +01:00
parent 540ebf47b6
commit bbbc4dac16
12 changed files with 233 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/client.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:35:52 by maldavid #+# #+# */
/* Updated: 2024/01/30 00:39:39 by vvaas ### ########.fr */
/* Updated: 2024/01/30 01:41:49 by vvaas ### ########.fr */
/* */
/******************************************************************************/
@@ -25,7 +25,7 @@
namespace irc
{
Client::Client(int fd, sockaddr_in sock, int id) : _s_data(sock), _fd(fd), _id(id), _logged(false), _disconnect_required(false) {}
Client::Client(int fd, sockaddr_in sock, int id) : _s_data(sock), _fd(fd), _id(id), _welcomed(false), _logged(false), _registered(false), _disconnect_required(false) {}
void Client::sendCode(const std::string& code, const std::string& msg)
{

2
srcs/server.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 09:31:17 by maldavid #+# #+# */
/* Updated: 2024/01/30 00:26:39 by maldavid ### ########.fr */
/* Updated: 2024/01/30 01:09:20 by vvaas ### ########.fr */
/* */
/******************************************************************************/

40
srcs/server_functions.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/22 17:31:06 by maldavid #+# #+# */
/* Updated: 2024/01/30 00:40:40 by vvaas ### ########.fr */
/* Updated: 2024/01/30 02:32:17 by vvaas ### ########.fr */
/* */
/******************************************************************************/
@@ -36,6 +36,11 @@ namespace irc
void Server::handleNick(unstd::SharedPtr<class Client> client, const Message& msg)
{
if (msg.getTokens().size() < 2)
{
client->sendCode(ERR_NONICKNAMEGIVEN, "No nickname given");
return;
}
if(msg.getTokens().size() != 2 && msg.getTokens().size() != 3)
{
logs::report(log_error, "NICK, invalid command '%s'", msg.getRawMsg().c_str());
@@ -55,39 +60,56 @@ namespace irc
std::string oldNick = (client->getNickName().size() > 0) ? client->getNickName() : msg.getTokens()[1]; // get nickname before /nick execution inside server (oldNick)
client->printUserHeader();
client->setNewNickName(msg.getTokens()[1]);
client->sendMsg(oldNick, "NICK", msg.getTokens()[1]);
for (client_it it = _client.begin(); it != _client.end(); ++it)
(*it)->sendMsg(oldNick, "NICK", msg.getTokens()[1]);
std::string welcome_msg = "Welcome to yipirc :), " + client->getNickName();
if (client->isLogged())
client->sendCode(RPL_WELCOME, welcome_msg);
client->welcome();
std::cout << "new nickname, " << client->getNickName() << std::endl;
}
void Server::handleUser(unstd::SharedPtr<class Client> client, const Message& msg)
{
if(msg.getTokens().size() != 5)
if(msg.getTokens().size() < 5)
{
client->sendCode(ERR_NEEDMOREPARAMS, "Need more parameters");
logs::report(log_error, "USER, invalid command '%s'", msg.getRawMsg().c_str());
return;
}
if (client->isRegistered())
{
client->sendCode(ERR_ALREADYREGISTRED, "You are already registered");
return ;
}
if (msg.getTokens()[4][0] != ':')
return ;
client->printUserHeader();
client->setNewUserName(msg.getTokens()[1]);
std::cout << "new username, " << client->getUserName() << std::endl;
client->printUserHeader();
client->setNewRealName(msg.getTokens()[4]);
std::string realname;
for (std::vector<std::string>::const_iterator it = msg.getTokens().begin() + 4; it != msg.getTokens().end(); ++it)
{
realname.append(*it);
realname.append(" ");
}
realname.erase(realname.begin());
realname.erase(realname.end() - 1);
client->setNewRealName(realname);
std::cout << "new realname, " << client->getRealName() << std::endl;
}
void Server::handlePass(unstd::SharedPtr<class Client> client, const Message& msg)
{
std::string welcome_msg = "Welcone to yipirc :), " + client->getNickName();
std::string welcome_msg = "Welcome to yipirc :), " + client->getNickName();
if(client->isLogged())
return;
if(msg.getTokens()[1] == _password)
{
client->login();
if (client->getNickName().size() != 0)
client->sendCode(RPL_WELCOME, welcome_msg);
client->welcome();
}
else
{