implemented sendReply

Author: siliotar

IRCat.motd

@@ -0,0 +1,15 @@
+⢀⡴⠑⡄⠀⠀⠀⠀⠀⠀⠀⣀⣀⣤⣤⣤⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+⠸⡇⠀⠿⡀⠀⠀⠀⣀⡴⢿⣿⣿⣿⣿⣿⣿⣿⣷⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+⠀⠀⠀⠀⠑⢄⣠⠾⠁⣀⣄⡈⠙⣿⣿⣿⣿⣿⣿⣿⣿⣆⠀⠀⠀⠀⠀⠀⠀⠀ 
+⠀⠀⠀⠀⢀⡀⠁⠀⠀⠈⠙⠛⠂⠈⣿⣿⣿⣿⣿⠿⡿⢿⣆⠀⠀⠀⠀⠀⠀⠀ 
+⠀⠀⠀⢀⡾⣁⣀⠀⠴⠂⠙⣗⡀⠀⢻⣿⣿⠭⢤⣴⣦⣤⣹⠀⠀⠀⢀⢴⣶⣆ 
+⠀⠀⢀⣾⣿⣿⣿⣷⣮⣽⣾⣿⣥⣴⣿⣿⡿⢂⠔⢚⡿⢿⣿⣦⣴⣾⠁⠸⣼⡿ 
+⠀⢀⡞⠁⠙⠻⠿⠟⠉⠀⠛⢹⣿⣿⣿⣿⣿⣌⢤⣼⣿⣾⣿⡟⠉⠀⠀⠀⠀⠀ 
+⠀⣾⣷⣶⠇⠀⠀⣤⣄⣀⡀⠈⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀ 
+⠀⠉⠈⠉⠀⠀⢦⡈⢻⣿⣿⣿⣶⣶⣶⣶⣤⣽⡹⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀ 
+⠀⠀⠀⠀⠀⠀⠀⠉⠲⣽⡻⢿⣿⣿⣿⣿⣿⣿⣷⣜⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀ 
+⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣷⣶⣮⣭⣽⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀ 
+⠀⠀⠀⠀⠀⠀⣀⣀⣈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀ 
+⠀⠀⠀⠀⠀⠀⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀ 
+⠀⠀⠀⠀⠀⠀⠀⠹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠻⠿⠿⠿⠿⠛⠉

Makefile

@@ -5,7 +5,8 @@ SOURCE=	main.cpp \
 		User.cpp \
 		Message.cpp \
 		utils.cpp \
-		sendError.cpp
+		sendError.cpp \
+		sendReply.cpp
 
 OSOURCEFOLDER= objects/
 

Server.cpp

@@ -2,7 +2,17 @@
 
 Server::Server(int port, const std::string &password) :
 port(port), timeout(20), password(password), name("IRCat")
-{}
+{
+	// Read MOTD
+	std::string		line;
+	std::ifstream	motdFile("IRCat.motd");
+	if (motdFile.is_open())
+	{
+		while (getline(motdFile, line))
+			motd.push_back(line);
+		motdFile.close();
+	}
+}
 
 Server::~Server()
 {}
@@ -111,4 +121,11 @@ void						Server::sendMOTD(const User &user) const
 {
 	if (motd.size() == 0)
 		sendError(user, ERR_NOMOTD);
+	else
+	{
+		sendReply(user, RPL_MOTDSTART, name);
+		for (size_t i = 0; i < motd.size(); ++i)
+			sendReply(user, RPL_MOTD, motd[i]);
+		sendReply(user, RPL_ENDOFMOTD);
+	}
 }

Server.hpp

@@ -2,16 +2,21 @@
 # define SERVER_HPP
 
 class User;
+class Channel;
 
-# include "User.hpp"
 # include <sys/socket.h> // For socket functions
 # include <netinet/in.h> // For sockaddr_in
 # include <cstdlib> // For exit() and EXIT_FAILURE
 # include <iostream> // For cout
 # include <unistd.h>
 # include <errno.h>
 # include <poll.h>
+# include <fstream>
+# include <string>
+# include "User.hpp"
+# include "Channel.hpp"
 # include "sendError.hpp"
+# include "sendReply.hpp"
 
 class Server
 {
@@ -24,7 +29,8 @@ class Server
 		const id_t					timeout;
 		std::string					password;
 		std::string					name;
-		std::string					motd;
+		std::vector<std::string>	motd;
+		std::vector<Channel>		channels;
 	public:
 		Server(int port, const std::string &password);
 		~Server();

User.cpp

@@ -133,7 +133,7 @@ int							User::userCmd(const Message &msg)
 	else if (registered)
 		sendError(*this, ERR_ALREADYREGISTRED);
 	else
-	{
+	{ // Проверить валидность всего этого
 		username = msg.getParams()[0];
 		hostname = msg.getParams()[1];
 		servername = msg.getParams()[2];
@@ -159,9 +159,15 @@ int							User::hadleMessages()
 			if (msg.getCommand() == "PASS")
 				this->passCmd(msg);
 			else if (msg.getCommand() == "USER")
-				return (this->userCmd(msg));
+			{
+				if (this->userCmd(msg) == -1)
+					return (-1);
+			}
 			else if (msg.getCommand() == "NICK")
-				return (this->nickCmd(msg));
+			{
+				if (this->nickCmd(msg) == -1)
+					return (-1);
+			}
 			else
 				sendError(*this, ERR_NOTREGISTERED);
 		}