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

Compare commits

base: raphael:d6847bd3fed43fcd97a42f05aa6875997d99c916
Branches Tags
raphael:master
..
compare: raphael:dfe4f13bcb7e563aa766ba779d0099d359c8984a
Branches Tags
raphael:master

11 commits
d6847bd3fe ... dfe4f13bcb

Author SHA1 Message Date
Raphael
dfe4f13bcb
build(flake/shell): remocing the auto fetch 2025-12-25 02:17:00 +01:00
Raphael
28bfda390e
build(make): removing the lld flags 2025-12-25 02:16:43 +01:00
Samy Ben Tayeb
c395dea89d few changes before push 2025-06-24 14:53:14 +02:00
Samy Ben Tayeb
b5bb9a6503 style(global): removing all the std::cout 2025-06-24 14:42:37 +02:00
Samy BEN TAYEB
4b900fc600
Merge pull request #36 from EniumRaphael/samy 
Samy
 2025-06-24 14:37:09 +02:00
Samy Ben Tayeb
0b02aabcc3 fix(cmd/kick): wrong order becuase we are the order 2025-06-24 14:36:47 +02:00
Raphaël
53f36d5bee
Merge pull request #35 from EniumRaphael/raph 
style(42header): removing the non-working people (except for braces i…
 2025-06-24 12:37:42 +02:00
Raphael
58bf620c09 style(42header): removing the non-working people (except for braces issues xD) 2025-06-24 12:36:19 +02:00
Samy BEN TAYEB
7f804c5754 bonus emoji ok-tiers 2025-06-24 05:10:09 +02:00
Samy BEN TAYEB
cb4135d01f
Merge pull request #34 from EniumRaphael/samy 
🛠️ Patch Notes — ft_irc v1.4.3
 2025-06-23 16:26:09 +02:00
Samy Ben Tayeb
a3b4e597a4 multi-closed fd fixed 2025-06-23 16:23:59 +02:00
12 changed files with 69 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

16
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/23 14:15:57 by rparodi ### ########.fr # # Updated: 2025/09/01 16:22:45 by rparodi ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -93,7 +93,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) #-fuse-ld=lld @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(NAME) $(OBJ)
# Creating the objects # Creating the objects
$(OBJDIRNAME)/%.o: %.cpp $(OBJDIRNAME)/%.o: %.cpp
@ -116,13 +116,9 @@ test: debug
@tmux new-session -d -s $(SESSION) \ @tmux new-session -d -s $(SESSION) \
'bash -lc "./$(NAME) $(PORT) irc; exec bash"' 'bash -lc "./$(NAME) $(PORT) irc; exec bash"'
@tmux split-window -h -p 70 -t $(SESSION):0 \ @tmux split-window -h -p 70 -t $(SESSION):0 \
'bash -lc "irssi -c localhost -p $(PORT) -w irc || exec yes \"irssi exit code: $?\""' 'bash -lc "irssi -c localhost -p $(PORT) -w irc -n test_haut || exec yes \"irssi exit code: $?\""'
@tmux split-window -v -p 50 -t $(SESSION):0.1 \ @tmux split-window -v -p 50 -t $(SESSION):0.1 \
'bash -lc "nc localhost $(PORT) || exec yes \"netcat exit code: $?\""' 'bash -lc "irssi -c localhost -p $(PORT) -w irc -n test_bas || exec yes \"irssi exit code: $?\""'
@tmux split-window -v -p 50 -t $(SESSION):0.2 \
'bash -lc "nc localhost $(PORT) || exec yes \"netcat exit code: $?\""'
@tmux split-window -v -p 50 -t $(SESSION):0.3 \
'bash -lc "nc localhost $(PORT) || exec yes \"netcat exit code: $?\""'
@tmux attach -t $(SESSION) @tmux attach -t $(SESSION)
run: all run: all
@ -133,9 +129,9 @@ run: all
@tmux new-session -d -s $(SESSION) \ @tmux new-session -d -s $(SESSION) \
'bash -lc "./$(NAME) $(PORT) irc; exec bash"' 'bash -lc "./$(NAME) $(PORT) irc; exec bash"'
@tmux split-window -h -p 70 -t $(SESSION):0 \ @tmux split-window -h -p 70 -t $(SESSION):0 \
'bash -lc "irssi -c localhost -p $(PORT) -w irc || exec yes \"irssi exit code: $?\""' 'bash -lc "irssi -c localhost -p $(PORT) -w irc -n test_haut || exec yes \"irssi exit code: $?\""'
@tmux split-window -v -p 50 -t $(SESSION):0.1 \ @tmux split-window -v -p 50 -t $(SESSION):0.1 \
'bash -lc "nc localhost $(PORT) || exec yes \"netcat exit code: $?\""' 'bash -lc "irssi -c localhost -p $(PORT) -w irc -n test_bas || exec yes \"irssi exit code: $?\""'
@tmux attach -t $(SESSION) @tmux attach -t $(SESSION)

2
flake.nix
View file

@ -28,8 +28,6 @@
); );
shellHook = '' shellHook = ''
git fetch origin
git merge origin/master
export CXX=clang++ export CXX=clang++
export CXXFLAGS="-std=cpp98 -Wall -Werror -Wextra" export CXXFLAGS="-std=cpp98 -Wall -Werror -Wextra"
printf "\n\033[0;90mCPP env loaded for: \033[38;5;220m${system}\033[0m\n" printf "\n\033[0;90mCPP env loaded for: \033[38;5;220m${system}\033[0m\n"

