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

gg

Browse Source
This commit is contained in:
Namonay
2024-01-30 00:26:02 +01:00
parent 9fc30f5ec9
commit da1f23c294
6 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/client.hpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:33:17 by maldavid #+# #+# */ /* Created: 2024/01/21 10:33:17 by maldavid #+# #+# */
/* Updated: 2024/01/29 22:57:10 by maldavid ### ########.fr */ /* Updated: 2024/01/30 00:07:07 by vvaas ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -57,7 +57,7 @@ namespace irc
void sendMsg(const std::string& sender, const std::string& cmd, const std::string& trailing); void sendMsg(const std::string& sender, const std::string& cmd, const std::string& trailing);
void sendModular(std::string message, ...); void sendModular(std::string message, ...);
void sendCodeInChannel(const std::string& code, const class Channel &chan, const std::string& msg); void sendCodeInChannel(const std::string& code, const class Channel &chan, const std::string& msg);
void kill(const std::string& reason);
inline void inviteToChannel(const std::string& channel) { _invites.insert(channel); } inline void inviteToChannel(const std::string& channel) { _invites.insert(channel); }
inline bool hasBeenInvitedTo(const std::string& channel) { return _invites.erase(channel); } inline bool hasBeenInvitedTo(const std::string& channel) { return _invites.erase(channel); }

3
includes/server.hpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 09:12:28 by maldavid #+# #+# */ /* Created: 2024/01/21 09:12:28 by maldavid #+# #+# */
/* Updated: 2024/01/26 00:42:56 by vvaas ### ########.fr */ /* Updated: 2024/01/30 00:24:49 by vvaas ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -62,6 +62,7 @@ namespace irc
void handleTopic(unstd::SharedPtr<class Client> client, const class Message& msg); void handleTopic(unstd::SharedPtr<class Client> client, const class Message& msg);
void handlePing(unstd::SharedPtr<class Client> client, const class Message& msg); void handlePing(unstd::SharedPtr<class Client> client, const class Message& msg);
void handleMode(unstd::SharedPtr<class Client> client, const class Message& msg); void handleMode(unstd::SharedPtr<class Client> client, const class Message& msg);
void handleRussian(unstd::SharedPtr<class Client> client);
class Channel* getChannelByName(const std::string& name); class Channel* getChannelByName(const std::string& name);
unstd::SharedPtr<class Client> getClientByName(const std::string& name); unstd::SharedPtr<class Client> getClientByName(const std::string& name);

6
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/29 22:08:11 by vvaas ### ########.fr */ /* Updated: 2024/01/29 23:47:14 by vvaas ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -127,7 +127,7 @@ namespace irc
} }
void Channel::showModes(unstd::SharedPtr<Client> client) void Channel::showModes(unstd::SharedPtr<Client> client)
{ {
std::string modes = "+"; std::string modes = " +";
if (_invite_only) if (_invite_only)
modes += 'i'; modes += 'i';
@@ -137,7 +137,7 @@ namespace irc
modes += 'k'; modes += 'k';
if (_channel_size != -1) if (_channel_size != -1)
modes += 'l'; modes += 'l';
if (modes.size() < 2) if (modes.size() <= 2)
return ; return ;
client->sendCode(RPL_CHANNELMODEIS, modes); client->sendCode(RPL_CHANNELMODEIS, modes);
} }

7
srcs/client.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:35:52 by maldavid #+# #+# */ /* Created: 2024/01/21 10:35:52 by maldavid #+# #+# */
/* Updated: 2024/01/29 23:27:33 by maldavid ### ########.fr */ /* Updated: 2024/01/30 00:10:23 by vvaas ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -137,5 +137,10 @@ namespace irc
return (std::string()); return (std::string());
} }
void Client::kill(const std::string& reason)
{
sendMsg("yipirc", "KILL", reason);
}
Client::~Client() {} Client::~Client() {}
} }

4
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/29 23:27:51 by maldavid ### ########.fr */ /* Updated: 2024/01/30 00:17:49 by vvaas ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -163,6 +163,8 @@ namespace irc
handlePing(client, msg); handlePing(client, msg);
else if(msg.getCmd() == "MODE") else if(msg.getCmd() == "MODE")
handleMode(client, msg); handleMode(client, msg);
else if(msg.getCmd() == "imfeelinglucky")
handleRussian(client);
return true; return true;
} }

37
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/29 23:27:39 by maldavid ### ########.fr */ /* Updated: 2024/01/30 00:25:13 by vvaas ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -23,6 +23,8 @@
#include <irc.hpp> #include <irc.hpp>
#include <cstring> #include <cstring>
#include <unstd/string.hpp> #include <unstd/string.hpp>
#include <cstdlib>
#include <ctime>
namespace irc namespace irc
{ {
@@ -44,7 +46,9 @@ namespace irc
{ {
if((*it)->getNickName() == nickname) if((*it)->getNickName() == nickname)
{ {
client->sendCode(ERR_NICKCOLLISION, "Nickname is used"); client->sendCode(ERR_NICKCOLLISION, nickname + " Nickname is used");
client->kill("Nickname already used");
client->requireDisconnect();
return; return;
} }
} }
@@ -170,7 +174,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());
return ; return ;
} }
if(msg.getTokens().size() == 3 && msg.getTokens()[2] != it->getPassword()) if((msg.getTokens().size() == 3 && msg.getTokens()[2] != it->getPassword()) || (msg.getTokens().size() == 2 && it->getPassword().size() > 0))
client->sendCode(ERR_BADCHANNELKEY, "Invalid password"); client->sendCode(ERR_BADCHANNELKEY, "Invalid password");
else if(it->getChannelSize() != -1 && it->getChannelSize() >= static_cast<int>(it->getNumberOfClients())) else if(it->getChannelSize() != -1 && it->getChannelSize() >= static_cast<int>(it->getNumberOfClients()))
client->sendCode(ERR_CHANNELISFULL, "Channel is full"); client->sendCode(ERR_CHANNELISFULL, "Channel is full");
@@ -178,7 +182,7 @@ namespace irc
client->sendCode(ERR_INVITEONLYCHAN, "channel is invite only and you have not been invited u looser"); client->sendCode(ERR_INVITEONLYCHAN, "channel is invite only and you have not been invited u looser");
else if(it->getPassword().size() == 0) else if(it->getPassword().size() == 0)
it->addClient(client); it->addClient(client);
else if(it->getPassword().size() > 0 && msg.getTokens()[2] == it->getPassword()) else if(msg.getTokens().size() == 3 && it->getPassword().size() > 0 && msg.getTokens()[2] == it->getPassword())
it->addClient(client); it->addClient(client);
} }
@@ -299,28 +303,30 @@ namespace irc
logs::report(log_error, "INVITE, invalid command '%s'", msg.getRawMsg().c_str()); logs::report(log_error, "INVITE, invalid command '%s'", msg.getRawMsg().c_str());
return; return;
} }
Channel* channel_target = getChannelByName(msg.getArgs()[1]);
if(channel_target == NULL)
{
client->sendCode(ERR_NOSUCHCHANNEL, "No such channel");
return ;
}
if(!isUserKnown(msg.getArgs()[0])) if(!isUserKnown(msg.getArgs()[0]))
{ {
client->sendCode(ERR_NOSUCHNICK, const_cast<std::string&>(msg.getArgs()[0]) + " no such nick"); client->sendCodeInChannel(ERR_NOSUCHNICK, *channel_target, "No such nick");
return; return;
} }
if(!isChannelKnown(msg.getArgs()[1])) if(!isChannelKnown(msg.getArgs()[1]))
{ {
client->sendCode(ERR_NOSUCHCHANNEL, const_cast<std::string&>(msg.getArgs()[1]) + " no such channel"); client->sendCodeInChannel(ERR_NOSUCHCHANNEL, *channel_target, "no such channel");
return; return;
} }
Channel* channel_target = getChannelByName(msg.getArgs()[1]);
if(channel_target == NULL)
logs::report(log_fatal_error, "(INVITE), cannot get channel '%s' by name; panic !", msg.getArgs()[1].c_str());
unstd::SharedPtr<Client> client_target = getClientByName(msg.getArgs()[0]); unstd::SharedPtr<Client> client_target = getClientByName(msg.getArgs()[0]);
if(client_target.get() == NULL) if(client_target.get() == NULL)
logs::report(log_fatal_error, "(INVITE), cannot get client '%s' by name; panic !", msg.getArgs()[0].c_str()); logs::report(log_fatal_error, "(INVITE), cannot get client '%s' by name; panic !", msg.getArgs()[0].c_str());
if(!channel_target->hasClient(client)) if(!channel_target->hasClient(client))
{ {
client->sendCode(ERR_NOTONCHANNEL, msg.getArgs()[0], "you're not on that channel"); logs::report(log_fatal_error, "(INVITE), cannot get channel '%s' by name; panic !", msg.getArgs()[1].c_str());
return; return;
} }
@@ -488,4 +494,13 @@ namespace irc
return ; return ;
chan->changeMode(client, msg); chan->changeMode(client, msg);
} }
void Server::handleRussian(unstd::SharedPtr<class Client> client)
{
srand(time(NULL));
if (rand() % 6 == 0)
client->kill("Bye Bye Bye");
}
} }