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

Merge pull request #15 from EniumRaphael/raph

Browse source 
Raph
This commit is contained in:
Raphaël 2025-06-10 16:28:17 +02:00 • committed by GitHub
commit 3250de0a59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 208 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -6,7 +6,7 @@
# By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ # # By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2025/05/02 15:40:00 by rparodi #+# #+# # # Created: 2025/05/02 15:40:00 by rparodi #+# #+# #
# Updated: 2025/06/08 23:06:16 by rparodi ### ########.fr # # Updated: 2025/06/10 13:40:37 by rparodi ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -29,6 +29,9 @@ SRC = sources/channel/channel.cpp \
sources/commands/commands.cpp \ sources/commands/commands.cpp \
sources/commands/invite.cpp \ sources/commands/invite.cpp \
sources/commands/join.cpp \ sources/commands/join.cpp \
sources/commands/kick.cpp \
sources/commands/list.cpp \
sources/commands/modes.cpp \
sources/commands/nick.cpp \ sources/commands/nick.cpp \
sources/commands/notice.cpp \ sources/commands/notice.cpp \
sources/commands/part.cpp \ sources/commands/part.cpp \

44
include/commands/modes.hpp Normal file
View file

@ -0,0 +1,44 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* modes.hpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 17:17:31 by rparodi #+# #+# */
/* Updated: 2025/06/10 13:32:34 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#pragma once
#include "commands.hpp"
#include <string>
#include <utility>
#include <vector>
enum e_mode {
ERROR_MODE = 0,
CHAN_INVITE_ONLY,
CHAN_SET_TOPIC,
CHAN_SET_KEY,
CHAN_SET_LIMIT,
CHAN_SET_OP,
};
typedef struct s_mode {
std::string arguments;
e_mode mode;
bool add;
bool remove;
} t_mode;
class cmd::Mode : public ACommand {
public:
Mode(User *user, Channel *channel, Server *server, std::string &line) : ACommand(user, channel, server, line) {}
virtual void execute(void);
virtual e_code checkArgs();
void checkMode();
private:
std::vector<std::pair<bool, s_mode> > _mode;
};

64
sources/commands/commands.cpp
View file

@ -6,18 +6,25 @@
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 16:11:56 by rparodi #+# #+# */ /* Created: 2025/05/24 16:11:56 by rparodi #+# #+# */
/* Updated: 2025/06/09 14:06:14 by rparodi ### ########.fr */ /* Updated: 2025/06/10 16:25:57 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "commands.hpp" #include "commands.hpp"
#include "logs.hpp"
#include "pass.hpp"
#include "ping.hpp"
#include "nick.hpp"
#include "userCmd.hpp"
#include "cap.hpp"
#include <cctype> #include <cctype>
#include "join.hpp"
#include "privmsg.hpp"
#include "nick.hpp"
#include "invite.hpp"
#include "list.hpp"
#include "cap.hpp"
#include "modes.hpp"
#include "ping.hpp"
#include "notice.hpp"
#include "kick.hpp"
#include "userCmd.hpp"
#include "pass.hpp"
#include "part.hpp"
#include <iterator> #include <iterator>
/** /**
@ -78,47 +85,50 @@ void cmd::dispatch(::User *user, Channel *channel, Server *server, std::string &
} }
break; break;
case 'i': case 'i':
// if (command_name == "invite") { if (command_name == "invite") {
// Invite(user, channel, server, line).execute(); Invite(user, channel, server, line).execute();
// } }
break; break;
case 'j': case 'j':
// if (command_name == "join") { if (command_name == "join") {
// Join(user, channel, server, line).execute(); Join(user, channel, server, line).execute();
// } }
break; break;
case 'k': case 'k':
// if (command_name == "kick") { if (command_name == "kick") {
// Kick(user, channel, server, line).execute(); Kick(user, channel, server, line).execute();
// } }
break; break;
case 'l': case 'l':
// if (command_name == "list") { if (command_name == "list") {
// List(user, channel, server, line).execute(); List(user, channel, server, line).execute();
// } }
break; break;
case 'm': case 'm':
// if (command_name == "mode") { if (command_name == "mode") {
// Mode(user, channel, server, line).execute(); Mode(user, channel, server, line).execute();
// } }
break; break;
case 'n': case 'n':
if (command_name == "NICK") { if (command_name == "NICK") {
Nick(user, channel, server, line).execute(); Nick(user, channel, server, line).execute();
// } else if (command_name == "notice") { } else if (command_name == "notice") {
// Notice(user, channel, server, line).execute(); Notice(user, channel, server, line).execute();
} }
break; break;
case 'p': case 'p':
if (command_name == "pass") { if (command_name == "pass") {
Pass(user, channel, server, line).execute(); Pass(user, channel, server, line).execute();
} }
if (command_name == "privmsg") {
PrivMsg(user, channel, server, line).execute();
}
if (command_name == "ping") { if (command_name == "ping") {
Ping(user, channel, server, line).execute(); Ping(user, channel, server, line).execute();
} }
// if (command_name == "part") { if (command_name == "part") {
// Part(user, channel, server, line).execute(); Part(user, channel, server, line).execute();
// } }
break; break;
case 'u': case 'u':
if (command_name == "user") { if (command_name == "user") {

121
sources/commands/modes.cpp Normal file
View file

@ -0,0 +1,121 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* modes.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */
/* Updated: 2025/06/10 16:08:09 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "modes.hpp"
#include "commands.hpp"
#include "core.hpp"
#include "logs.hpp"
#include <utility>
using namespace cmd;
/**
* @brief Check and chose the mode(s) for the commands
*/
void Mode::checkMode() {
s_mode m;
std::string flags = _args[2];
size_t argIndex = 3;
if (flags.empty() || (flags[0] != '+' && flags[0] != '-'))
{
m.mode = ERROR_MODE;
return;
}
bool add = (flags[0] == '+');
for (size_t i = 1; i < flags.size(); ++i)
{
s_mode m;
m.mode = ERROR_MODE;
m.add = add;
m.remove = !add;
m.arguments.clear();
switch (flags[i])
{
case 'i':
m.mode = CHAN_INVITE_ONLY;
break;
case 't':
m.mode = CHAN_SET_TOPIC;
break;
case 'k':
m.mode = CHAN_SET_KEY;
break;
case 'l':
m.mode = CHAN_SET_LIMIT;
break;
case 'o':
m.mode = CHAN_SET_OP;
break;
default :
m.mode = ERROR_MODE;
break;
}
if ((m.mode == CHAN_SET_KEY || m.mode == CHAN_SET_LIMIT || m.mode == CHAN_SET_OP) && argIndex < _args.size())
m.arguments = _args[argIndex++];
this->_mode.push_back(std::make_pair(true, m));
}
}
/**
* @brief Parsing of the mode command
*
* @return return the e_code if there is an error else return _PARSING_OK
*/
e_code Mode::checkArgs() {
if (_args.size() < 2)
return ERR_NEEDMOREPARAMS;
if (_args.at(1).at(0) != '#') {
WARNING_MSG("Invalid channel name for INVITE command");
INFO_MSG("Channel names must start with a '#' character");
return ERR_NOSUCHCHANNEL;
} else
_args.at(1).erase(0, 1);
if (_cTarget == NULL) {
WARNING_MSG("Channel not found for INVITE command");
INFO_MSG("You can only invite users to channels you are in");
return ERR_NOSUCHCHANNEL;
}
if (_args.size() == 2) {
return RPL_CHANNELMODEIS;
}
checkMode();
if (_mode.empty())
return ERR_UNKNOWNMODE;
for (size_t i = 0; i < _mode.size(); ++i)
{
const s_mode &m = _mode[i].second;
if (m.mode == ERROR_MODE)
return ERR_UNKNOWNMODE;
if (m.mode == CHAN_SET_KEY || m.mode == CHAN_SET_LIMIT || m.mode == CHAN_SET_OP)
if (m.arguments.empty())
return ERR_NEEDMOREPARAMS;
if (searchList(_cTarget->getOperators(), _sender->getName()) != NULL) {
WARNING_MSG("You are not an operator in the channel for INVITE command");
return ERR_CHANOPRIVSNEEDED;
}
}
return _PARSING_OK;
}
/**
* @brief Execute the invite command
* @note To invite a peapol to join a channel (from an operator)
*/
void Mode::execute() {
if (checkArgs() == _PARSING_OK) {
ERROR_MSG("Invalid arguments for INVITE command (see warning message)");
return;
}
// check how the com
}

7
sources/commands/pass.cpp
View file

@ -6,7 +6,7 @@
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ /* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */
/* Updated: 2025/06/08 20:10:47 by sben-tay ### ########.fr */ /* Updated: 2025/06/10 16:27:03 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,11 +21,6 @@ e_code Pass::checkArgs() {
WARNING_MSG("Not correct for Pass command"); WARNING_MSG("Not correct for Pass command");
return ERR_NEEDMOREPARAMS; return ERR_NEEDMOREPARAMS;
} }
DEBUG_MSG("coucou");
if (_sender->isRegistered()) {
WARNING_MSG(_sender->getName() << " is already is already log in the server !");
return ERR_ALREADYREGISTERED;
}
return _PARSING_OK; return _PARSING_OK;
} }