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

caca

Browse Source
This commit is contained in:
Kbz-8
2024-01-29 16:57:53 +01:00
parent 8f06d22e48
commit afe87064d1
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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/26 02:10:11 by vvaas ### ########.fr */ /* Updated: 2024/01/29 15:44:32 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -75,9 +75,9 @@ namespace irc
{ {
std::string clientlist(":yipirc " RPL_NAMREPLY " " + client->getNickName() + " @ " + getName() + " :"); std::string clientlist(":yipirc " RPL_NAMREPLY " " + client->getNickName() + " @ " + getName() + " :");
for (client_it it = _clients.begin(); it != _clients.end(); ++it) for(client_it it = _clients.begin(); it != _clients.end(); ++it)
{ {
if (isOp(const_cast<unstd::SharedPtr<irc::Client>&>(*it))) if(isOp(const_cast<unstd::SharedPtr<irc::Client>&>(*it)))
clientlist += '@'; clientlist += '@';
clientlist += const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName() + ' '; clientlist += const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName() + ' ';
} }
@@ -198,7 +198,7 @@ namespace irc
if(!hasClient(client)) if(!hasClient(client))
return; return;
if(_topic.empty()) if(_topic.empty())
return client->sendCode(RPL_NOTOPIC " " + _name, " no topic is set"); return client->sendCode(RPL_NOTOPIC, client->getNickName() + " @ " + _name, " no topic is set");
return client->sendCode(RPL_TOPIC " " + _name, _topic); return client->sendCode(RPL_TOPIC " " + _name, _topic);
} }

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/26 02:33:40 by vvaas ### ########.fr */ /* Updated: 2024/01/29 15:13:34 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -343,12 +343,13 @@ namespace irc
irc::Channel *chan; irc::Channel *chan;
logs::report(log_message, "tokensize ok : %d", msg.getTokens().size()); logs::report(log_message, "tokensize ok : %d", msg.getTokens().size());
if (msg.getTokens().size() != 2) if(msg.getTokens().size() != 2)
return; return;
if ((chan = getChannelByName(msg.getTokens()[1])) == NULL) if((chan = getChannelByName(msg.getTokens()[1])) == NULL)
client->sendCode(ERR_NOSUCHCHANNEL, "No such channel"); client->sendCode(ERR_NOSUCHCHANNEL, "No such channel");
chan->sendWho(client); chan->sendWho(client);
} }
void Server::handleTopic(unstd::SharedPtr<class Client> client, const Message& msg) void Server::handleTopic(unstd::SharedPtr<class Client> client, const Message& msg)
{ {
if(msg.getArgs().empty()) if(msg.getArgs().empty())
@@ -399,12 +400,12 @@ namespace irc
{ {
logs::report(log_message, "Mode requested"); logs::report(log_message, "Mode requested");
irc::Channel *chan; irc::Channel *chan;
if (msg.getTokens().size() < 2) if(msg.getTokens().size() < 2)
return ; return ;
if (msg.getTokens().size() == 2 && (msg.getTokens()[1][0] == '#' || msg.getTokens()[1][0] == '&')) if(msg.getTokens().size() == 2 && (msg.getTokens()[1][0] == '#' || msg.getTokens()[1][0] == '&'))
{ {
chan = getChannelByName(msg.getTokens()[1]); chan = getChannelByName(msg.getTokens()[1]);
if (chan == NULL) if(chan == NULL)
client->sendCode(ERR_NOSUCHCHANNEL, "No such channel"); client->sendCode(ERR_NOSUCHCHANNEL, "No such channel");
else else
chan->showModes(client); chan->showModes(client);
@@ -412,12 +413,12 @@ namespace irc
} }
logs::report(log_message, "Mode parsing ok"); logs::report(log_message, "Mode parsing ok");
channel_it it; channel_it it;
for (it = _channels.begin(); it != _channels.end() && it->getName() != msg.getTokens()[1]; ++it); for(it = _channels.begin(); it != _channels.end() && it->getName() != msg.getTokens()[1]; ++it);
if (it == _channels.end()) if(it == _channels.end())
client->sendCode(ERR_NOSUCHCHANNEL, "No such channel"); client->sendCode(ERR_NOSUCHCHANNEL, "No such channel");
if (getChannelByName(msg.getTokens()[1]) && !it->isOp(client)) if(getChannelByName(msg.getTokens()[1]) && !it->isOp(client))
client->sendCode(ERR_CHANOPRIVSNEEDED, "You need operator privileges to execute this command"); client->sendCode(ERR_CHANOPRIVSNEEDED, "You need operator privileges to execute this command");
if (msg.getTokens()[2][0] != '-' && msg.getTokens()[2][0] != '+') if(msg.getTokens()[2][0] != '-' && msg.getTokens()[2][0] != '+')
return ; return ;
it->changeMode(client, msg); it->changeMode(client, msg);
} }