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:06:37 +01:00
parent 6bb885a845
commit 9663cf6398
3 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
srcs/channel.cpp
View File

@@ -6,11 +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 upstream /* Updated: 2024/01/30 21:06:03 by maldavid ### ########.fr */
/* Updated: 2024/01/30 21:01:06 by maldavid ### ########.fr */
=======
/* Updated: 2024/01/30 20:39:37 by vvaas ### ########.fr */
>>>>>>> Stashed changes
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -75,18 +71,13 @@ namespace irc
client->sendCode(ERR_USERNOTINCHANNEL, "User not in channel"); client->sendCode(ERR_USERNOTINCHANNEL, "User not in channel");
} }
<<<<<<< Updated upstream
bool Channel::removeClient(unstd::SharedPtr<Client> client, const std::string& reason, bool quit) bool Channel::removeClient(unstd::SharedPtr<Client> client, const std::string& reason, bool quit)
=======
bool Channel::removeClient(unstd::SharedPtr<Client> client)
>>>>>>> Stashed changes
{ {
if(!_clients.erase(client)) if(!_clients.erase(client))
return (false); return (false);
if(isOp(client)) if(isOp(client))
_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)
<<<<<<< Updated upstream
{ {
if(!quit) if(!quit)
const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "PART", _name + ' ' + reason); const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "PART", _name + ' ' + reason);
@@ -96,11 +87,6 @@ namespace irc
if(!quit) if(!quit)
client->sendMsg(client->getNickName(), "PART", _name + ' ' + reason); client->sendMsg(client->getNickName(), "PART", _name + ' ' + reason);
return true; return true;
=======
const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "PART", _name);
client->sendMsg(client->getNickName(), "PART", _name);
return (true);
>>>>>>> Stashed changes
} }
void Channel::sendWho(unstd::SharedPtr<Client> client) void Channel::sendWho(unstd::SharedPtr<Client> client)

6
srcs/server.cpp
View File

@@ -6,11 +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 upstream /* Updated: 2024/01/30 21:06:26 by maldavid ### ########.fr */
/* Updated: 2024/01/30 20:58:31 by maldavid ### ########.fr */
=======
/* Updated: 2024/01/30 20:27:37 by vvaas ### ########.fr */
>>>>>>> Stashed changes
/* */ /* */
/******************************************************************************/ /******************************************************************************/

6
srcs/server_functions.cpp
View File

@@ -6,11 +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 upstream /* Updated: 2024/01/30 21:05:17 by maldavid ### ########.fr */
/* Updated: 2024/01/30 21:01:20 by maldavid ### ########.fr */
=======
/* Updated: 2024/01/30 20:39:22 by vvaas ### ########.fr */
>>>>>>> Stashed changes
/* */ /* */
/******************************************************************************/ /******************************************************************************/