fixing vavaas mental issues

srcs/channel.cpp

@@ -6,7 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/21 10:36:21 by maldavid          #+#    #+#             */
-/*   Updated: 2024/02/06 12:09:38 by vvaas            ###   ########.fr       */
+/*   Updated: 2024/02/06 12:31:15 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -48,8 +48,8 @@ namespace irc
 				
 				if(const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName() == clientname)
 				{
-					if (isOp(*it))
+					if(isOp(*it))
-						return ;
+						return;
 					showModesModify(client, mode, 'o', clientname);
 					_operators.insert(const_cast<unstd::SharedPtr<irc::Client>&>(*it));
 					break;
@@ -125,11 +125,11 @@ namespace irc
 
 		modes += (modevalue) ? '+' : '-';
 		modes += flag;
-		if (flag == 'k')
+		if(flag == 'k')
 			modes += " " + _password;
-		if (flag == 'l')
+		if(flag == 'l')
 			modes += " " + unstd::toString(_channel_size);;
-		if (flag == 'o')
+		if(flag == 'o')
 			modes += " " + op;
 		out += getName();
 		for(client_it it = _clients.begin(); it != _clients.end(); ++it)
@@ -149,9 +149,9 @@ namespace irc
 		if(_channel_size != -1)
 			modes += 'l';
 		if(modes.size() <= 2)
-			return ;
+			return;
-		if (modes.size() == _name.size() + 2)
+		if(modes.size() == _name.size() + 2)
-			return ;
+			return;
 		client->sendCode(RPL_CHANNELMODEIS, modes);
 	}
 
@@ -162,48 +162,48 @@ namespace irc
 		unsigned long arg_nb = 3;
 		int arg_index = 2;
 
-		if (flags.find_first_not_of("itkol+-") != std::string::npos || flags.find_last_of("+-") != 0)
+		if(flags.find_first_not_of("itkol+-") != std::string::npos || flags.find_last_of("+-") != 0)
 		{
 			client->sendCode(ERR_UNKNOWNMODE, "MODE : Unknown mode");
-			return ;
+			return;
 		}
-		for (std::string::iterator it = flags.begin() + 1; it != flags.end(); ++it)
+		for(std::string::iterator it = flags.begin() + 1; it != flags.end(); ++it)
 		{
-			if (std::distance(flags.begin(), it) != static_cast<long>(flags.find_first_of(*it)))
+			if(std::distance(flags.begin(), it) != static_cast<long>(flags.find_first_of(*it)))
 				it = flags.erase(it) - 1;
 		}
-		if (flags.find('o') != std::string::npos)
+		if(flags.find('o') != std::string::npos)
 			arg_nb++;
-		if (flags.find('k') != std::string::npos && modevalue)
+		if(flags.find('k') != std::string::npos && modevalue)
 			arg_nb++;
-		if (flags.find('l') != std::string::npos && modevalue)
+		if(flags.find('l') != std::string::npos && modevalue)
 			arg_nb++;
-		if (msg.getTokens().size() < arg_nb)
+		if(msg.getTokens().size() < arg_nb)
 		{
 			client->sendCode(ERR_NEEDMOREPARAMS, "MODE : Need more params");
-			return ;
+			return;
 		}
 
-		for (std::string::iterator it = flags.begin() + 1; it != flags.end(); ++it)
+		for(std::string::iterator it = flags.begin() + 1; it != flags.end(); ++it)
 		{
 			switch(*it)
 			{
 				case 'i':
-					if (_invite_only == modevalue)
+					if(_invite_only == modevalue)
 						break;
 					_invite_only = modevalue;
 					showModesModify(client, modevalue, 'i');
-					break ;
+					break;
 				case 't':
-					if (_topic_op_restrict == modevalue)
+					if(_topic_op_restrict == modevalue)
 						break;
 					_topic_op_restrict = modevalue;
 					showModesModify(client, modevalue, 't');
-					break ;
+					break;
 				case 'k':
 					if(modevalue)
 					{
-						if (msg.getArgs()[arg_index] == _password)
+						if(msg.getArgs()[arg_index] == _password)
 						{
 							arg_index++;
 							break;
@@ -214,19 +214,19 @@ namespace irc
 					}
 					else
 					{
-						if (_password.empty())
+						if(_password.empty())
-							return ;
+							return;
 						_password.clear();
 						logs::report(log_message, "password removed on %s", _name.c_str());
 						showModesModify(client, modevalue, 'k');
 					}
-					break ;
+					break;
 				case 'o':
 					modOperator(client, msg.getArgs()[arg_index++], modevalue);
-					break ;
+					break;
 				case 'l':
-					if (!modevalue && _channel_size == -1)
+					if(!modevalue && _channel_size == -1)
-						return ;
+						return;
 					if(!modevalue)
 					{
 						_channel_size = -1;
@@ -241,13 +241,13 @@ namespace irc
 						{
 							client->sendCode(ERR_UNKNOWNMODE, "MODE : Invalid channel size");
 							logs::report(log_error, "invalid channel size");
-							return ;
+							return;
 						}
-						if (tmp == _channel_size)
+						if(tmp == _channel_size)
-							return ;
+							return;
 						else
 						{
-							if (tmp == _channel_size)
+							if(tmp == _channel_size)
 								break;
 							_channel_size = tmp;
 							showModesModify(client, modevalue, 'l');

srcs/client.cpp

@@ -6,7 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/21 10:35:52 by maldavid          #+#    #+#             */
-/*   Updated: 2024/02/06 11:40:41 by vvaas            ###   ########.fr       */
+/*   Updated: 2024/02/06 12:31:53 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -103,7 +103,7 @@ namespace irc
 #ifdef DEBUG
 		logs::report(log_message,"sending '%s'", buffer.c_str());
 #endif	
-		if (send(_fd, buffer.c_str(), buffer.length(), 0) < static_cast<ssize_t>(buffer.length()))
+		if(send(_fd, buffer.c_str(), buffer.length(), 0) < static_cast<ssize_t>(buffer.length()))
 			logs::report(log_error, "server failed to send a message to '%s'", _nickname.c_str());
 	}
 	void Client::printUserHeader() const
@@ -147,8 +147,8 @@ namespace irc
 		std::string tosend = "Your host is ";
 		getsockopt(_fd, SOL_SOCKET, SO_PROTOCOL, &protocol, &size);
 		protoent *proto = getprotobynumber(protocol);
-		if (!isLogged() || !isRegistered() || isWelcomed() || _nickname.empty())
+		if(!isLogged() || !isRegistered() || isWelcomed() || _nickname.empty())
-			return ;
+			return;
 		_welcomed = true; 
 		gethostname(hostname, 1023);
 		tosend += hostname;

srcs/server.cpp

@@ -6,7 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/21 09:31:17 by maldavid          #+#    #+#             */
-/*   Updated: 2024/02/06 12:21:13 by vvaas            ###   ########.fr       */
+/*   Updated: 2024/02/06 12:31:42 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -35,10 +35,10 @@ namespace irc
 		struct tm tstruct = *localtime(&ltime);
 		char buf[100];
 
-		if (password.empty() || password.find_first_of(" \t\r\v") != std::string::npos)
+		if(password.empty() || password.find_first_of(" \t\r\v") != std::string::npos)
 		{
 			logs::report(log_error, "Password is invalid !");
-			return ;
+			return;
 		}
 		std::memset(&_s_data, 0, sizeof(sockaddr));
 		initSocket();
@@ -84,13 +84,13 @@ namespace irc
 		{
 			if(!FD_ISSET((*it)->getFD(), &_fd_set))
 				continue;
-			while ((recv_size = recv((*it)->getFD(), buffer, INPUT_SIZE, 0)) > 0) // read() but forsocket fd
+			while((recv_size = recv((*it)->getFD(), buffer, INPUT_SIZE, 0)) > 0) // read() but forsocket fd
 			{
 				(*it)->newMsgInFlight(buffer);
 			#ifdef DEBUG
 				logs::report(log_message,"processing '%s'", buffer);
 			#endif
-				while (handleMessage(*it));
+				while(handleMessage(*it));
 				std::memset(buffer, 0, sizeof(buffer)); // clear the buffer to avoid trash remaining
 			}
 			if(recv_size == 0 || (*it)->disconnectRequired()) // recv return 0 ifan user disconnect
@@ -121,8 +121,8 @@ namespace irc
 		int i = 0;
 		socklen_t len = sizeof(sockaddr_in);
 
-		if (_main_socket == NULL_SOCKET)
+		if(_main_socket == NULL_SOCKET)
-			return ;
+			return;
 		while(_active)
 		{
 			FD_ZERO(&_fd_set);
@@ -238,9 +238,9 @@ namespace irc
 
 	Server::~Server()
 	{
-		for (client_it it = _client.begin(); it != _client.end(); ++it)
+		for(client_it it = _client.begin(); it != _client.end(); ++it)
 		{
-			if ((*it)->isWelcomed())
+			if((*it)->isWelcomed())
 				(*it)->kill("Server shutting down");
 		}
 		closeMainSocket();

srcs/server_functions.cpp

@@ -6,7 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/22 17:31:06 by maldavid          #+#    #+#             */
-/*   Updated: 2024/02/06 11:38:00 by vvaas            ###   ########.fr       */
+/*   Updated: 2024/02/06 12:30:27 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -42,18 +42,18 @@ namespace irc
 			return;
 		}
 		if(msg.getTokens().size() >= 3)
-			return ;
+			return;
 		const std::string& nickname = msg.getTokens()[1];
 		for(client_it it = _client.begin(); it != _client.end(); ++it)
 		{
 			if((*it)->getNickName() == nickname)
 			{
-				if (client->getNickName().empty())
+				if(client->getNickName().empty())
 				{
 					client->sendCode(ERR_NICKCOLLISION, " NICK : Nickname is used");
 					client->kill(" NICK : Nickname already used");
 					client->requireDisconnect();
-					return ;
+					return;
 				}
 				client->sendCode(ERR_NICKCOLLISION, "NICK : Nickname is used");
 				return;
@@ -79,10 +79,10 @@ namespace irc
 		if(client->isRegistered())
 		{
 			client->sendCode(ERR_ALREADYREGISTRED, "USER : You are already registered");
-			return ;
+			return;
 		}
 		if(msg.getTokens()[4][0] != ':')
-			return ;
+			return;
 		client->printUserHeader();
 		client->setNewUserName(msg.getTokens()[1]);
 		std::cout << "new username, " << client->getUserName() << std::endl;
@@ -190,7 +190,7 @@ namespace irc
 			_channels.push_back(Channel(msg.getTokens()[1]));
 			_channels.back().addClient(client, true);
 			logs::report(log_message, "channel '%s' has been created", msg.getTokens()[1].c_str());
-			return ;
+			return;
 		}
 		if((msg.getTokens().size() == 3 && msg.getTokens()[2] != it->getPassword()) || (msg.getTokens().size() == 2 && it->getPassword().size() > 0))
 			client->sendCode(ERR_BADCHANNELKEY, "JOIN : Invalid password");
@@ -219,7 +219,7 @@ namespace irc
 		if(msg.getReason().empty())
 		{
 			client->sendCode(ERR_NOTEXTTOSEND, "PRIVMSG : No text to send");
-			return ;
+			return;
 		}
 		if(msg.getTokens()[1][0] != '&' && msg.getTokens()[1][0] != '#')
 		{
@@ -252,7 +252,7 @@ namespace irc
 				if(!it->hasClient(client))
 				{
 					client->sendCode(ERR_CANNOTSENDTOCHAN, "PRIVMSG : You are not in the channel");
-					return ;
+					return;
 				}
 				std::string complete_msg;
 				if(msg.getTokens().size() > 2)
@@ -294,7 +294,7 @@ namespace irc
 					break;
 				}
 			}
-			return ;
+			return;
 		}
 		for(channel_it it = _channels.begin(); it != _channels.end(); ++it)
 		{
@@ -431,7 +431,7 @@ namespace irc
 		if((chan = getChannelByName(msg.getTokens()[1])) == NULL)
 		{
 			client->sendCode(ERR_NOSUCHCHANNEL, "WHO : No such channel");
-			return ;
+			return;
 		}
 		chan->sendWho(client);
 	}
@@ -485,7 +485,7 @@ namespace irc
 		if(msg.getTokens().size() < 2)
 		{
 			client->sendCode(ERR_NEEDMOREPARAMS, "MODE : Need more parameters");
-			return ;
+			return;
 		}
 		if(msg.getTokens().size() == 2 && (msg.getTokens()[1][0] == '#' || msg.getTokens()[1][0] == '&'))
 		{
@@ -494,23 +494,23 @@ namespace irc
 				client->sendCode(ERR_NOSUCHCHANNEL, "MODE : No such channel");
 			else
 				chan->showModes(client);
-			return ;
+			return;
 		}
 		chan = getChannelByName(msg.getTokens()[1]);
 		if(chan == NULL)
 		{
 			client->sendCode(ERR_NOSUCHCHANNEL, "MODE : No such channel");
-			return ;
+			return;
 		}
 		if(!chan->isOp(client))
 		{
 			client->sendCodeInChannel(ERR_CHANOPRIVSNEEDED, *chan, "MODE : You need operator privileges to execute this command");
-			return ;
+			return;
 		}
 		if(msg.getTokens()[2][0] != '-' && msg.getTokens()[2][0] != '+')
 		{
 			client->sendCode(ERR_UNKNOWNMODE, "MODE : Invalid flags (missing +/-)");
-			return ;
+			return;
 		}
 		chan->changeMode(client, msg);
 	}