6
include/PollManager.hpp
View file

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* PollManager.hpp :+: :+: :+: */ /* PollManager.hpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/19 19:15:13 by omoudni #+# #+# */ /* Created: 2025/06/24 12:33:07 by rparodi #+# #+# */
/* Updated: 2025/06/18 01:26:38 by sben-tay ### ########.fr */ /* Updated: 2025/06/24 12:33:09 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

10
include/core/core.hpp
View file

@ -1,14 +1,14 @@
/******************************************************************************/ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* core.hpp :+: :+: :+: */ /* core.hpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/12 14:16:03 by rparodi #+# #+# */ /* Created: 2025/06/24 12:33:56 by rparodi #+# #+# */
/* Updated: 2025/06/21 11:59:02 by rparodi ### ########.fr */ /* Updated: 2025/06/24 12:33:58 by rparodi ### ########.fr */
/* */ /* */
/******************************************************************************/ /* ************************************************************************** */
#pragma once #pragma once

6
include/core/parser.hpp
View file

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* parser.hpp :+: :+: :+: */ /* parser.hpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/19 14:47:46 by omoudni #+# #+# */ /* Created: 2025/06/24 12:34:11 by rparodi #+# #+# */
/* Updated: 2025/05/19 15:14:31 by omoudni ### ########.fr */ /* Updated: 2025/06/24 12:34:12 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

8
sources/commands/kick.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/23 15:27:38 by sben-tay ### ########.fr */ /* Updated: 2025/06/24 14:40:17 by sben-tay ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -78,9 +78,10 @@ void Kick::execute() {
return; return;
} }
// std::string msgPart = ":" + _sender->getPrefix() + " PART #" + _cTarget->getName();
std::string msgPart = ":" + this->_uTarget->getPrefix() + " PART #" + _cTarget->getName() + "\r\n"; std::string msgPart = ":" + this->_uTarget->getPrefix() + " PART #" + _cTarget->getName() + "\r\n";
std::string msgKick = ":" + this->_uTarget->getPrefix() + " KICK #" + this->_cTarget->getName() + " " + _uTarget->getName(); std::string msgKick = ":" + _sender->getPrefix() + " KICK #" + this->_cTarget->getName() + " " + _uTarget->getName();
if (_args.size() > 3) if (_args.size() > 3)
{ {
DEBUG_MSG("Je rajoute le message de kick avec un motif"); DEBUG_MSG("Je rajoute le message de kick avec un motif");
@ -88,9 +89,8 @@ void Kick::execute() {
} }
msgKick += "\r\n"; msgKick += "\r\n";
std::cout << " msgKick: " << msgKick << "msgPart: " << msgPart << std::endl;
_cTarget->sendAllClientInAChannel(msgKick);
_uTarget->appendToWriteBuffer(msgPart); _uTarget->appendToWriteBuffer(msgPart);
_cTarget->sendAllClientInAChannel(msgKick);
_cTarget->removeUser(this->_uTarget); _cTarget->removeUser(this->_uTarget);
_cTarget->removeOperator(this->_uTarget); _cTarget->removeOperator(this->_uTarget);

3
sources/commands/part.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/19 01:13:28 by sben-tay ### ########.fr */ /* Updated: 2025/06/24 14:31:15 by sben-tay ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -69,7 +69,6 @@ void Part::execute() {
_cTarget->sendAllClientInAChannel(msgPart); _cTarget->sendAllClientInAChannel(msgPart);
_cTarget->removeUser(_sender); _cTarget->removeUser(_sender);
_cTarget->removeOperator(_sender); _cTarget->removeOperator(_sender);
// remove invited list
if (_cTarget->getUsers().empty()) { if (_cTarget->getUsers().empty()) {
std::list<Channel*>& allChannels = _server->getChannelsList(); std::list<Channel*>& allChannels = _server->getChannelsList();

39
sources/commands/privmsg.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/22 01:53:33 by sben-tay ### ########.fr */ /* Updated: 2025/06/24 14:40:03 by sben-tay ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,6 +14,7 @@
#include "commands.hpp" #include "commands.hpp"
#include "logs.hpp" #include "logs.hpp"
#include "bonus.hpp" #include "bonus.hpp"
#include <algorithm>
using namespace cmd; using namespace cmd;
@ -72,26 +73,42 @@ void PrivMsg::execute() {
msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- INVITE nick #channel → Inviter un utilisateur\r\n"; msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- INVITE nick #channel → Inviter un utilisateur\r\n";
msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- KICK #channel nick → Éjecter un utilisateur\r\n"; msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- KICK #channel nick → Éjecter un utilisateur\r\n";
msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- WHO / WHOIS → Infos sur les utilisateurs\r\n"; msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- WHO / WHOIS → Infos sur les utilisateurs\r\n";
msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- DCC SEND nick /PATH → Transferer des fichiers à l'utilisateur\r\n";
msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- DCC GET /PATH → Accepter le transfert des fichiers reçu\r\n";
msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- !emote → Affiche la liste d'emoji\r\n";
msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- !help → Affiche cette aide\r\n"; msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- !help → Affiche cette aide\r\n";
std::string msgEmote = ":bot!ircbot@localhost PRIVMSG " + target + " : 📜 Emote list :\r\n";
msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :😀😁😂😃😄😅😆😇😈😉😊😋😌😍😎😏\r\n";
msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :😐😑😒😓😔😕😖😗😘😙😚😛😜😝😞😟\r\n";
msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :😠😡😢😣😤😥😦😧😨😩😪😫😬😭😮😯\r\n";
msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :😰😱😲😳😴😵😶😷😸😹😺😻😼😽😾😿\r\n";
msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :🙀🙁🙂🙃🙄🙅🙆🙇🙈🙉🙊🙋🙌🙍🙎🙏\r\n";
msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :🤐🤑🤒🤓🤤🤔🤕🤖🤗🤘🤙🤚🤛🤜🤝🤟\r\n";
msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :💐💑💒💓💔💕💖💗💘💙💚💛💜💝💞💟\r\n";
msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " :💠💡💢💣💤💥💦💧💨💩💪💫💬💭💯🤨\r\n";
// Envoi vers un channel // Envoi vers un channel
if (target[0] == '#') { if (target[0] == '#') {
target.erase(0, 1); target.erase(0, 1);
if (_cTarget)
_cTarget->sendAllClientInAChannel(msg, _sender);
if (BONUS && _cTarget->getBotChannel()) { if (_cTarget) {
if (_args.at(2) == "!help") { if (BONUS && _cTarget->getBotChannel() && _args.at(2) == "!help")
std::cout << "BONUS: PING command received, sending PONG" << std::endl; _sender->appendToWriteBuffer(msgBot);
_cTarget->sendAllClientInAChannel(msgBot); else if (BONUS && _cTarget->getBotChannel() && _args.at(2) == "!emote")
} _sender->appendToWriteBuffer(msgEmote);
else
_cTarget->sendAllClientInAChannel(msg, _sender);
} }
} }
// Envoi vers un user // Envoi vers un user
else { const std::list<User *>& users = _server->getUsersList();
if (_uTarget)
_uTarget->appendToWriteBuffer(msg); for (std::list<User *>::const_iterator it = users.begin(); it != users.end(); ++it) {
if ((*it)->getName() == target) {
(*it)->appendToWriteBuffer(msg);
break;
}
} }
} }

8
sources/core/Server.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/13 11:11:07 by rparodi #+# #+# */ /* Created: 2025/05/13 11:11:07 by rparodi #+# #+# */
/* Updated: 2025/06/23 14:46:53 by sben-tay ### ########.fr */ /* Updated: 2025/06/24 14:51:44 by sben-tay ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -43,7 +43,7 @@ void handle_sigint(int sig) {
*/ */
Server::Server(int port, const std::string &password) : _port(port), _password(password) Server::Server(int port, const std::string &password) : _port(port), _password(password)
{ {
std::cout << CLR_GREY << "Info: Server constructor called" << CLR_RESET << std::endl; INFO_MSG("Info: Server constructor called");
} }
/** /**
@ -51,7 +51,7 @@ Server::Server(int port, const std::string &password) : _port(port), _password(p
*/ */
Server::~Server() Server::~Server()
{ {
std::cout << CLR_GREY << "Info: Server destructor called" << CLR_RESET << std::endl; INFO_MSG("Info: Server destructor called");
if (_serverFd != -1) { if (_serverFd != -1) {
close(_serverFd); close(_serverFd);
} }
@ -67,6 +67,7 @@ std::vector<std::string> splitLines(const std::string& input);
void Server::start() void Server::start()
{ {
signal(SIGQUIT, SIG_IGN);
signal(SIGINT, handle_sigint); signal(SIGINT, handle_sigint);
_serverFd = socket(AF_INET, SOCK_STREAM, 0); _serverFd = socket(AF_INET, SOCK_STREAM, 0);
if (_serverFd == -1) { if (_serverFd == -1) {
@ -152,7 +153,6 @@ void Server::start()
std::cout << "Poll loop finished" << std::endl; std::cout << "Poll loop finished" << std::endl;
} }
std::cout << "[INFO] CTRL+C détecté. Fermeture du serveur..." << std::endl; std::cout << "[INFO] CTRL+C détecté. Fermeture du serveur..." << std::endl;
close(_serverFd);
} }
/** /**

3
sources/core/main.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/13 11:03:13 by rparodi #+# #+# */ /* Created: 2025/05/13 11:03:13 by rparodi #+# #+# */
/* Updated: 2025/06/23 14:38:53 by sben-tay ### ########.fr */ /* Updated: 2025/06/24 00:47:18 by sben-tay ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -28,3 +28,4 @@ int main(int argc, char *argv[]) {
server.start(); server.start();
return 0; return 0;
} }

6
sources/core/parser.cpp
View file

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* parser.cpp :+: :+: :+: */ /* parser.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/19 14:48:52 by omoudni #+# #+# */ /* Created: 2025/06/24 12:34:29 by rparodi #+# #+# */
/* Updated: 2025/05/19 15:08:18 by omoudni ### ########.fr */ /* Updated: 2025/06/24 12:34:30 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

4
sources/user/user.cpp
View file

@ -5,8 +5,8 @@
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/21 20:37:12 by omoudni #+# #+# */ /* Created: 2025/05/21 20:37:12 by sben-tay #+# #+# */
/* Updated: 2025/06/21 14:38:31 by sben-tay ### ########.fr */ /* Updated: 2025/06/24 12:33:39 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */