Merge pull request #144 from jdomingu98/125-nick-bug-respuestas

125 nick bug respuestas
jdomingu98 · Apr 28, 2024 · d99baa2 · d99baa2
2 parents 3186d78 + 98f25a8
commit d99baa2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/includes/Responses.hpp b/includes/Responses.hpp
@@ -31,6 +31,7 @@ class Channel;
 # define JOIN_MSG(channelName) " JOIN " + (channelName)
 # define KICK_MSG(channelName, kickedUser, comment) " KICK " + (channelName) + " " + (kickedUser) + " :" + (comment)
 # define MODE_MSG(channel, flag, modeParams) " MODE " + (channel) + " " + (flag) + " " + (modeParams)
+# define NICK_MSG(nickname) " NICK " + (nickname)
 # define PART_MSG(channelName) " PART " + (channelName)
 # define PRIVMSG_MSG(destination, message) " PRIVMSG " + (destination) + " :" + (message)
 # define QUIT_MSG(message) " QUIT :" + (message)

diff --git a/src/commands/NickCommand.cpp b/src/commands/NickCommand.cpp
@@ -37,14 +37,23 @@ void NickCommand::execute(int clientFd) {
 
     User &user = server.getUserByFd(clientFd);
 
-    if (server.isNicknameInUse(this->_nickname))
+    if (user.getNickname() != this->_nickname && server.isNicknameInUse(this->_nickname))
         throw NicknameInUseException(this->_nickname);
 
     if (!NickCommand::isValidNickname())
         throw ErroneousNicknameException(this->_nickname);
 
+    if (user.isRegistered() && user.getNickname() != this->_nickname) {
+        std::vector<Channel> userChannels = server.getChannels();
+        for (std::vector<Channel>::iterator it = userChannels.begin(); it != userChannels.end(); it++) {
+            if (it->isUserInChannel(user.getNickname()))
+                it->broadcastToChannel(CMD_MSG(user.getNickname(), user.getUsername(), user.getHostname(), NICK_MSG(this->_nickname)));
+        }
+    }
+
     user.setNickname(this->_nickname);
-    if (user.canRegister())
+
+    if (!user.isRegistered() && user.canRegister())
         server.attemptUserRegistration(clientFd);
 }