From 4517fa302fa7f71b1a98c7b474e955e5fb487cd1 Mon Sep 17 00:00:00 2001 From: kinou-p Date: Thu, 9 Mar 2023 06:07:26 +0100 Subject: [PATCH] clean a bit std::cout --- includes/ft_irc.hpp | 8 +-- srcs/client_request.cpp | 3 +- srcs/commands/auth/connect_client.cpp | 6 +-- srcs/commands/auth/user.cpp | 6 +-- srcs/commands/channel/channel_utils.cpp | 67 ++++++++++++++++--------- srcs/commands/channel/join.cpp | 24 ++++----- srcs/commands/channel/notice.cpp | 8 +-- srcs/commands/channel/part.cpp | 8 +-- srcs/commands/channel/privmsg.cpp | 23 +++++---- srcs/commands/channel_op/invite.cpp | 4 +- srcs/commands/channel_op/kick.cpp | 13 +++-- srcs/commands/channel_op/mode.cpp | 7 +-- srcs/commands/operator/kill.cpp | 4 +- srcs/commands/other/ping_pong.cpp | 10 ++-- srcs/commands/other/quit.cpp | 8 +-- srcs/commands/other/who.cpp | 4 +- srcs/commands/parse_commands.cpp | 18 ++++--- srcs/new_connection.cpp | 4 +- 18 files changed, 127 insertions(+), 98 deletions(-) diff --git a/includes/ft_irc.hpp b/includes/ft_irc.hpp index 7a66959..ea8e649 100644 --- a/includes/ft_irc.hpp +++ b/includes/ft_irc.hpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/01 17:27:37 by apommier #+# #+# */ -/* Updated: 2023/03/09 03:07:21 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:45:36 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -42,8 +42,8 @@ #define MAX_CHAN 10 #define READ_SIZE 10 #define CMD_NBR 10 -#define OP_PASSWORD "password" -#define OP_NAME "operator" +#define OP_PASSWORD "q" +#define OP_NAME "q" // if (!allFds.userData[userNbr].registered) @@ -78,7 +78,7 @@ struct chanMode s(0), i(0), t(0), - n(0), + n(1), m(0), l(0), b(0), diff --git a/srcs/client_request.cpp b/srcs/client_request.cpp index 1e263c2..b3b4dcd 100644 --- a/srcs/client_request.cpp +++ b/srcs/client_request.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/09 22:34:36 by apommier #+# #+# */ -/* Updated: 2023/02/16 23:01:04 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:00:20 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -43,7 +43,6 @@ bool clientRequest(fdList &allFds, int userNbr)//, // std::cout << "buffer empty\n"; return (1); } - std::cout << "BUFFER: ---" << buf << "---" << std::endl; // for (int i = 0; buffer[i]; i++) // { // std::cout << i << " = " << (int)buffer[i] << std::endl; diff --git a/srcs/commands/auth/connect_client.cpp b/srcs/commands/auth/connect_client.cpp index 45ffe45..2235381 100644 --- a/srcs/commands/auth/connect_client.cpp +++ b/srcs/commands/auth/connect_client.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/12 23:30:11 by apommier #+# #+# */ -/* Updated: 2023/02/15 00:15:32 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:01:54 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -53,7 +53,7 @@ void print_registered_msg(fdList &allFds, int userNbr) void connect_client(fdList &allFds, int userNbr) { - std::cout << "connect client start\n"; + //std::cout << "connect client start\n"; if (allFds.userData[userNbr].password.empty() || allFds.userData[userNbr].password != allFds.password) { @@ -66,6 +66,6 @@ void connect_client(fdList &allFds, int userNbr) allFds.userData[userNbr].registered = 1; print_registered_msg(allFds, userNbr); - std::cout << "connect client end\n"; + //std::cout << "connect client end\n"; //ft_putstr_fd(allFds.userData[userNbr].fd, ":irc.local NOTICE kinou :*** Could not resolve your hostname: Request timed out; using your IP address (172.17.0.1) instead.\nirc.local 376 kinou :End of message of the day."); } \ No newline at end of file diff --git a/srcs/commands/auth/user.cpp b/srcs/commands/auth/user.cpp index bd81e11..c67ae44 100644 --- a/srcs/commands/auth/user.cpp +++ b/srcs/commands/auth/user.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/06 14:40:39 by apommier #+# #+# */ -/* Updated: 2023/02/14 01:25:22 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:01:38 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,8 +30,8 @@ void USER(std::string buffer, fdList &allFds, int userNbr) buffer.resize(buffer.size() - realName.size()); - std::cout << "Buffer in userNbr = ---" << buffer << "---" << std::endl; - std::cout << "realname in userNbr = ---" << realName << "---" << std::endl; + //std::cout << "Buffer in userNbr = ---" << buffer << "---" << std::endl; + //std::cout << "realname in userNbr = ---" << realName << "---" << std::endl; split(buffer, ' ', splitBuff); if (splitBuff.size() < 4) { diff --git a/srcs/commands/channel/channel_utils.cpp b/srcs/commands/channel/channel_utils.cpp index d8dbf64..3bfb1d2 100644 --- a/srcs/commands/channel/channel_utils.cpp +++ b/srcs/commands/channel/channel_utils.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/09 17:21:57 by apommier #+# #+# */ -/* Updated: 2023/02/21 02:02:38 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:17:20 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -35,51 +35,68 @@ int is_joined(fdList &allFds, std::string chanName, int userNbr) { std::vector::iterator start = allFds.userData[userNbr].joinedChan.begin(); std::vector::iterator pastEnd = allFds.userData[userNbr].joinedChan.end(); - std::cout << "name1= ---" << chanName << "---\n"; + //std::cout << "name1= ---" << chanName << "---\n"; while (start != pastEnd) { - std::cout << "result in find chan = " << pastEnd - start << std::endl; - std::cout << "test is joined= " << allFds.userData[userNbr].joinedChan[pastEnd - start - 1]->name << "---\n"; + //std::cout << "result in find chan = " << pastEnd - start << std::endl; + //std::cout << "test is joined= " << allFds.userData[userNbr].joinedChan[pastEnd - start - 1]->name << "---\n"; if (allFds.userData[userNbr].joinedChan[pastEnd - start - 1]->name == chanName) return (pastEnd - start - 1); start++; } - std::cout << "chan not found in is joined\n"; + //std::cout << "chan not found in is joined\n"; return (-1); } int find_channel(fdList &allFds, std::string chanName)//return channel nbr { - std::_List_iterator start = allFds.channelList.begin(); - std::_List_iterator pastEnd = allFds.channelList.end(); - std::cout << "name1= ---" << chanName << "---\n"; - while (start != pastEnd) + // std::_List_iterator start = allFds.channelList.begin(); + // std::_List_iterator pastEnd = allFds.channelList.end(); + // //std::cout << "name1= ---" << chanName << "---\n"; + // while (start != pastEnd) + // { + // //std::cout << "chan = ---" << allFds.channelList[pastEnd - start - 1].name << "---" << std::endl; + // //std::cout << "test = " << allFds.channelList[pastEnd - start - 1].name << "---\n"; + // if (allFds.channelList[pastEnd - start - 1].name == chanName) + // return (pastEnd - start - 1); + // start++; + // } + // //std::cout << "chan not found in find \n"; + // return (-1); + + + int size = allFds.channelList.size(); + for (int i = 0; i < size; i++) { - std::cout << "chan = ---" << allFds.channelList[pastEnd - start - 1].name << "---" << std::endl; - std::cout << "test = " << allFds.channelList[pastEnd - start - 1].name << "---\n"; - if (allFds.channelList[pastEnd - start - 1].name == chanName) - return (pastEnd - start - 1); - start++; + if (allFds.channelList[i].name == chanName) + return (i); } - std::cout << "chan not found in find \n"; return (-1); } int find_user(fdList &allFds, std::string userName)//return direct user fd { - std::_List_iterator start = allFds.userData.begin(); - std::_List_iterator pastEnd = allFds.userData.end(); - std::cout << "name1= ---" << userName << "---\n"; - while (start != pastEnd) + // std::_List_iterator start = allFds.userData.begin(); + // std::_List_iterator pastEnd = allFds.userData.end(); + // //std::cout << "name1= ---" << userName << "---\n"; + // while (start != pastEnd) + // { + // //std::cout << "result in find user = " << pastEnd - start << std::endl; + // //std::cout << "name2= ---" << allFds.userData[pastEnd - start - 1].nickname << "---\n"; + // if (allFds.userData[pastEnd - start - 1].nickname == userName) + // return (pastEnd - start - 1); + // start++; + // } + // //std::cout << "user not found\n"; + // return (-1); + + int size = allFds.userData.size(); + for (int i = 0; i < size; i++) { - std::cout << "result in find user = " << pastEnd - start << std::endl; - std::cout << "name2= ---" << allFds.userData[pastEnd - start - 1].nickname << "---\n"; - if (allFds.userData[pastEnd - start - 1].nickname == userName) - return (pastEnd - start - 1); - start++; + if (allFds.userData[i].nickname == userName) + return (i); } - std::cout << "user not found\n"; return (-1); } diff --git a/srcs/commands/channel/join.cpp b/srcs/commands/channel/join.cpp index eb36478..44f40af 100644 --- a/srcs/commands/channel/join.cpp +++ b/srcs/commands/channel/join.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/09 15:40:33 by apommier #+# #+# */ -/* Updated: 2023/03/03 19:37:23 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:18:05 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -116,7 +116,7 @@ void join_or_create(std::string buffer, fdList &allFds, int userNbr) for (int i = 0; i < joined_chan.nbrUser; i++) { send(joined_chan.userList[i]->fd, fullMsg.c_str(), fullMsg.size(), 0); - std::cout << "loop here\n"; + //std::cout << "loop here\n"; } if (chanNbr == -1) @@ -140,8 +140,8 @@ void join_loop(fdList &allFds, std::vector splitBuff, int userNbr) std::vector splitPwd; std::string buffer; - std::cout << "join loop buf= " << splitBuff[1] << std::endl; - std::cout << "==========join loop========\n"; + //std::cout << "join loop buf= " << splitBuff[1] << std::endl; + //std::cout << "==========join loop========\n"; split(splitBuff[1], ',', splitChan); split(splitBuff[1], ',', splitPwd); if (splitBuff[1] == "0") @@ -149,9 +149,9 @@ void join_loop(fdList &allFds, std::vector splitBuff, int userNbr) leave_all(allFds, userNbr); return ; } - std::cout << "==========join loop2========\n"; - std::cout << "size= " << splitChan.size() << std::endl; - std::cout << "content= " << splitChan[0] << std::endl; + //std::cout << "==========join loop2========\n"; + //std::cout << "size= " << splitChan.size() << std::endl; + //std::cout << "content= " << splitChan[0] << std::endl; for (size_t i = 0; i < splitChan.size(); i++) { if (splitChan[i][0] != '#' && splitChan[i][0] != '&') @@ -160,7 +160,7 @@ void join_loop(fdList &allFds, std::vector splitBuff, int userNbr) buffer = "476 * JOIN " + splitChan[i] + " ::Bad Channel Mask\n"; cmd_error(allFds, allFds.userData[userNbr].fd, buffer); //:Bad Channel Mask - std::cout << "bad chan mask\n"; + //std::cout << "bad chan mask\n"; return ; } if (i < splitPwd.size()) @@ -168,9 +168,9 @@ void join_loop(fdList &allFds, std::vector splitBuff, int userNbr) else buffer = "JOIN " + splitChan[i]; join_or_create(buffer, allFds, userNbr); - std::cout << "i= " << i << " ==========join loop3========\n"; + //std::cout << "i= " << i << " ==========join loop3========\n"; } - std::cout << "==========join loop3========\n"; + //std::cout << "==========join loop3========\n"; } @@ -180,7 +180,7 @@ void JOIN(std::string buffer, fdList &allFds, int userNbr) { std::vector splitBuff; std::string msg; - std::cout << "==========join start========\n"; + //std::cout << "==========join start========\n"; std::cout << "userNbr= " << userNbr << std::endl; if (!allFds.userData[userNbr].registered) @@ -192,7 +192,7 @@ void JOIN(std::string buffer, fdList &allFds, int userNbr) if (splitBuff.size() < 2) { /*change error*/ - std::cout << "JOIN : need more param\n"; + //std::cout << "JOIN : need more param\n"; cmd_error(allFds, allFds.userData[userNbr].fd, "461 * JOIN :Not enough parameters\n"); //ERR_NEEDMOREPARAMS return ; } diff --git a/srcs/commands/channel/notice.cpp b/srcs/commands/channel/notice.cpp index cbf40c5..a4a3643 100644 --- a/srcs/commands/channel/notice.cpp +++ b/srcs/commands/channel/notice.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/14 21:24:55 by apommier #+# #+# */ -/* Updated: 2023/02/14 21:35:45 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:18:13 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,10 +34,10 @@ void send_notice_msg(fdList &allFds, std::string msg, std::string dest, int user return ; for (size_t i = 0; i < allFds.channelList[pos].userList.size(); i++) { - std::cout << "send nickname " << allFds.channelList[pos].userList[i]->nickname << std::endl; + //std::cout << "send nickname " << allFds.channelList[pos].userList[i]->nickname << std::endl; if (i != (size_t)userNbr) send(allFds.channelList[pos].userList[i]->fd, fullMsg.c_str(), fullMsg.size(), 0); - std::cout << "loop here\n"; + //std::cout << "loop here\n"; } return ; } @@ -54,7 +54,7 @@ void NOTICE(std::string buffer, fdList &allFds, int userNbr) std::vector splitBuff; std::string msg; - std::cout << "notice bufer= --" << buffer << std::endl; + //std::cout << "notice bufer= --" << buffer << std::endl; split(buffer, ' ', splitBuff); if (splitBuff.size() < 2) return ; diff --git a/srcs/commands/channel/part.cpp b/srcs/commands/channel/part.cpp index 95b5028..7d5df39 100644 --- a/srcs/commands/channel/part.cpp +++ b/srcs/commands/channel/part.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/19 22:10:07 by apommier #+# #+# */ -/* Updated: 2023/03/09 03:11:17 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:54:44 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,7 +19,7 @@ void leave_chan(fdList &allFds, std::string chan, int userNbr, std::string msg) if ((chanPos = find_channel(allFds, chan)) == -1) { - cmd_error(allFds, allFds.userData[userNbr].fd, "401 * PART " + chan + " :No such nick/channel\n"); + cmd_error(allFds, allFds.userData[userNbr].fd, "401 * PART " + chan + " :No such channel\n"); return ; } if (is_joined(allFds, chan, userNbr) == -1) @@ -50,14 +50,14 @@ void leave_chan(fdList &allFds, std::string chan, int userNbr, std::string msg) // reply += " " + msg; //else // reply += "\n"; - std::cout << "leave msg=" << reply << std::endl; + //std::cout << "leave msg=" << reply << std::endl; send(allFds.userData[userNbr].fd, reply.c_str(), reply.size(), 0); //allFds.channelList[chanPos].nbrUser--; for (int i = 0; i < allFds.channelList[chanPos].nbrUser; i++) { if (allFds.channelList[chanPos].userList[i]->mode.s) send(allFds.channelList[chanPos].userList[i]->fd, reply.c_str(), reply.size(), 0); - std::cout << "loop here\n"; + //std::cout << "loop here\n"; } //cmd_reply(allFds, allFds.userData[userNbr].fd, reply + "\n"); diff --git a/srcs/commands/channel/privmsg.cpp b/srcs/commands/channel/privmsg.cpp index e08bad1..86d1b24 100644 --- a/srcs/commands/channel/privmsg.cpp +++ b/srcs/commands/channel/privmsg.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/11 08:53:03 by apommier #+# #+# */ -/* Updated: 2023/03/03 22:28:18 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:54:52 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,7 +30,7 @@ void PRIVMSG(std::string buffer, fdList &allFds, int userNbr) cmd_error(allFds, allFds.userData[userNbr].fd, "451 * PRIVMSG :You have not registered\n"); return ; } - std::cout << "privmsg bufer= --" << buffer << std::endl; + //std::cout << "privmsg bufer= --" << buffer << std::endl; split(buffer, ' ', splitBuff); if (splitBuff.size() < 2) { @@ -60,7 +60,7 @@ void send_msg(fdList &allFds, std::string msg, std::string dest, int userNbr) pos = find_channel(allFds, dest); if (pos == -1) { - cmd_error(allFds, allFds.userData[userNbr].fd, "401 * PRIVMSG " + dest + " :No such nick/channel\n"); + cmd_error(allFds, allFds.userData[userNbr].fd, "401 * PRIVMSG " + dest + " :No such channel\n"); return ; } if (allFds.channelList[pos].mode.n && is_joined(allFds, dest, userNbr) == -1 ) @@ -81,23 +81,26 @@ void send_msg(fdList &allFds, std::string msg, std::string dest, int userNbr) } for (size_t i = 0; i < allFds.channelList[pos].userList.size(); i++) { - std::cout << "send nickname " << allFds.channelList[pos].userList[i]->nickname << std::endl; + //std::cout << "send nickname " << allFds.channelList[pos].userList[i]->nickname << std::endl; - if (i != (size_t)userNbr && allFds.channelList[pos].userList[i]->mode.s) + if (&allFds.userData[userNbr] != allFds.channelList[pos].userList[i] && allFds.channelList[pos].userList[i]->mode.s) + { + //std::cout << "send msg to user nbr" << i << std::endl; send(allFds.channelList[pos].userList[i]->fd, fullMsg.c_str(), fullMsg.size(), 0); - std::cout << "loop here\n"; + } + //std::cout << "loop here\n"; } return ; } pos = find_user(allFds, dest); //return direct user fd - std::cout << "pos of user = " << pos << std::endl; + //std::cout << "pos of user = " << pos << std::endl; if (pos == -1) { - cmd_error(allFds, allFds.userData[userNbr].fd, "401 * PRIVMSG " + dest + " :No such nick/channel\n"); + cmd_error(allFds, allFds.userData[userNbr].fd, "401 * PRIVMSG " + dest + " :No such nick\n"); return ; } if (allFds.userData[pos].mode.s) send(allFds.userData[pos].fd, fullMsg.c_str(), fullMsg.size(), 0); - std::cout << "msg send\n"; - std::cout << "msg = " << fullMsg << std::endl; + //std::cout << "msg send\n"; + //std::cout << "msg = " << fullMsg << std::endl; } \ No newline at end of file diff --git a/srcs/commands/channel_op/invite.cpp b/srcs/commands/channel_op/invite.cpp index b4f18a4..59fd8e3 100644 --- a/srcs/commands/channel_op/invite.cpp +++ b/srcs/commands/channel_op/invite.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/11 19:19:56 by apommier #+# #+# */ -/* Updated: 2023/02/23 17:47:06 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:54:59 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -41,7 +41,7 @@ void INVITE(std::string buffer, fdList &allFds, int userNbr) } if ((invitedNbr = find_user(allFds, splitBuff[1])) == -1) { - cmd_error(allFds, allFds.userData[userNbr].fd, "401 * " + splitBuff[1] + " :No such nick/channel\n"); + cmd_error(allFds, allFds.userData[userNbr].fd, "401 * " + splitBuff[1] + " :No such nick\n"); return ; } if (is_joined(allFds, splitBuff[2], userNbr) == -1) diff --git a/srcs/commands/channel_op/kick.cpp b/srcs/commands/channel_op/kick.cpp index a2881fc..953e6ab 100644 --- a/srcs/commands/channel_op/kick.cpp +++ b/srcs/commands/channel_op/kick.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/11 19:19:32 by apommier #+# #+# */ -/* Updated: 2023/03/03 22:24:11 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:25:45 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,7 +37,7 @@ void KICK(std::string buffer, fdList &allFds, int userNbr) if ((chanPos = find_channel(allFds, splitBuff[1])) == -1) { - cmd_error(allFds, allFds.userData[userNbr].fd, "401 * KICK " + splitBuff[1] + " :No such nick/channel\n"); + cmd_error(allFds, allFds.userData[userNbr].fd, "401 * KICK " + splitBuff[1] + " :No such channel\n"); return ; } if (!allFds.userData[userNbr].op && is_joined(allFds, splitBuff[1], userNbr) == -1) @@ -45,6 +45,13 @@ void KICK(std::string buffer, fdList &allFds, int userNbr) cmd_error(allFds, allFds.userData[userNbr].fd, "422 * " + splitBuff[1] + " :You're not on that channel\n"); return ; } + + if ((find_user(allFds, splitBuff[2])) == -1) + { + cmd_error(allFds, allFds.userData[userNbr].fd, "401 * KICK " + splitBuff[1] + " :No such nick\n"); + return ; + } + if (chanPos != -1) { chan = allFds.channelList[chanPos]; @@ -62,7 +69,7 @@ void KICK(std::string buffer, fdList &allFds, int userNbr) return ; } kickMsg = allFds.userData[userPos].nickname + " have been kicked by " + allFds.userData[userNbr].nickname + "\n"; - PART("PART " + splitBuff[1], allFds, userPos); + PART("PART " + splitBuff[1] + " has been kicked by " + allFds.userData[userNbr].nickname, allFds, userPos); //del_user_in_chan(&allFds.userData[userPos], &allFds.channelList[chanPos]); //del_chan_in_user(&allFds.userData[userPos], &allFds.channelList[chanPos]); std::cout << "kick msg---" << msg << "---" << std::endl; diff --git a/srcs/commands/channel_op/mode.cpp b/srcs/commands/channel_op/mode.cpp index cb1937c..b9e27f4 100644 --- a/srcs/commands/channel_op/mode.cpp +++ b/srcs/commands/channel_op/mode.cpp @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* mode.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: sadjigui +#+ +:+ +#+ */ +/* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/11 19:19:30 by apommier #+# #+# */ -/* Updated: 2023/03/09 03:32:36 by sadjigui ### ########.fr */ +/* Updated: 2023/03/09 05:44:57 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -110,6 +110,7 @@ void chan_opt_b(fdList &allFds, int userNbr, std::vector opt, int c if (sign == true && target_in_ban == -1) { allFds.channelList[chanNbr].banList.push_back(&allFds.userData[target_in_client]); + std::cout << "call kick\n"; KICK("/KICK " + allFds.channelList[chanNbr].name + " " + allFds.userData[target_in_client].nickname + " You have been banned from this channel", allFds, userNbr); if ((pos = find_client_list(allFds.channelList[chanNbr].userList, &allFds.userData[target_in_client])) != -1) allFds.channelList[chanNbr].userList.erase(allFds.channelList[chanNbr].userList.begin() + pos); @@ -179,7 +180,7 @@ void do_user_opt(fdList &allFds, int userNbr, std::vector opt, int bool sign = true; if (opt[2][0] == '-') sign = false; - if (allFds.userData[userNbr].userName != opt[1]) + if (allFds.userData[userNbr].nickname != opt[1]) { 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"); diff --git a/srcs/commands/operator/kill.cpp b/srcs/commands/operator/kill.cpp index 8eb1dc0..b43ca24 100644 --- a/srcs/commands/operator/kill.cpp +++ b/srcs/commands/operator/kill.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/15 16:34:57 by apommier #+# #+# */ -/* Updated: 2023/02/23 17:47:50 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:55:10 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -36,7 +36,7 @@ void KILL(std::string buffer, fdList &allFds, int userNbr) pos = find_user(allFds, splitBuff[1]); if (pos == -1) { - cmd_error(allFds, allFds.userData[userNbr].fd, "401 * KILL " + splitBuff[1] + " :No such nick/channel\n"); + cmd_error(allFds, allFds.userData[userNbr].fd, "401 * KILL " + splitBuff[1] + " :No such nick\n"); return ; } std::string msg; diff --git a/srcs/commands/other/ping_pong.cpp b/srcs/commands/other/ping_pong.cpp index eb8e993..8b0bbb1 100644 --- a/srcs/commands/other/ping_pong.cpp +++ b/srcs/commands/other/ping_pong.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/13 00:16:27 by apommier #+# #+# */ -/* Updated: 2023/02/14 14:27:53 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:02:08 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -54,10 +54,10 @@ void PING(std::string buffer, fdList &allFds, int userNbr) msg = ":irc.local PONG irc.local :" + splitBuff[1] + "\n"; //msg = "PONG irc.local " + splitBuff[1]; send(allFds.userData[userNbr].fd, msg.c_str(), msg.size(), 0); - std::cout << "pong send\n"; - std::cout << "/r = " << (int)'\r' << "\n"; - std::cout << "/n = " << (int)'\n' << "\n"; - std::cout << "msg=" << msg << "\n"; + //std::cout << "pong send\n"; + //std::cout << "/r = " << (int)'\r' << "\n"; + //std::cout << "/n = " << (int)'\n' << "\n"; + //std::cout << "msg=" << msg << "\n"; // if (splitBuff.size() < 2) // { // cmd_error(allFds, allFds.userData[userNbr].fd, "431 * NICK :No nickname given\n"); diff --git a/srcs/commands/other/quit.cpp b/srcs/commands/other/quit.cpp index d3934e9..f084c85 100644 --- a/srcs/commands/other/quit.cpp +++ b/srcs/commands/other/quit.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/11 19:10:26 by apommier #+# #+# */ -/* Updated: 2023/03/03 22:24:47 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:18:42 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -33,9 +33,9 @@ void send_quit_msg(fdList &allFds, int userNbr, std::string msg) if (allFds.userData[userNbr].joinedChan[i]->userList[j]->mode.s) send(allFds.userData[userNbr].joinedChan[i]->userList[j]->fd, fullMsg.c_str(), fullMsg.size(), 0); } - else - std::cout << "hehe je quitte\n"; - std::cout << "loop here\n"; + //else + // std::cout << "hehe je quitte\n"; + //std::cout << "loop here\n"; } } } diff --git a/srcs/commands/other/who.cpp b/srcs/commands/other/who.cpp index 4f73c3e..b53d6da 100644 --- a/srcs/commands/other/who.cpp +++ b/srcs/commands/other/who.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/02/16 18:14:17 by apommier #+# #+# */ -/* Updated: 2023/02/23 17:49:05 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:55:15 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -65,7 +65,7 @@ void WHO(std::string buffer, fdList &allFds, int userNbr) } if ((pos = find_channel(allFds, splitBuff[1])) == -1) { - cmd_error(allFds, allFds.userData[userNbr].fd, "401 * " + splitBuff[1] + " :No such nick/channel\n"); + cmd_error(allFds, allFds.userData[userNbr].fd, "401 * " + splitBuff[1] + " :No such channel\n"); return ; } for (int i = 0; i < allFds.channelList[pos].nbrUser; i++) diff --git a/srcs/commands/parse_commands.cpp b/srcs/commands/parse_commands.cpp index 1ce782b..c2f3165 100644 --- a/srcs/commands/parse_commands.cpp +++ b/srcs/commands/parse_commands.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/06 22:01:25 by apommier #+# #+# */ -/* Updated: 2023/02/15 20:09:04 by apommier ### ########.fr */ +/* Updated: 2023/03/09 05:38:19 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,16 +23,18 @@ std::string ft_test() void parse_commands(std::string buffer, fdList &allFds, int userNbr) { //std::string cmd = buffer; - std::cout << "===========parse command=============" << std::endl; + std::cout << "\n===========MSG RECEIVE=============" << std::endl; std::vector splitBuff; + std::cout << "USERNBR: " << userNbr << " | "; + std::cout << "BUFFER: " << buffer; int a = 0; if (buffer.find(13) != std::string::npos) //change that pls { - std::cout << "pos of bitch= " << buffer.find(13) << std::endl; - std::cout << "size= " << buffer.size() << std::endl; - if (buffer.find(13) != buffer.size() - 2) - std::cout << "BE CAREFUL CHAR 10 (line feed) not at end\n"; + //std::cout << "pos of bitch= " << buffer.find(13) << std::endl; + //std::cout << "size= " << buffer.size() << std::endl; + //if (buffer.find(13) != buffer.size() - 2) + // std::cout << "BE CAREFUL CHAR 10 (line feed) not at end\n"; buffer.erase(buffer.find(13), 1); } @@ -43,10 +45,10 @@ void parse_commands(std::string buffer, fdList &allFds, int userNbr) return ; allFds.userData[userNbr].cmdBuffer.erase(allFds.userData[userNbr].cmdBuffer.size() - 1); split(allFds.userData[userNbr].cmdBuffer, ' ', splitBuff); - std::cout << "before toupper: " << splitBuff[0] << std::endl; + //std::cout << "before toupper: " << splitBuff[0] << std::endl; for (size_t i = 0; i < splitBuff[0].size(); i++) splitBuff[0][i] = toupper(splitBuff[0][i]); - std::cout << "after toupper: " << splitBuff[0] << std::endl; + //std::cout << "after toupper: " << splitBuff[0] << std::endl; while (a < allFds.parsingTab.cmdNbr - 1 && splitBuff[0] != allFds.parsingTab.cmdName[a]) a++; //std::cout << "after while \n"; diff --git a/srcs/new_connection.cpp b/srcs/new_connection.cpp index 5a26f1a..d36436e 100644 --- a/srcs/new_connection.cpp +++ b/srcs/new_connection.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/09 22:26:27 by apommier #+# #+# */ -/* Updated: 2023/02/16 23:01:04 by apommier ### ########.fr */ +/* Updated: 2023/03/09 04:59:05 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ void new_connection(fdList &allFds) int addrLen = sizeof(addr); int newFd; - std::cout << "==========newconnection========\n"; + std::cout << "==========NEW CLIENT========\n"; //std::cout << "in new adress " << &allFds << std::endl; //std::cout << "new connection !" << std::endl;