Kinou/ft_irc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check all chan when delete user and not just joined chan (for ban list)

Browse Source
This commit is contained in:
kinou-p 2023-03-09 02:11:21 +01:00
parent ae37859552
commit 33e2faea4f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
srcs/commands/channel_op/mode.cpp
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/11 19:19:30 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<std::string> opt, int c
(void)ban; (void)ban;
if (opt.size() == 3 && sign == true) if (opt.size() == 3 && sign == true)
{ {
// std::cout << "========ban = "<< ban[0] << std::endl;
if (ban.empty() == true) if (ban.empty() == true)
{ {
std::cout << "Nobody was banned on this channel" << std::endl; std::cout << "Nobody was banned on this channel" << std::endl;
@ -173,7 +172,7 @@ void do_user_opt(fdList &allFds, int userNbr, std::vector<std::string> opt, int
sign = false; sign = false;
if (allFds.userData[userNbr].userName != opt[1]) 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"); //cmd_error(allFds, allFds.userData[userNbr].fd, "401 *" + opt[1] + " :No such nick/channel\n");
return ; return ;
} }

6
srcs/delete_user.cpp
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/12 20:38:50 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; 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*/) //allFds.userData[userNbr].joinedChan[i].erase(find_user_in_chan(allFds.userData[userNbr].joinedChan[i])/*find user in chan*/)
} }
close(allFds.userData[userNbr].fd); close(allFds.userData[userNbr].fd);