Namonay/42_irc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

caca boudin qui pue

Browse Source
This commit is contained in:
Kbz-8
2024-01-22 18:17:48 +01:00
parent 7b60a2e6d3
commit d70b1b8e30
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -6,7 +6,7 @@
# By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ # # By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/08/09 15:08:49 by vavaas #+# #+# # # Created: 2023/08/09 15:08:49 by vavaas #+# #+# #
# Updated: 2024/01/22 17:31:49 by maldavid ### ########.fr # # Updated: 2024/01/22 17:32:49 by maldavid ### ########.fr #
# # # #
#******************************************************************************# #******************************************************************************#
@@ -27,6 +27,7 @@ OBJS = $(addprefix $(OBJ_DIR)/, $(SRCS:.cpp=.o))
CXX = c++ CXX = c++
FLAGS ?= true FLAGS ?= true
CXXFLAGS = -std=c++98 -I includes CXXFLAGS = -std=c++98 -I includes
ifeq ($(FLAGS), true) ifeq ($(FLAGS), true)
CXXFLAGS += -Wall -Wextra -Werror CXXFLAGS += -Wall -Wextra -Werror
endif endif

12
includes/channel.hpp
View File

@@ -6,7 +6,7 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:34:25 by maldavid #+# #+# */ /* Created: 2024/01/21 10:34:25 by maldavid #+# #+# */
/* Updated: 2024/01/22 16:06:15 by maldavid ### ########.fr */ /* Updated: 2024/01/22 18:14:50 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -26,15 +26,25 @@ namespace irc
Channel(const std::string& name); Channel(const std::string& name);
inline const std::string& getName() const { return _name; } inline const std::string& getName() const { return _name; }
inline const std::string& getPassword() const { return _password; }
inline void addClient(unstd::SharedPtr<Client> client) { _clients.insert(client); } inline void addClient(unstd::SharedPtr<Client> client) { _clients.insert(client); }
inline bool removeClient(unstd::SharedPtr<Client> client) { return _clients.erase(client); } inline bool removeClient(unstd::SharedPtr<Client> client) { return _clients.erase(client); }
inline std::size_t getNumberOfClients() const { return _clients.size(); } inline std::size_t getNumberOfClients() const { return _clients.size(); }
inline void addOperator(unstd::SharedPtr<Client> op) { _operators.insert(op); }
inline bool removeOperator(unstd::SharedPtr<Client> op) { return _operators.erase(op); }
inline bool isInviteOnly() const { return _invite_only; }
~Channel(); ~Channel();
private: private:
std::set<unstd::SharedPtr<Client> > _clients; std::set<unstd::SharedPtr<Client> > _clients;
std::set<unstd::SharedPtr<Client> > _operators;
const std::string _name; const std::string _name;
std::string _password;
bool _invite_only;
}; };
} }

3
srcs/server.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 09:31:17 by maldavid #+# #+# */ /* Created: 2024/01/21 09:31:17 by maldavid #+# #+# */
/* Updated: 2024/01/22 17:31:00 by maldavid ### ########.fr */ /* Updated: 2024/01/22 17:44:27 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -153,6 +153,7 @@ namespace irc
handlePing(client, msg); handlePing(client, msg);
else if(msg.getCmd() == "MODE") else if(msg.getCmd() == "MODE")
handleMode(client, msg); handleMode(client, msg);
return true; return true;
} }

6
srcs/server_functions.cpp
View File

@@ -6,7 +6,7 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/22 17:31:06 by maldavid #+# #+# */ /* Created: 2024/01/22 17:31:06 by maldavid #+# #+# */
/* Updated: 2024/01/22 17:31:28 by maldavid ### ########.fr */ /* Updated: 2024/01/22 18:05:35 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -57,6 +57,8 @@ namespace irc
void Server::handleQuit(unstd::SharedPtr<class Client> client, const Message& msg) void Server::handleQuit(unstd::SharedPtr<class Client> client, const Message& msg)
{ {
(void)msg; (void)msg;
for(std::vector<Channel>::iterator it = _channels.begin(); it != _channels.end(); ++it)
it->removeClient(client);
client->printUserHeader(); client->printUserHeader();
std::cout << "quit" << std::endl; std::cout << "quit" << std::endl;
} }
@@ -127,8 +129,8 @@ namespace irc
if(it == _channels.end()) if(it == _channels.end())
{ {
_channels.push_back(Channel(msg.getTokens()[1])); _channels.push_back(Channel(msg.getTokens()[1]));
logs::report(log_message, "channel '%s' has beed created", msg.getTokens()[1].c_str());
_channels.back().addClient(client); _channels.back().addClient(client);
logs::report(log_message, "channel '%s' has beed created", msg.getTokens()[1].c_str());
} }
else else
it->addClient(client); it->addClient(client);