change users container type in channels

Author: siliotar

Channel.cpp

@@ -1,7 +1,7 @@
 #include "Channel.hpp"
 
 Channel::Channel(const std::string &name, const std::string &creator, const std::string &pass = "") :
-name(name), mainOperator(creator), pass(pass), userLimit(10), flags(0)
+name(name), pass(pass), userLimit(10), flags(0)
 {}
 
 Channel::~Channel()
@@ -55,10 +55,12 @@ void					Channel::connect(const User &user)
 	for (size_t i = 0; i < banMasks.size(); i++)
 		if (isBanned(banMasks[i], user.getPrefix()))
 			return ; 										//throw 474 ERR_BANNEDFROMCHAN
-	for (size_t i = 0; i < users.size(); i++)
-		if (users[i].getPrefix() == user.getPrefix())
+	std::map<User, size_t>::iterator	begin = users.begin();
+	std::map<User, size_t>::iterator	end = users.end();
+	for (; begin != end; ++begin)
+		if ((*begin).first.getPrefix() == user.getPrefix())
 			return ;
-	users.push_back(user);
+	users[user] = 0;
 }
 
 void					Channel::setFlag(unsigned char flag)
@@ -75,6 +77,8 @@ void					Channel::sendMessage(const std::string &message, const User &from)
 {
 	std::string	msg;
 	msg += ":" + from.getPrefix() + " " + message;
-	for (size_t i = 0; i < users.size(); i++)
-		users[i].sendMessage(msg);
+	std::map<User, size_t>::iterator	begin = users.begin();
+	std::map<User, size_t>::iterator	end = users.end();
+	for (; begin != end; ++begin)
+		(*begin).first.sendMessage(msg);
 }

Channel.hpp

@@ -3,6 +3,7 @@
 
 # include <string>
 # include <vector>
+# include <map>
 # include "User.hpp"
 
 # define PRIVATE	0b00001
@@ -15,13 +16,12 @@ class Channel
 {
 	private:
 		std::string					name;
-		std::string					mainOperator;
-		std::string					operators;
+		std::vector<std::string>	operators;
 		std::string					pass;
 		unsigned short				userLimit;
 		std::vector<std::string>	banMasks;
 		unsigned char				flags;
-		std::vector<User>			users;
+		std::map<User, size_t>		users;
 		std::string					topic;
 	public:
 		Channel(const std::string &name, const std::string &creator, const std::string &pass = "");

User.cpp

@@ -178,7 +178,7 @@ int							User::hadleMessages()
 	return (0);
 }
 
-void						User::sendMessage(const std::string &msg)
+void						User::sendMessage(const std::string &msg) const
 {
 	if (msg.size() > 0)
 		send(sockfd, msg.c_str(), msg.size(), 0);

User.hpp

@@ -61,7 +61,7 @@ class User
 		void						readMessage();
 		std::vector<std::string>	parseCommand();
 		int							hadleMessages();
-		void						sendMessage(const std::string &msg);
+		void						sendMessage(const std::string &msg) const;
 };
 
 #endif