raphael/ft_irc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(cmd/kick): wrong order becuase we are the order

Browse source
This commit is contained in:
Samy Ben Tayeb 2025-06-24 14:36:47 +02:00
parent 7f804c5754
commit 0b02aabcc3
3 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sources/commands/kick.cpp
View file

@ -6,7 +6,7 @@
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ /* 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; return;
} }
// std::string msgPart = ":" + _sender->getPrefix() + " PART #" + _cTarget->getName();
std::string msgPart = ":" + this->_uTarget->getPrefix() + " PART #" + _cTarget->getName() + "\r\n"; 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) if (_args.size() > 3)
{ {
DEBUG_MSG("Je rajoute le message de kick avec un motif"); DEBUG_MSG("Je rajoute le message de kick avec un motif");
@ -89,8 +90,8 @@ void Kick::execute() {
msgKick += "\r\n"; msgKick += "\r\n";
std::cout << " msgKick: " << msgKick << "msgPart: " << msgPart << std::endl; std::cout << " msgKick: " << msgKick << "msgPart: " << msgPart << std::endl;
_cTarget->sendAllClientInAChannel(msgKick);
_uTarget->appendToWriteBuffer(msgPart); _uTarget->appendToWriteBuffer(msgPart);
_cTarget->sendAllClientInAChannel(msgKick);
_cTarget->removeUser(this->_uTarget); _cTarget->removeUser(this->_uTarget);
_cTarget->removeOperator(this->_uTarget); _cTarget->removeOperator(this->_uTarget);

3
sources/commands/part.cpp
View file

@ -6,7 +6,7 @@
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ /* 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->sendAllClientInAChannel(msgPart);
_cTarget->removeUser(_sender); _cTarget->removeUser(_sender);
_cTarget->removeOperator(_sender); _cTarget->removeOperator(_sender);
// remove invited list
if (_cTarget->getUsers().empty()) { if (_cTarget->getUsers().empty()) {
std::list<Channel*>& allChannels = _server->getChannelsList(); std::list<Channel*>& allChannels = _server->getChannelsList();

23
sources/commands/privmsg.cpp
View file

@ -6,7 +6,7 @@
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ /* 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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -88,25 +88,28 @@ void PrivMsg::execute() {
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 // Envoi vers un channel
if (target[0] == '#') { if (target[0] == '#') {
target.erase(0, 1); target.erase(0, 1);
if (_cTarget && !BONUS)
_cTarget->sendAllClientInAChannel(msg, _sender);
if (BONUS && _cTarget->getBotChannel()) { if (_cTarget) {
if (_args.at(2) == "!help") if (BONUS && _cTarget->getBotChannel() && _args.at(2) == "!help")
_sender->appendToWriteBuffer(msgBot); _sender->appendToWriteBuffer(msgBot);
else if (_args.at(2) == "!emote") else if (BONUS && _cTarget->getBotChannel() && _args.at(2) == "!emote")
_sender->appendToWriteBuffer(msgEmote); _sender->appendToWriteBuffer(msgEmote);
else
_cTarget->sendAllClientInAChannel(msg, _sender);
} }
} }
// Envoi vers un user // Envoi vers un user
else { const std::list<User *>& users = _server->getUsersList();
for(std::list<User *>::iterator it = _server->getUsersList().begin(); it != _server->getUsersList().end(); ++it) {
if ((*it)->getName() == target) for (std::list<User *>::const_iterator it = users.begin(); it != users.end(); ++it) {
_uTarget->appendToWriteBuffer(msg); if ((*it)->getName() == target) {
(*it)->appendToWriteBuffer(msg);
break;
} }
} }
} }