raphael/ft_irc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(commands/cmd): fixing the compilation errors missing the lists part

Browse source
This commit is contained in:
Raphael 2025-05-26 18:26:59 +02:00
parent 29a3bb114b
commit a2b5793e19
9 changed files with 27 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -6,7 +6,7 @@
# By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ # # By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2025/05/02 15:40:00 by rparodi #+# #+# # # Created: 2025/05/02 15:40:00 by rparodi #+# #+# #
# Updated: 2025/05/26 16:18:54 by rparodi ### ########.fr # # Updated: 2025/05/26 18:22:38 by rparodi ### ########.fr #
# # # #
#******************************************************************************# #******************************************************************************#
@ -24,14 +24,13 @@ CXXFLAGS = -Werror -Wextra -Wall -std=c++98
SESSION = test-irc SESSION = test-irc
# Sources # Sources
SRC = sources/core/logs.cpp \ SRC = sources/channel/channel.cpp \
sources/core/check.cpp \
sources/core/PollManager.cpp \ sources/core/PollManager.cpp \
sources/core/parser.cpp \
sources/core/main.cpp \
sources/core/Server.cpp \ sources/core/Server.cpp \
sources/core/check.cpp \
sources/core/main.cpp \
sources/core/parser.cpp \
sources/user/user.cpp \ sources/user/user.cpp \
sources/channel/channel.cpp \
sources/commands/commands.cpp \ sources/commands/commands.cpp \
sources/commands/invite.cpp sources/commands/invite.cpp
@ -75,7 +74,7 @@ re: header fclean all
$(NAME): $(OBJ) $(NAME): $(OBJ)
@mkdir -p $(OBJDIRNAME) @mkdir -p $(OBJDIRNAME)
@printf '$(GREY) Creating $(END)$(GREEN)$(OBJDIRNAME)$(END)\n' @printf '$(GREY) Creating $(END)$(GREEN)$(OBJDIRNAME)$(END)\n'
@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(NAME) $(OBJ) @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(NAME) $(OBJ) -fuse-ld=lld
# Creating the objects # Creating the objects
$(OBJDIRNAME)/%.o: %.cpp $(OBJDIRNAME)/%.o: %.cpp

