From afe87064d1580843d43abcd34603e05620ba532e Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Mon, 29 Jan 2024 16:57:53 +0100 Subject: [PATCH] caca --- srcs/channel.cpp | 8 ++++---- srcs/server_functions.cpp | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/srcs/channel.cpp b/srcs/channel.cpp index a186722..1254b47 100644 --- a/srcs/channel.cpp +++ b/srcs/channel.cpp @@ -6,7 +6,7 @@ /* By: vvaas +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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() + " :"); - for (client_it it = _clients.begin(); it != _clients.end(); ++it) + for(client_it it = _clients.begin(); it != _clients.end(); ++it) { - if (isOp(const_cast&>(*it))) + if(isOp(const_cast&>(*it))) clientlist += '@'; clientlist += const_cast&>(*it)->getNickName() + ' '; } @@ -198,7 +198,7 @@ namespace irc if(!hasClient(client)) return; 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); } diff --git a/srcs/server_functions.cpp b/srcs/server_functions.cpp index 930e070..7eee8f0 100644 --- a/srcs/server_functions.cpp +++ b/srcs/server_functions.cpp @@ -6,7 +6,7 @@ /* By: vvaas +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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; logs::report(log_message, "tokensize ok : %d", msg.getTokens().size()); - if (msg.getTokens().size() != 2) + if(msg.getTokens().size() != 2) return; - if ((chan = getChannelByName(msg.getTokens()[1])) == NULL) + if((chan = getChannelByName(msg.getTokens()[1])) == NULL) client->sendCode(ERR_NOSUCHCHANNEL, "No such channel"); chan->sendWho(client); } + void Server::handleTopic(unstd::SharedPtr client, const Message& msg) { if(msg.getArgs().empty()) @@ -399,12 +400,12 @@ namespace irc { logs::report(log_message, "Mode requested"); irc::Channel *chan; - if (msg.getTokens().size() < 2) + if(msg.getTokens().size() < 2) 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]); - if (chan == NULL) + if(chan == NULL) client->sendCode(ERR_NOSUCHCHANNEL, "No such channel"); else chan->showModes(client); @@ -412,12 +413,12 @@ namespace irc } logs::report(log_message, "Mode parsing ok"); channel_it it; - for (it = _channels.begin(); it != _channels.end() && it->getName() != msg.getTokens()[1]; ++it); - if (it == _channels.end()) + for(it = _channels.begin(); it != _channels.end() && it->getName() != msg.getTokens()[1]; ++it); + if(it == _channels.end()) 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"); - if (msg.getTokens()[2][0] != '-' && msg.getTokens()[2][0] != '+') + if(msg.getTokens()[2][0] != '-' && msg.getTokens()[2][0] != '+') return ; it->changeMode(client, msg); }