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

c est metaphysique

Browse Source
This commit is contained in:
Kbz-8
2024-01-30 21:01:28 +01:00
parent f404f7804c
commit 20fc70ab90
4 changed files with 14 additions and 14 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/30 20:14:08 by maldavid ### ########.fr */ /* Updated: 2024/01/30 20:54:21 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -38,7 +38,7 @@ namespace irc
inline const std::string& getPassword() const { return _password; } inline const std::string& getPassword() const { return _password; }
void addClient(unstd::SharedPtr<Client> client, bool op = false); void addClient(unstd::SharedPtr<Client> client, bool op = false);
bool removeClient(unstd::SharedPtr<Client> client, std::string reason = ""); bool removeClient(unstd::SharedPtr<Client> client, const std::string& reason, bool quit = false);
inline std::size_t getNumberOfClients() const { return _clients.size(); } inline std::size_t getNumberOfClients() const { return _clients.size(); }
inline int getChannelSize() const { return _channel_size; } inline int getChannelSize() const { return _channel_size; }

12
srcs/channel.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:36:21 by maldavid #+# #+# */ /* Created: 2024/01/21 10:36:21 by maldavid #+# #+# */
/* Updated: 2024/01/30 20:50:31 by vvaas ### ########.fr */ /* Updated: 2024/01/30 21:01:06 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -71,7 +71,7 @@ namespace irc
client->sendCode(ERR_USERNOTINCHANNEL, "User not in channel"); client->sendCode(ERR_USERNOTINCHANNEL, "User not in channel");
} }
bool Channel::removeClient(unstd::SharedPtr<Client> client, std::string reason) bool Channel::removeClient(unstd::SharedPtr<Client> client, const std::string& reason, bool quit)
{ {
if(!_clients.erase(client)) if(!_clients.erase(client))
return false; return false;
@@ -79,13 +79,13 @@ namespace irc
_operators.erase(client); _operators.erase(client);
for(client_it it = _clients.begin(); it != _clients.end(); ++it) for(client_it it = _clients.begin(); it != _clients.end(); ++it)
{ {
if(reason.empty()) if(!quit)
const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "PART", _name); const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "PART", _name + ' ' + reason);
else else
const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "QUIT", reason); const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "QUIT", reason);
} }
if(reason.empty()) if(!quit)
client->sendMsg(client->getNickName(), "PART", _name); client->sendMsg(client->getNickName(), "PART", _name + ' ' + reason);
return true; return true;
} }

6
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 18:08:41 by maldavid ### ########.fr */ /* Updated: 2024/01/30 20:58:31 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -48,7 +48,7 @@ namespace irc
void Server::initSocket() void Server::initSocket()
{ {
int opt = 1; int opt = 1;
initSocketData(); initSocketData();
if(setsockopt(_main_socket, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) // SOL_SOCKET : modify socket only, SO_REUSEADDR : Reusable after program ends if(setsockopt(_main_socket, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) // SOL_SOCKET : modify socket only, SO_REUSEADDR : Reusable after program ends
logs::report(log_fatal_error, "setsockopt() error (tout a pete)"); logs::report(log_fatal_error, "setsockopt() error (tout a pete)");
@@ -87,7 +87,7 @@ namespace irc
close((*it)->getFD()); close((*it)->getFD());
for(channel_it cit = _channels.begin(); cit != _channels.end();) for(channel_it cit = _channels.begin(); cit != _channels.end();)
{ {
cit->removeClient(*it); cit->removeClient(*it, "");
if(cit->getNumberOfClients() == 0) if(cit->getNumberOfClients() == 0)
{ {
logs::report(log_message, "channel '%s' has been destroyed", cit->getName().c_str()); logs::report(log_message, "channel '%s' has been destroyed", cit->getName().c_str());

6
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 20:46:24 by vvaas ### ########.fr */ /* Updated: 2024/01/30 21:01:20 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -120,7 +120,7 @@ namespace irc
void Server::handleQuit(unstd::SharedPtr<class Client> client, const Message& msg) void Server::handleQuit(unstd::SharedPtr<class Client> client, const Message& msg)
{ {
for(channel_it it = _channels.begin(); it != _channels.end(); ++it) for(channel_it it = _channels.begin(); it != _channels.end(); ++it)
it->removeClient(client, (msg.getReason().empty() ? "Leaving" : msg.getReason())); it->removeClient(client, (msg.getReason().empty() ? "Leaving" : msg.getReason()), true);
client->printUserHeader(); client->printUserHeader();
std::cout << "quit" << std::endl; std::cout << "quit" << std::endl;
} }
@@ -145,7 +145,7 @@ namespace irc
Channel* channel = getChannelByName(msg.getArgs()[0]); Channel* channel = getChannelByName(msg.getArgs()[0]);
if(channel == NULL) if(channel == NULL)
logs::report(log_fatal_error, "(KICK), cannot get channel '%s' by name; panic !", channel->getName().c_str()); logs::report(log_fatal_error, "(KICK), cannot get channel '%s' by name; panic !", channel->getName().c_str());
if(!channel->removeClient(client)) if(!channel->removeClient(client, (msg.getReason().empty() ? "" : msg.getReason())))
{ {
client->sendCode(ERR_NOTONCHANNEL, "Not on channel"); client->sendCode(ERR_NOTONCHANNEL, "Not on channel");
return; return;