From 6377c9e0963ccc17a685a5167a8d6c389e89531f Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Sun, 21 Jan 2024 12:04:54 +0100 Subject: [PATCH] SUUUUUUUUUUUUTUTUTUTUTTUUUUUUUUUUUUU --- Makefile | 16 ++++++++-------- includes/message.hpp | 6 +++++- srcs/{utils => }/ansi.cpp | 0 srcs/{core => }/channel.cpp | 0 srcs/{core => }/client.cpp | 0 srcs/{core => }/logs.cpp | 0 srcs/{core => }/main.cpp | 0 srcs/{core => }/message.cpp | 4 ++-- srcs/{core => }/server.cpp | 0 9 files changed, 15 insertions(+), 11 deletions(-) rename srcs/{utils => }/ansi.cpp (100%) rename srcs/{core => }/channel.cpp (100%) rename srcs/{core => }/client.cpp (100%) rename srcs/{core => }/logs.cpp (100%) rename srcs/{core => }/main.cpp (100%) rename srcs/{core => }/message.cpp (94%) rename srcs/{core => }/server.cpp (100%) diff --git a/Makefile b/Makefile index e8f7300..dfbc8fa 100644 --- a/Makefile +++ b/Makefile @@ -6,19 +6,19 @@ # By: vavaas +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/08/09 15:08:49 by vavaas #+# #+# # -# Updated: 2024/01/21 11:41:25 by maldavid ### ########.fr # +# Updated: 2024/01/21 12:04:28 by maldavid ### ########.fr # # # # **************************************************************************** # NAME = ircserv -SRCS = srcs/core/main.cpp \ - srcs/core/logs.cpp \ - srcs/core/server.cpp \ - srcs/core/client.cpp \ - srcs/core/channel.cpp \ - srcs/core/message.cpp \ - srcs/utils/ansi.cpp \ +SRCS = srcs/main.cpp \ + srcs/logs.cpp \ + srcs/server.cpp \ + srcs/client.cpp \ + srcs/channel.cpp \ + srcs/message.cpp \ + srcs/ansi.cpp \ OBJ_DIR = objs OBJS = $(addprefix $(OBJ_DIR)/, $(SRCS:.cpp=.o)) diff --git a/includes/message.hpp b/includes/message.hpp index 21c5af6..160a403 100644 --- a/includes/message.hpp +++ b/includes/message.hpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/21 11:35:21 by maldavid #+# #+# */ -/* Updated: 2024/01/21 11:39:56 by maldavid ### ########.fr */ +/* Updated: 2024/01/21 12:04:43 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,6 +23,10 @@ namespace irc public: Message(unstd::SharedPtr client, const std::string& msg); + inline unstd::SharedPtr getClient() const { return _client; } + inline const std::string& getRawMsg() const { return _raw_msg; } + inline const std::string& getCmd() const { return _command; } + ~Message(); private: diff --git a/srcs/utils/ansi.cpp b/srcs/ansi.cpp similarity index 100% rename from srcs/utils/ansi.cpp rename to srcs/ansi.cpp diff --git a/srcs/core/channel.cpp b/srcs/channel.cpp similarity index 100% rename from srcs/core/channel.cpp rename to srcs/channel.cpp diff --git a/srcs/core/client.cpp b/srcs/client.cpp similarity index 100% rename from srcs/core/client.cpp rename to srcs/client.cpp diff --git a/srcs/core/logs.cpp b/srcs/logs.cpp similarity index 100% rename from srcs/core/logs.cpp rename to srcs/logs.cpp diff --git a/srcs/core/main.cpp b/srcs/main.cpp similarity index 100% rename from srcs/core/main.cpp rename to srcs/main.cpp diff --git a/srcs/core/message.cpp b/srcs/message.cpp similarity index 94% rename from srcs/core/message.cpp rename to srcs/message.cpp index 5f7c2ff..fdabfe3 100644 --- a/srcs/core/message.cpp +++ b/srcs/message.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/21 11:38:34 by maldavid #+# #+# */ -/* Updated: 2024/01/21 11:40:56 by maldavid ### ########.fr */ +/* Updated: 2024/01/21 12:03:47 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,6 +19,6 @@ namespace irc { } - + Message::~Message() {} } diff --git a/srcs/core/server.cpp b/srcs/server.cpp similarity index 100% rename from srcs/core/server.cpp rename to srcs/server.cpp