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 20:17:08 +01:00
parent 6a4f2adb1f
commit 79b3a8ed26
4 changed files with 32 additions and 27 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 17:23:28 by maldavid ### ########.fr */ /* Updated: 2024/01/30 20:14:08 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); bool removeClient(unstd::SharedPtr<Client> client, std::string reason = "");
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; }

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/30 18:48:32 by vvaas ### ########.fr */ /* Updated: 2024/01/30 20:15:29 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -71,16 +71,22 @@ 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) bool Channel::removeClient(unstd::SharedPtr<Client> client, std::string reason)
{ {
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)
{
if(reason.empty())
const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "PART", _name); const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "PART", _name);
else
const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "QUIT", reason);
}
if(reason.empty())
client->sendMsg(client->getNickName(), "PART", _name); client->sendMsg(client->getNickName(), "PART", _name);
return (true); return true;
} }
void Channel::sendWho(unstd::SharedPtr<Client> client) void Channel::sendWho(unstd::SharedPtr<Client> client)

5
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 18:50:47 by maldavid ### ########.fr */ /* Updated: 2024/01/30 20:13:48 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -119,9 +119,8 @@ namespace irc
void Server::handleQuit(unstd::SharedPtr<class Client> client, const Message& msg) void Server::handleQuit(unstd::SharedPtr<class Client> client, const Message& msg)
{ {
(void)msg;
for(channel_it it = _channels.begin(); it != _channels.end(); ++it) for(channel_it it = _channels.begin(); it != _channels.end(); ++it)
it->removeClient(client); it->removeClient(client, msg.getReason());
client->printUserHeader(); client->printUserHeader();
std::cout << "quit" << std::endl; std::cout << "quit" << std::endl;
} }

30
srcs_bonus/bot.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/30 01:54:56 by vvaas #+# #+# */ /* Created: 2024/01/30 01:54:56 by vvaas #+# #+# */
/* Updated: 2024/01/30 18:34:07 by vvaas ### ########.fr */ /* Updated: 2024/01/30 18:52:24 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -24,7 +24,7 @@ Bot::Bot() : _channel_created(false), _logged(false)
Bot::~Bot() Bot::~Bot()
{ {
if (_fd >= 0) if(_fd >= 0)
close(_fd); close(_fd);
} }
@@ -35,12 +35,12 @@ void Bot::init()
_connect_commands.push_back("USER greg_Bot 0 * :Botrealname\r\n"); _connect_commands.push_back("USER greg_Bot 0 * :Botrealname\r\n");
_connect_commands.push_back("JOIN #greg\r\n"); _connect_commands.push_back("JOIN #greg\r\n");
_fd = socket(AF_INET, SOCK_STREAM, 0); _fd = socket(AF_INET, SOCK_STREAM, 0);
if (_fd == -1) if(_fd == -1)
irc::logs::report(irc::log_fatal_error, "FD error"); irc::logs::report(irc::log_fatal_error, "FD error");
_serv_addr.sin_family = AF_INET; _serv_addr.sin_family = AF_INET;
_serv_addr.sin_port = htons(PORT); _serv_addr.sin_port = htons(PORT);
_serv_addr.sin_addr.s_addr = inet_addr(IP); _serv_addr.sin_addr.s_addr = inet_addr(IP);
if (connect(_fd, (struct sockaddr*)&_serv_addr, sizeof(_serv_addr)) < 0) if(connect(_fd, (struct sockaddr*)&_serv_addr, sizeof(_serv_addr)) < 0)
irc::logs::report(irc::log_fatal_error, "connect error"); irc::logs::report(irc::log_fatal_error, "connect error");
if(fcntl(_fd, F_SETFL, O_NONBLOCK) < 0) if(fcntl(_fd, F_SETFL, O_NONBLOCK) < 0)
irc::logs::report(irc::log_fatal_error, "fcntl() error"); irc::logs::report(irc::log_fatal_error, "fcntl() error");
@@ -48,7 +48,7 @@ void Bot::init()
void Bot::send_message(const std::string &content) void Bot::send_message(const std::string &content)
{ {
if (send(_fd, content.c_str(), content.length(), 0) < 0) if(send(_fd, content.c_str(), content.length(), 0) < 0)
irc::logs::report(irc::log_fatal_error, "send error"); irc::logs::report(irc::log_fatal_error, "send error");
} }
@@ -56,42 +56,42 @@ void Bot::handle_response(std::string buffer)
{ {
std::cout << buffer << std::flush; std::cout << buffer << std::flush;
if (!_logged && buffer == ":yipirc 001 greg :Welcome to yipirc :), greg\r\n") if(!_logged && buffer == ":yipirc 001 greg :Welcome to yipirc :), greg\r\n")
{ {
_logged = true; _logged = true;
irc::logs::report(irc::log_message, "Logged in succesfully"); irc::logs::report(irc::log_message, "Logged in succesfully");
} }
else if (!_logged) else if(!_logged)
return ; return ;
if (!_channel_created && buffer == ":greg JOIN :#greg\r\n") if(!_channel_created && buffer == ":greg JOIN :#greg\r\n")
{ {
_channel_created = true; _channel_created = true;
irc::logs::report(irc::log_message, "Created the channel succesfully"); irc::logs::report(irc::log_message, "Created the channel succesfully");
} }
else if (!_channel_created) else if(!_channel_created)
return ; return ;
if (buffer.find("KICK #greg greg :") != std::string::npos || buffer.find("explose") != std::string::npos) if(buffer.find("KICK #greg greg :") != std::string::npos || buffer.find("explose") != std::string::npos)
{ {
send_message("QUIT: Explose\r\n"); send_message("QUIT: Explose\r\n");
std::exit(0); std::exit(0);
} }
if (buffer.find("quoi") != std::string::npos) if(buffer.find("quoi") != std::string::npos)
send_message("PRIVMSG #greg :feur\r\n"); send_message("PRIVMSG #greg :feur\r\n");
} }
void Bot::connect_to_server() void Bot::connect_to_server()
{ {
char buffer[1024]; char buffer[1024];
for (std::vector<std::string>::iterator it = _connect_commands.begin(); it != _connect_commands.end(); ++it) for(std::vector<std::string>::iterator it = _connect_commands.begin(); it != _connect_commands.end(); ++it)
{ {
if (send(_fd, (*it).c_str(), (*it).size(), 0) < 0) if(send(_fd, (*it).c_str(), (*it).size(), 0) < 0)
irc::logs::report(irc::log_fatal_error, "send error"); irc::logs::report(irc::log_fatal_error, "send error");
if (recv(_fd, buffer, 1024, 0) > 0) if(recv(_fd, buffer, 1024, 0) > 0)
handle_response(buffer); handle_response(buffer);
} }
while (true) while (true)
{ {
if (recv(_fd, buffer, 1024, 0) > 0) if(recv(_fd, buffer, 1024, 0) > 0)
handle_response(buffer); handle_response(buffer);
std::memset(buffer, 0, sizeof(buffer)); std::memset(buffer, 0, sizeof(buffer));
} }