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

gros CAC

Browse Source
This commit is contained in:
Namonay
2024-01-24 00:44:09 +01:00
parent 1cf52ef8b0
commit 18f355b960
3 changed files with 18 additions and 21 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/23 17:35:49 by maldavid ### ########.fr */ /* Updated: 2024/01/24 00:42:16 by vvaas ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -17,6 +17,7 @@
#include <set> #include <set>
#include <unstd/shared_ptr.hpp> #include <unstd/shared_ptr.hpp>
#include <client.hpp> #include <client.hpp>
#include <message.hpp>
namespace irc namespace irc
{ {
@@ -37,6 +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); void addClient(unstd::SharedPtr<Client> client);
void addClient(unstd::SharedPtr<Client> client, bool op);
bool removeClient(unstd::SharedPtr<Client> client); bool removeClient(unstd::SharedPtr<Client> client);
inline std::size_t getNumberOfClients() const { return _clients.size(); } inline std::size_t getNumberOfClients() const { return _clients.size(); }

14
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/23 23:55:17 by vvaas ### ########.fr */ /* Updated: 2024/01/24 00:42:13 by vvaas ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -29,6 +29,18 @@ namespace irc
for(std::set<unstd::SharedPtr<Client> >::iterator it = _clients.begin(); it != _clients.end(); ++it) for(std::set<unstd::SharedPtr<Client> >::iterator it = _clients.begin(); it != _clients.end(); ++it)
const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "JOIN", _name); const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "JOIN", _name);
} }
void Channel::addClient(unstd::SharedPtr<Client> client, bool op)
{
if (!_clients.insert(client).second)
{
client->sendCode(ERR_USERONCHANNEL, "You are already in the channel");
return ;
}
if (op)
_operators.insert(client);
for(std::set<unstd::SharedPtr<Client> >::iterator it = _clients.begin(); it != _clients.end(); ++it)
const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "JOIN", _name);
}
bool Channel::removeClient(unstd::SharedPtr<Client> client) bool Channel::removeClient(unstd::SharedPtr<Client> client)
{ {

21
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/24 00:23:29 by vvaas ### ########.fr */ /* Updated: 2024/01/24 00:43:01 by vvaas ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -157,7 +157,7 @@ namespace irc
logs::report(log_message, "channel '%s' has been created", msg.getTokens()[1].c_str()); logs::report(log_message, "channel '%s' has been created", msg.getTokens()[1].c_str());
} }
else else
it->addClient(client); it->addClient(client, true);
client->printUserHeader(); client->printUserHeader();
std::cout << "joining new channel, " << msg.getTokens()[1] << std::endl; std::cout << "joining new channel, " << msg.getTokens()[1] << std::endl;
} }
@@ -211,23 +211,6 @@ namespace irc
logs::report(log_error, "TOPIC, invalid channel name '%s'", msg.getTokens()[1].c_str()); logs::report(log_error, "TOPIC, invalid channel name '%s'", msg.getTokens()[1].c_str());
return; return;
} }
std::vector<Channel>::iterator it;
for(it = _channels.begin(); it != _channels.end(); ++it)
{
if(msg.getTokens()[1] == it->getName())
{
}
}
if(it == _channels.end())
{
_channels.push_back(Channel(msg.getTokens()[1]));
_channels.back().addClient(client);
logs::report(log_message, "channel '%s' has been created", msg.getTokens()[1].c_str());
}
for(std::vector<unstd::SharedPtr<Client> >::iterator it = _client.begin(); it != _client.end(); ++it)
{
}
} }
void Server::handlePing(unstd::SharedPtr<class Client> client, const Message& msg) void Server::handlePing(unstd::SharedPtr<class Client> client, const Message& msg)