Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug JOIN_MSG #116

Merged
merged 7 commits into from
Apr 24, 2024
Merged

Bug JOIN_MSG #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0629b1b
Merge branch 'master' into 112-join-bug-mensaje-incorrecto-cuando-usu…
Atrujillo02 Apr 23, 2024
947ac39
fix bug JOIN_MSG
Atrujillo02 Apr 24, 2024
bb2a0e1
Merge branch 'master' into 112-join-bug-mensaje-incorrecto-cuando-usu…
Atrujillo02 Apr 24, 2024
0621b49
Merge branch 'master' into 112-join-bug-mensaje-incorrecto-cuando-usu…
Atrujillo02 Apr 24, 2024
2679150
fix bug JOIN_MSG
Atrujillo02 Apr 24, 2024
36cdd12
Merge branch '112-join-bug-mensaje-incorrecto-cuando-usuario-entra-a-…
Atrujillo02 Apr 24, 2024
2436639
fix delete tab
Atrujillo02 Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions includes/libsUtils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
# define RPL_INVITING(nickname, username, hostname, channel) USER_ID(nickname, username, hostname) + " " + (channel) + " " + (nickname)
// # define RPL_AWAY(nickname, username, hostname, awayMessage) USER_ID(nickname, username, hostname) + " " + (nickname) + " :" + (awayMessage)
// # define RPL_CHANNEL_MODE_IS(nickname, username, hostname, channel, mode, modeParams) USER_ID(nickname, username, hostname) + " " + (channel) + " " + (mode) + " " + (modeParams)
# define RPL_END_OF_NAMES(nickname, usermane, hostname, channel) USER_ID(nickname, username, hostname) + " " + (channel) + " :End of /NAMES list."
# define RPL_END_OF_NAMES(nickname, usermane, hostname, channel) USER_ID(nickname, username, hostname) + " " + (channel) + " :End of NAMES list."

# define ERROR_MSG(errorCode, nickname, errorMsg) ":irc.ft_messenger.net " + (errorCode) + " " + (nickname) + " " + (errorMsg) + "."

# define USER_ID(nickname, username, hostname) ":" + (nickname) + "!" + (username) + "@" + (hostname)
# define JOIN_MSG(nickname, username, hostname, channelName) USER_ID(nickname, username, hostname) + " JOIN :" + (channelName)
# define JOIN_MSG(nickname, username, hostname, channelName) USER_ID(nickname, username, hostname) + " JOIN " + (channelName)
# define PART_MSG(nickname, username, hostname, channelName) USER_ID(nickname, username, hostname) + " PART " + (channelName)
# define QUIT_MSG(nickname, username, hostname, message) USER_ID(nickname, username, hostname) + " QUIT :" + (message)
# define KICK_MSG(nickname, username, hostname, channelName, kickedUser, comment) USER_ID(nickname, username, hostname) + " KICK " + (channelName) + " " + (kickedUser) + " :" + (comment)
Expand Down
3 changes: 1 addition & 2 deletions src/commands/JoinCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ void JoinCommand::sendMessages(int clientFd, Channel &channel) const {

for (size_t i = 0; i < channelUsers.size(); i++) {
server.sendMessage(channelUsers[i].getFd(),
JOIN_MSG(channelUsers[i].getNickname(), channelUsers[i].getUsername(),
channelUsers[i].getHostname(), channelName));
JOIN_MSG(nickname, username, hostname, channelName));
}
server.sendMessage(clientFd, rplNamReply(nickname, username, hostname, channel));
server.sendMessage(clientFd, RPL_END_OF_NAMES(nickname, username, hostname, channelName));
Expand Down
Loading