4
include/commands.hpp
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/20 23:31:58 by rparodi #+# #+# */ /* Created: 2025/05/20 23:31:58 by rparodi #+# #+# */
/* Updated: 2025/05/26 16:28:58 by rparodi ### ########.fr */ /* Updated: 2025/05/26 18:25:49 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,7 +21,7 @@
namespace cmd namespace cmd
{ {
void dispatch(User *user, Channel *channel, const std::string &line); void dispatch(User *user, Channel *channel, Server *server, const std::string &line);
std::vector<std::string> split(const std::string &line); std::vector<std::string> split(const std::string &line);
template <typename T> template <typename T>
T searchList(const std::list<T> &list, const std::string &name); T searchList(const std::list<T> &list, const std::string &name);

4
include/commands/commands.tpp
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 17:34:30 by rparodi #+# #+# */ /* Created: 2025/05/24 17:34:30 by rparodi #+# #+# */
/* Updated: 2025/05/26 16:14:24 by rparodi ### ########.fr */ /* Updated: 2025/05/26 18:20:34 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -22,7 +22,7 @@
*/ */
template <typename T> template <typename T>
T cmd::searchList(const std::list<T> &list, const std::string &name) { T cmd::searchList(const std::list<T> &list, const std::string &name) {
for (typename std::list<T>::iterator it = list.begin(); it != list.end(); ++it) { for (typename std::list<T>::const_iterator it = list.begin(); it != list.end(); ++it) {
if ((*it)->getName() == name) if ((*it)->getName() == name)
return *it; return *it;
} }

18
include/core/logs.hpp
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/15 12:25:58 by rparodi #+# #+# */ /* Created: 2025/05/15 12:25:58 by rparodi #+# #+# */
/* Updated: 2025/05/15 12:38:10 by rparodi ### ########.fr */ /* Updated: 2025/05/26 18:08:50 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -15,20 +15,14 @@
#include <iostream> #include <iostream>
#include "color.hpp" #include "color.hpp"
#define DEBUG_MSG(str) "print_debug(str, __FILE__, __LINE__)" #define DEBUG_MSG(str) std::cerr << CLR_CYAN << "\tDebug: " << str << "(" << __FILE__ << ":" << __LINE__ << ")" << CLR_RESET << std::endl;
#define ERROR_MSG(str) "print_error(str, __FILE__, __LINE__)" #define ERROR_MSG(str) std::cerr << CLR_RED << "\tError: " << str << "(" << __FILE__ << ":" << __LINE__ << ")" << CLR_RESET << std::endl;
#define WARNING_MSG(str) "print_warning(str, __FILE__, __LINE__)" #define WARNING_MSG(str) std::cerr << CLR_YELLOW << "\tWarning: " << str << "(" << __FILE__ << ":" << __LINE__ << ")" << CLR_RESET << std::endl;
#define INFO_MSG(str) "print_info(str, __FILE__, __LINE__)" #define INFO_MSG(str) std::cerr << CLR_GREY << "\tInfo: " << str << "(" << __FILE__ << ":" << __LINE__ << ")" << CLR_RESET << std::endl;
#define SUCCESS_MSG(str) "print_success(str, __FILE__, __LINE__)" #define SUCCESS_MSG(str) std::cerr << CLR_GREEN << "\tSuccess: " << str << "(" << __FILE__ << ":" << __LINE__ << ")" << CLR_RESET << std::endl;
#ifndef DEBUG #ifndef DEBUG
#define DEBUG 0 #define DEBUG 0
#define LOG "" #define LOG ""
#endif #endif
void print_debug(const char *str, const char *file, int line);
void print_error(const char *str, const char *file, int line);
void print_warning(const char *str, const char *file, int line);
void print_info(const char *str, const char *file, int line);
void print_success(const char *str, const char *file, int line);

4
include/user.hpp
View file

@ -6,13 +6,13 @@
/* By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ */ /* By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/20 21:57:49 by rparodi #+# #+# */ /* Created: 2025/05/20 21:57:49 by rparodi #+# #+# */
/* Updated: 2025/05/26 16:16:01 by rparodi ### ########.fr */ /* Updated: 2025/05/26 18:10:24 by rparodi ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
#pragma once #pragma once
#include "core.hpp" #include <string>
class User class User
{ {

3
sources/channel/channel.cpp
View file

@ -6,11 +6,12 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/20 22:43:24 by rparodi #+# #+# */ /* Created: 2025/05/20 22:43:24 by rparodi #+# #+# */
/* Updated: 2025/05/20 22:55:20 by rparodi ### ########.fr */ /* Updated: 2025/05/26 18:10:43 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "channel.hpp" #include "channel.hpp"
#include <iostream>
/** /**
* @brief Get the name of the channel * @brief Get the name of the channel

12
sources/commands/commands.cpp
View file

@ -6,15 +6,13 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 16:11:56 by rparodi #+# #+# */ /* Created: 2025/05/24 16:11:56 by rparodi #+# #+# */
/* Updated: 2025/05/24 18:21:36 by rparodi ### ########.fr */ /* Updated: 2025/05/26 18:25:18 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "commands.hpp" #include "commands.hpp"
#include "logs.hpp" #include "logs.hpp"
using namespace cmd;
/** /**
* @brief To send the line where a command is invoqued to execute * @brief To send the line where a command is invoqued to execute
* *
@ -22,7 +20,7 @@ using namespace cmd;
* @param channel channel where the command is sent * @param channel channel where the command is sent
* @param line line send by the user * @param line line send by the user
*/ */
std::vector<std::string> split(const std::string &line) { std::vector<std::string> cmd::split(const std::string &line) {
std::vector<std::string> args; std::vector<std::string> args;
std::string arg; std::string arg;
size_t pos = line.find(' '); size_t pos = line.find(' ');
@ -47,7 +45,7 @@ std::vector<std::string> split(const std::string &line) {
* @param server Server where the command is sent * @param server Server where the command is sent
* @param line input line from the user * @param line input line from the user
*/ */
void dispatch(::User *user, Channel *channel, Server *server, const std::string &line) { void cmd::dispatch(::User *user, Channel *channel, Server *server, const std::string &line) {
std::string command_name = cmd::split(line).at(0); std::string command_name = cmd::split(line).at(0);
if (command_name.empty()) { if (command_name.empty()) {
WARNING_MSG("No command found in line: " << line); WARNING_MSG("No command found in line: " << line);
@ -106,7 +104,7 @@ void dispatch(::User *user, Channel *channel, Server *server, const std::string
(void)line; (void)line;
} }
ACommand::ACommand(::User *user, ::Channel *channel, ::Server *server, const std::string &line) : _sender(user), _channel(channel), _server(server) { cmd::ACommand::ACommand(::User *user, ::Channel *channel, ::Server *server, const std::string &line) : _sender(user), _channel(channel), _server(server) {
DEBUG_MSG("ACommand constructor called"); DEBUG_MSG("ACommand constructor called");
_args = split(line); _args = split(line);
_command = _args.at(0); _command = _args.at(0);
@ -116,6 +114,6 @@ ACommand::ACommand(::User *user, ::Channel *channel, ::Server *server, const std
_cTarget = NULL; _cTarget = NULL;
} }
ACommand::~ACommand() { cmd::ACommand::~ACommand() {
DEBUG_MSG("ACommand destructor called"); DEBUG_MSG("ACommand destructor called");
} }

4
sources/commands/invite.cpp
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ /* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */
/* Updated: 2025/05/26 16:43:01 by rparodi ### ########.fr */ /* Updated: 2025/05/26 18:17:15 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -36,7 +36,7 @@ bool Invite::checkArgs() {
WARNING_MSG("You are not an operator in the channel for INVITE command"); WARNING_MSG("You are not an operator in the channel for INVITE command");
return false; return false;
} }
uTarget = searchList(this->_users, _args.at(2)); _uTarget = searchList(this->_users, _args.at(2));
if (this->_uTarget == NULL) { if (this->_uTarget == NULL) {
WARNING_MSG("User not found"); WARNING_MSG("User not found");
return false; return false;

39
sources/core/logs.cpp
View file

@ -1,39 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* logs.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/15 12:29:56 by rparodi #+# #+# */
/* Updated: 2025/05/15 12:38:56 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "logs.hpp"
void print_debug(const char *str, const char *file, int line)
{
if (DEBUG)
std::cout << CLR_CYAN << "\tDebug: " << str << "(" << file << ":" << line << ")" << CLR_RESET << std::endl;
}
void print_error(const char *str, const char *file, int line)
{
std::cerr << CLR_RED << "\tError: " << str << "(" << file << ":" << line << ")" << CLR_RESET << std::endl;
}
void print_warning(const char *str, const char *file, int line)
{
std::cerr << CLR_YELLOW << "\tWarning: " << str << "(" << file << ":" << line << ")" << CLR_RESET << std::endl;
}
void print_info(const char *str, const char *file, int line)
{
std::cout << CLR_GREY << "\tInfo: " << str << "(" << file << ":" << line << ")" << CLR_RESET << std::endl;
}
void print_success(const char *str, const char *file, int line)
{
std::cout << CLR_GREEN << "\tSuccess: " << str << "(" << file << ":" << line << ")" << CLR_RESET << std::endl;
}