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

sdfsdfsd

Browse Source
This commit is contained in:
Kbz-8
2024-01-30 00:29:59 +01:00
parent da1f23c294
commit 6a39d88ee7
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
srcs/client.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:35:52 by maldavid #+# #+# */ /* Created: 2024/01/21 10:35:52 by maldavid #+# #+# */
/* Updated: 2024/01/30 00:10:23 by vvaas ### ########.fr */ /* Updated: 2024/01/30 00:29:52 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/

13
srcs/server.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 09:31:17 by maldavid #+# #+# */ /* Created: 2024/01/21 09:31:17 by maldavid #+# #+# */
/* Updated: 2024/01/30 00:17:49 by vvaas ### ########.fr */ /* Updated: 2024/01/30 00:26:39 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -85,6 +85,17 @@ namespace irc
{ {
logs::report(log_message, "User %d disconnected", (*it)->getID()); logs::report(log_message, "User %d disconnected", (*it)->getID());
close((*it)->getFD()); close((*it)->getFD());
for(channel_it cit = _channels.begin(); cit != _channels.end();)
{
cit->removeClient(*it);
if(cit->getNumberOfClients() == 0)
{
logs::report(log_message, "channel '%s' has been destroyed", cit->getName().c_str());
cit = _channels.erase(cit);
}
else
++cit;
}
it = _client.erase(it) - 1; it = _client.erase(it) - 1;
} }
} }

17
srcs/server_functions.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/22 17:31:06 by maldavid #+# #+# */ /* Created: 2024/01/22 17:31:06 by maldavid #+# #+# */
/* Updated: 2024/01/30 00:25:13 by vvaas ### ########.fr */ /* Updated: 2024/01/30 00:29:40 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -303,23 +303,22 @@ namespace irc
logs::report(log_error, "INVITE, invalid command '%s'", msg.getRawMsg().c_str()); logs::report(log_error, "INVITE, invalid command '%s'", msg.getRawMsg().c_str());
return; return;
} }
Channel* channel_target = getChannelByName(msg.getArgs()[1]);
if(channel_target == NULL)
{
client->sendCode(ERR_NOSUCHCHANNEL, "No such channel");
return ;
}
if(!isUserKnown(msg.getArgs()[0])) if(!isUserKnown(msg.getArgs()[0]))
{ {
client->sendCodeInChannel(ERR_NOSUCHNICK, *channel_target, "No such nick"); client->sendCode(ERR_NOSUCHNICK, const_cast<std::string&>(msg.getArgs()[0]) + " no such nick");
return; return;
} }
if(!isChannelKnown(msg.getArgs()[1])) if(!isChannelKnown(msg.getArgs()[1]))
{ {
client->sendCodeInChannel(ERR_NOSUCHCHANNEL, *channel_target, "no such channel"); client->sendCode(ERR_NOSUCHCHANNEL, const_cast<std::string&>(msg.getArgs()[1]) + " no such channel");
return; return;
} }
Channel* channel_target = getChannelByName(msg.getArgs()[1]);
if(channel_target == NULL)
logs::report(log_fatal_error, "(INVITE), cannot get channel '%s' by name; panic !", msg.getArgs()[1].c_str());
unstd::SharedPtr<Client> client_target = getClientByName(msg.getArgs()[0]); unstd::SharedPtr<Client> client_target = getClientByName(msg.getArgs()[0]);
if(client_target.get() == NULL) if(client_target.get() == NULL)
logs::report(log_fatal_error, "(INVITE), cannot get client '%s' by name; panic !", msg.getArgs()[0].c_str()); logs::report(log_fatal_error, "(INVITE), cannot get client '%s' by name; panic !", msg.getArgs()[0].c_str());