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

etienne a pas les pizzas

Browse Source
This commit is contained in:
Kbz-8
2024-01-25 23:05:59 +01:00
parent 897a41f2b5
commit b07f2a7a22
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/channel.hpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:34:25 by maldavid #+# #+# */ /* Created: 2024/01/21 10:34:25 by maldavid #+# #+# */
/* Updated: 2024/01/25 21:21:19 by maldavid ### ########.fr */ /* Updated: 2024/01/25 23:04:45 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -64,7 +64,7 @@ namespace irc
private: private:
std::set<unstd::SharedPtr<Client>, ClientCmp> _clients; std::set<unstd::SharedPtr<Client>, ClientCmp> _clients;
std::set<unstd::SharedPtr<Client>, ClientCmp> _operators; std::set<unstd::SharedPtr<Client>, ClientCmp> _operators;
const std::string _name; std::string _name;
std::string _password; std::string _password;
std::string _topic; std::string _topic;
int _channel_size; int _channel_size;

42
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/25 22:04:39 by vvaas ### ########.fr */ /* Updated: 2024/01/25 23:01:42 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -110,36 +110,32 @@ namespace irc
logs::report(log_error, "PART, invalid channel name '%s'", msg.getTokens()[1].c_str()); logs::report(log_error, "PART, invalid channel name '%s'", msg.getTokens()[1].c_str());
return; return;
} }
if(!isChannelKnown(msg.getArgs()[0]))
for(std::string::const_iterator it = msg.getTokens()[1].begin(); it != msg.getTokens()[1].end(); ++it)
{ {
if((it == msg.getTokens()[1].begin() || *(it - 1) == ',') && std::strchr("&#", *it) == NULL) client->sendCode(ERR_NOSUCHCHANNEL, msg.getArgs()[0] + " no such channel");
{
logs::report(log_error, "PART, invalid channel name '%s'", msg.getTokens()[1].c_str());
return;
}
}
channel_it chit;
for(chit = _channels.begin(); chit != _channels.end(); ++chit)
{
if(msg.getTokens()[1] == chit->getName())
break;
}
if(chit == _channels.end())
{
client->sendCode(ERR_NOSUCHCHANNEL, "NO such channel");
return; return;
} }
if(!chit->removeClient(client)) Channel* channel = getChannelByName(msg.getArgs()[0]);
if(channel == NULL)
logs::report(log_fatal_error, "(KICK), cannot get channel '%s' by name; panic !", channel->getName().c_str());
if(!channel->removeClient(client))
{ {
client->sendCode(ERR_NOTONCHANNEL, "Not on channel"); client->sendCode(ERR_NOTONCHANNEL, "Not on channel");
return; return;
} }
client->printUserHeader(); client->printUserHeader();
std::cout << "leaving channel, " << msg.getTokens()[1] << std::endl; std::cout << "leaving channel, " << msg.getArgs()[0] << std::endl;
if(chit->getNumberOfClients() == 0) if(channel->getNumberOfClients() == 0)
logs::report(log_message, "channel '%s' has been destroyed", chit->getName().c_str()); {
channel_it it;
for(it = _channels.begin(); it < _channels.end(); ++it)
{
if(it->getName() == msg.getArgs()[0])
break;
}
_channels.erase(it);
logs::report(log_message, "channel '%s' has been destroyed", channel->getName().c_str());
}
} }
void Server::handleJoin(unstd::SharedPtr<class Client> client, const Message& msg) void Server::handleJoin(unstd::SharedPtr<class Client> client, const Message& msg)