From 0b02aabcc3c548f8cbeebd67981235e36bfbfb72 Mon Sep 17 00:00:00 2001 From: Samy Ben Tayeb Date: Tue, 24 Jun 2025 14:36:47 +0200 Subject: [PATCH] fix(cmd/kick): wrong order becuase we are the order --- sources/commands/kick.cpp | 7 +++--- sources/commands/part.cpp | 3 +-- sources/commands/privmsg.cpp | 41 +++++++++++++++++++----------------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/sources/commands/kick.cpp b/sources/commands/kick.cpp index 47c8e6a..1b1800e 100644 --- a/sources/commands/kick.cpp +++ b/sources/commands/kick.cpp @@ -6,7 +6,7 @@ /* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ -/* Updated: 2025/06/23 15:27:38 by sben-tay ### ########.fr */ +/* Updated: 2025/06/24 14:35:17 by sben-tay ### ########.fr */ /* */ /* ************************************************************************** */ @@ -78,9 +78,10 @@ void Kick::execute() { return; } + // std::string msgPart = ":" + _sender->getPrefix() + " PART #" + _cTarget->getName(); std::string msgPart = ":" + this->_uTarget->getPrefix() + " PART #" + _cTarget->getName() + "\r\n"; - std::string msgKick = ":" + this->_uTarget->getPrefix() + " KICK #" + this->_cTarget->getName() + " " + _uTarget->getName(); + std::string msgKick = ":" + _sender->getPrefix() + " KICK #" + this->_cTarget->getName() + " " + _uTarget->getName(); if (_args.size() > 3) { DEBUG_MSG("Je rajoute le message de kick avec un motif"); @@ -89,8 +90,8 @@ void Kick::execute() { msgKick += "\r\n"; std::cout << " msgKick: " << msgKick << "msgPart: " << msgPart << std::endl; - _cTarget->sendAllClientInAChannel(msgKick); _uTarget->appendToWriteBuffer(msgPart); + _cTarget->sendAllClientInAChannel(msgKick); _cTarget->removeUser(this->_uTarget); _cTarget->removeOperator(this->_uTarget); diff --git a/sources/commands/part.cpp b/sources/commands/part.cpp index 6c4014d..9a2f66d 100644 --- a/sources/commands/part.cpp +++ b/sources/commands/part.cpp @@ -6,7 +6,7 @@ /* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ -/* Updated: 2025/06/19 01:13:28 by sben-tay ### ########.fr */ +/* Updated: 2025/06/24 14:31:15 by sben-tay ### ########.fr */ /* */ /* ************************************************************************** */ @@ -69,7 +69,6 @@ void Part::execute() { _cTarget->sendAllClientInAChannel(msgPart); _cTarget->removeUser(_sender); _cTarget->removeOperator(_sender); - // remove invited list if (_cTarget->getUsers().empty()) { std::list& allChannels = _server->getChannelsList(); diff --git a/sources/commands/privmsg.cpp b/sources/commands/privmsg.cpp index af046ff..6de46aa 100644 --- a/sources/commands/privmsg.cpp +++ b/sources/commands/privmsg.cpp @@ -6,7 +6,7 @@ /* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ -/* Updated: 2025/06/24 05:07:56 by sben-tay ### ########.fr */ +/* Updated: 2025/06/24 14:02:33 by sben-tay ### ########.fr */ /* */ /* ************************************************************************** */ @@ -79,34 +79,37 @@ void PrivMsg::execute() { msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- !help โ†’ Affiche cette aide\r\n"; std::string msgEmote = ":bot!ircbot@localhost PRIVMSG " + target + " : ๐Ÿ“œ Emote list :\r\n"; - msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : ๐Ÿ˜€๐Ÿ˜๐Ÿ˜‚๐Ÿ˜ƒ๐Ÿ˜„๐Ÿ˜…๐Ÿ˜†๐Ÿ˜‡๐Ÿ˜ˆ๐Ÿ˜‰๐Ÿ˜Š๐Ÿ˜‹๐Ÿ˜Œ๐Ÿ˜๐Ÿ˜Ž๐Ÿ˜\r\n"; - msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : ๐Ÿ˜๐Ÿ˜‘๐Ÿ˜’๐Ÿ˜“๐Ÿ˜”๐Ÿ˜•๐Ÿ˜–๐Ÿ˜—๐Ÿ˜˜๐Ÿ˜™๐Ÿ˜š๐Ÿ˜›๐Ÿ˜œ๐Ÿ˜๐Ÿ˜ž๐Ÿ˜Ÿ\r\n"; - msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : ๐Ÿ˜ ๐Ÿ˜ก๐Ÿ˜ข๐Ÿ˜ฃ๐Ÿ˜ค๐Ÿ˜ฅ๐Ÿ˜ฆ๐Ÿ˜ง๐Ÿ˜จ๐Ÿ˜ฉ๐Ÿ˜ช๐Ÿ˜ซ๐Ÿ˜ฌ๐Ÿ˜ญ๐Ÿ˜ฎ๐Ÿ˜ฏ\r\n"; - msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : ๐Ÿ˜ฐ๐Ÿ˜ฑ๐Ÿ˜ฒ๐Ÿ˜ณ๐Ÿ˜ด๐Ÿ˜ต๐Ÿ˜ถ๐Ÿ˜ท๐Ÿ˜ธ๐Ÿ˜น๐Ÿ˜บ๐Ÿ˜ป๐Ÿ˜ผ๐Ÿ˜ฝ๐Ÿ˜พ๐Ÿ˜ฟ\r\n"; - msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : ๐Ÿ™€๐Ÿ™๐Ÿ™‚๐Ÿ™ƒ๐Ÿ™„๐Ÿ™…๐Ÿ™†๐Ÿ™‡๐Ÿ™ˆ๐Ÿ™‰๐Ÿ™Š๐Ÿ™‹๐Ÿ™Œ๐Ÿ™๐Ÿ™Ž๐Ÿ™\r\n"; - msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : ๐Ÿค๐Ÿค‘๐Ÿค’๐Ÿค“๐Ÿคค๐Ÿค”๐Ÿค•๐Ÿค–๐Ÿค—๐Ÿค˜๐Ÿค™๐Ÿคš๐Ÿค›๐Ÿคœ๐Ÿค๐ŸคŸ\r\n"; - msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : ๐Ÿ’๐Ÿ’‘๐Ÿ’’๐Ÿ’“๐Ÿ’”๐Ÿ’•๐Ÿ’–๐Ÿ’—๐Ÿ’˜๐Ÿ’™๐Ÿ’š๐Ÿ’›๐Ÿ’œ๐Ÿ’๐Ÿ’ž๐Ÿ’Ÿ\r\n"; - msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : ๐Ÿ’ ๐Ÿ’ก๐Ÿ’ข๐Ÿ’ฃ๐Ÿ’ค๐Ÿ’ฅ๐Ÿ’ฆ๐Ÿ’ง๐Ÿ’จ๐Ÿ’ฉ๐Ÿ’ช๐Ÿ’ซ๐Ÿ’ฌ๐Ÿ’ญ๐Ÿ’ฏ๐Ÿคจ\r\n"; + msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :๐Ÿ˜€๐Ÿ˜๐Ÿ˜‚๐Ÿ˜ƒ๐Ÿ˜„๐Ÿ˜…๐Ÿ˜†๐Ÿ˜‡๐Ÿ˜ˆ๐Ÿ˜‰๐Ÿ˜Š๐Ÿ˜‹๐Ÿ˜Œ๐Ÿ˜๐Ÿ˜Ž๐Ÿ˜\r\n"; + msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :๐Ÿ˜๐Ÿ˜‘๐Ÿ˜’๐Ÿ˜“๐Ÿ˜”๐Ÿ˜•๐Ÿ˜–๐Ÿ˜—๐Ÿ˜˜๐Ÿ˜™๐Ÿ˜š๐Ÿ˜›๐Ÿ˜œ๐Ÿ˜๐Ÿ˜ž๐Ÿ˜Ÿ\r\n"; + msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :๐Ÿ˜ ๐Ÿ˜ก๐Ÿ˜ข๐Ÿ˜ฃ๐Ÿ˜ค๐Ÿ˜ฅ๐Ÿ˜ฆ๐Ÿ˜ง๐Ÿ˜จ๐Ÿ˜ฉ๐Ÿ˜ช๐Ÿ˜ซ๐Ÿ˜ฌ๐Ÿ˜ญ๐Ÿ˜ฎ๐Ÿ˜ฏ\r\n"; + msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :๐Ÿ˜ฐ๐Ÿ˜ฑ๐Ÿ˜ฒ๐Ÿ˜ณ๐Ÿ˜ด๐Ÿ˜ต๐Ÿ˜ถ๐Ÿ˜ท๐Ÿ˜ธ๐Ÿ˜น๐Ÿ˜บ๐Ÿ˜ป๐Ÿ˜ผ๐Ÿ˜ฝ๐Ÿ˜พ๐Ÿ˜ฟ\r\n"; + msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :๐Ÿ™€๐Ÿ™๐Ÿ™‚๐Ÿ™ƒ๐Ÿ™„๐Ÿ™…๐Ÿ™†๐Ÿ™‡๐Ÿ™ˆ๐Ÿ™‰๐Ÿ™Š๐Ÿ™‹๐Ÿ™Œ๐Ÿ™๐Ÿ™Ž๐Ÿ™\r\n"; + msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :๐Ÿค๐Ÿค‘๐Ÿค’๐Ÿค“๐Ÿคค๐Ÿค”๐Ÿค•๐Ÿค–๐Ÿค—๐Ÿค˜๐Ÿค™๐Ÿคš๐Ÿค›๐Ÿคœ๐Ÿค๐ŸคŸ\r\n"; + msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :๐Ÿ’๐Ÿ’‘๐Ÿ’’๐Ÿ’“๐Ÿ’”๐Ÿ’•๐Ÿ’–๐Ÿ’—๐Ÿ’˜๐Ÿ’™๐Ÿ’š๐Ÿ’›๐Ÿ’œ๐Ÿ’๐Ÿ’ž๐Ÿ’Ÿ\r\n"; + msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :๐Ÿ’ ๐Ÿ’ก๐Ÿ’ข๐Ÿ’ฃ๐Ÿ’ค๐Ÿ’ฅ๐Ÿ’ฆ๐Ÿ’ง๐Ÿ’จ๐Ÿ’ฉ๐Ÿ’ช๐Ÿ’ซ๐Ÿ’ฌ๐Ÿ’ญ๐Ÿ’ฏ๐Ÿคจ\r\n"; + std::cout << "target = " << target << std::endl; // Envoi vers un channel if (target[0] == '#') { target.erase(0, 1); - if (_cTarget && !BONUS) - _cTarget->sendAllClientInAChannel(msg, _sender); - - if (BONUS && _cTarget->getBotChannel()) { - if (_args.at(2) == "!help") + + if (_cTarget) { + if (BONUS && _cTarget->getBotChannel() && _args.at(2) == "!help") _sender->appendToWriteBuffer(msgBot); - else if (_args.at(2) == "!emote") + else if (BONUS && _cTarget->getBotChannel() && _args.at(2) == "!emote") _sender->appendToWriteBuffer(msgEmote); + else + _cTarget->sendAllClientInAChannel(msg, _sender); } } // Envoi vers un user - else { - for(std::list::iterator it = _server->getUsersList().begin(); it != _server->getUsersList().end(); ++it) { - if ((*it)->getName() == target) - _uTarget->appendToWriteBuffer(msg); + const std::list& users = _server->getUsersList(); + + for (std::list::const_iterator it = users.begin(); it != users.end(); ++it) { + if ((*it)->getName() == target) { + (*it)->appendToWriteBuffer(msg); + break; } } }