From 33e2faea4f6979c938dcbcb378b55f36dd2d2d4b Mon Sep 17 00:00:00 2001 From: kinou-p Date: Thu, 9 Mar 2023 02:11:21 +0100 Subject: [PATCH] check all chan when delete user and not just joined chan (for ban list) --- srcs/commands/channel_op/mode.cpp | 5 ++--- srcs/delete_user.cpp | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/srcs/commands/channel_op/mode.cpp b/srcs/commands/channel_op/mode.cpp index 3100c6e..1861889 100644 --- a/srcs/commands/channel_op/mode.cpp +++ b/srcs/commands/channel_op/mode.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/11 19:19:30 by apommier #+# #+# */ -/* Updated: 2023/03/09 02:04:59 by apommier ### ########.fr */ +/* Updated: 2023/03/09 02:09:55 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -86,7 +86,6 @@ void chan_opt_b(fdList &allFds, int userNbr, std::vector opt, int c (void)ban; if (opt.size() == 3 && sign == true) { - // std::cout << "========ban = "<< ban[0] << std::endl; if (ban.empty() == true) { std::cout << "Nobody was banned on this channel" << std::endl; @@ -173,7 +172,7 @@ void do_user_opt(fdList &allFds, int userNbr, std::vector opt, int sign = false; if (allFds.userData[userNbr].userName != opt[1]) { - std::cout << "not the same user ! don't try to change someone else MODE you stupid bitch\n" + std::cout << "not the same user ! don't try to change someone else MODE you stupid bitch\n"; //cmd_error(allFds, allFds.userData[userNbr].fd, "401 *" + opt[1] + " :No such nick/channel\n"); return ; } diff --git a/srcs/delete_user.cpp b/srcs/delete_user.cpp index 3514a97..d1c8902 100644 --- a/srcs/delete_user.cpp +++ b/srcs/delete_user.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/12 20:38:50 by apommier #+# #+# */ -/* Updated: 2023/03/09 01:44:08 by apommier ### ########.fr */ +/* Updated: 2023/03/09 02:10:41 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -51,9 +51,9 @@ void delete_user(fdList &allFds, int userNbr) { std::cout << "Delete user nbr " << userNbr << std::endl; - for (size_t i = 0; i < allFds.userData[userNbr].joinedChan.size(); i++)//all joined chan + for (size_t i = 0; i < allFds.channelList.size(); i++)//all joined chan { - del_user_in_chan(&allFds.userData[userNbr], allFds.userData[userNbr].joinedChan[i]); + del_user_in_chan(&allFds.userData[userNbr], allFds.channelList[i]); //allFds.userData[userNbr].joinedChan[i].erase(find_user_in_chan(allFds.userData[userNbr].joinedChan[i])/*find user in chan*/) } close(allFds.userData[userNbr].fd);