Merge pull request #17 from lithiumox-codam/epoll

Epoll and remove the unused bool return values for commands

.gitignore

@@ -38,6 +38,8 @@
 .cache
 compile_commands.json
 ircserv
+ircbot
 .env
+
 # Subject File
 subject.pdf

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "bot/include/openai-cpp"]
+	path = bot/include/openai-cpp
+	url = https://github.com/olrea/openai-cpp.git

Makefile

@@ -7,6 +7,8 @@ LIB_DIR			:= lib
 SRC_DIR			:= src
 OBJ_DIR			:= build
 
+BONUS_DIR		:= bot
+
 # Compiler flags
 CC				:= c++
 CFLAGS			:= -Wall -Werror -Wextra -std=c++20 -I./$(HDR_DIR) -I $(LIB_DIR)
@@ -44,14 +46,20 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(HDR)
 open: $(NAME)
 	@ ./$(NAME) 8080
 
+bonus:
+	@ make run -C $(BONUS_DIR)
+
+
 clean:
 	@ echo "$(RED)$(BOLD)Cleaning $(NICKNAME)...$(RESET)"
 	@ rm -rf $(OBJ_DIR)
+	@ make clean -C $(BONUS_DIR)
 
 fclean:
 	@ echo "$(RED)$(BOLD)Fully cleaning $(NICKNAME)...$(RESET)"
 	@ rm -rf $(OBJ_DIR)
 	@ rm -rf ${NAME}
+	@ make fclean -C $(BONUS_DIR)
 
 re: fclean ${NAME}
 
@@ -64,4 +72,4 @@ run: all
 bear: fclean
 	@ bear -- make
 
-.PHONY: all clean fclean re open
+.PHONY: all clean fclean re open format run bear bonus

bot/Makefile

@@ -0,0 +1,70 @@
+NAME			:= ircbot
+NICKNAME		:= BOT
+
+# Directories
+HDR_DIR			:= include
+LIB_DIR			:= lib
+SRC_DIR			:= src
+OBJ_DIR			:= build
+
+# Compiler flags
+CC				:= c++
+CFLAGS			:= -Wall -Werror -Wextra -std=c++20 -I./$(HDR_DIR) -I $(LIB_DIR)
+
+ifdef DEBUG
+	CFLAGS		+= -g -fsanitize=address
+endif
+
+# Linker flags
+LDFLAGS			:= -lcurl
+
+# Includes
+HDR		:= $(shell find $(HDR_DIR) -name '*.hpp')
+
+# Files
+SRC		:= $(shell find $(SRC_DIR) -name '*.cpp')
+OBJ		:= $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRC))
+
+# Colours
+GREEN			:= \033[32;1m
+YELLOW			:= \033[33;1m
+RED				:= \033[31;1m
+BOLD			:= \033[1m
+RESET			:= \033[0m
+
+# Rules
+all: ${NAME}
+
+$(NAME): $(OBJ)
+	@ printf "%b%s%b" "$(YELLOW)$(BOLD)" "Compiling $(NICKNAME)..." "$(RESET)"
+	@ $(CC) $(OBJ) $(LDFLAGS) -o $(NAME)
+	@ printf "\t\t%b%s%b\n" "$(GREEN)$(BOLD)" "[OK]" "$(RESET)"
+
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(HDR)
+	@ mkdir -p $(dir $@)
+	@ $(CC) $(CFLAGS) -c $< -o $@ -I $(HDR_DIR)
+
+open: $(NAME)
+	@ ./$(NAME) 8080
+
+clean:
+	@ echo "$(RED)$(BOLD)Cleaning $(NICKNAME)...$(RESET)"
+	@ rm -rf $(OBJ_DIR)
+
+fclean:
+	@ echo "$(RED)$(BOLD)Fully cleaning $(NICKNAME)...$(RESET)"
+	@ rm -rf $(OBJ_DIR)
+	@ rm -rf ${NAME}
+
+re: fclean ${NAME}
+
+format:
+	@ clang-format -i $(SRC) $(HDR)
+
+run: all
+	@ ./$(NAME) localhost 6667
+
+bear: fclean
+	@ bear -- make
+
+.PHONY: all clean fclean re open format run bear

bot/include/Bot.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <iostream>
+#include <string>
+
+using namespace std;
+
+class Bot { 
+	private:
+		string	in_buffer;
+		string	out_buffer;
+
+	public:
+		Bot();
+		Bot &operator=(const Bot &other);
+		Bot(const Bot &other);
+		~Bot();
+
+		// Server functions
+		void			readFromServer(void);
+		void			sendToServer(void);
+		void			addToBuffer(const string &data);
+		void 			join(void);
+
+		// Bot functions
+		void			parse(void);
+} ;
+
+string getGPTResponse(const string &nick, const string &message);

bot/include/Epoll.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <inttypes.h>
+#include <sys/epoll.h>
+#include <array>
+
+using namespace std;
+
+#define MAXEVENTS 10
+
+class EpollClass { 
+	private:
+		int		fd;
+
+	public:
+		EpollClass();
+		EpollClass &operator=(const EpollClass &other);
+		EpollClass(const EpollClass &other);
+		~EpollClass();
+
+		// Event list
+		array<struct epoll_event, MAXEVENTS>		events;
+
+		// Functions
+		void			add(int socket_fd) const;
+		void 			change(int socket_fd, uint32_t events);
+		void			remove(int socket_fd) const;
+		void			wait();
+} ;