finish

berat-samli · Dec 4, 2023 · 80e382a · 80e382a
1 parent 26fb4bb
commit 80e382a
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 42 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/ft_irc/Commands/join.cpp b/ft_irc/Commands/join.cpp
@@ -22,7 +22,7 @@ void Commands::Join(User &user, vector<Channel> &channels, int clientSocket)
                         SendToClient(clientSocket, user.getClientName() + " JOIN you joined the " + *itArgs + " channel!\n");
                         return;
                     }
-                    else if (itChannels->userOnTheChannel(user.getNickName()))
+                    else if (itChannels->getName() == *itArgs && itChannels->userOnTheChannel(user.getNickName()))
                     {
                         SendToClient(clientSocket, user.getClientName() + " JOIN You're already on this channel!\n");
                         return;

diff --git a/ft_irc/Commands/kick.cpp b/ft_irc/Commands/kick.cpp
@@ -10,17 +10,14 @@ void Commands::Kick(User &user, vector<Channel> &channels, int clientSocket)
             string reason = args[3];
             Channel *channel = findChannel(channels);
             if(!channel)
-            {
-                errorHandle(user, channel->getName(), clientSocket, ERR_NOSUCHCHANNEL);
-                return ;
-            }
-            if (channel->userIsTheAdmin(user.getNickName()))
+                errorHandle(user, "", clientSocket, ERR_NOSUCHCHANNEL);
+            else if (channel->userIsTheAdmin(user.getNickName()))
             {
                 User *kickUser = channel->getUser(kickNickName); 
                 SendToClient(kickUser->socket, kickUser->getClientName() + " KICK You're kicked for Reason: " + reason + "\n");
                 channel->removeUser(kickNickName);
             }
         }
-        else errorHandle(user,  "", clientSocket, ERR_NEEDMOREPARAMS);
+        else errorHandle(user, "", clientSocket, ERR_NEEDMOREPARAMS);
    }
 }
diff --git a/ft_irc/Commands/mode.cpp b/ft_irc/Commands/mode.cpp
@@ -27,7 +27,7 @@ void Commands::Mode(User& user, vector<Channel> &channels, int clientSocket)
                     }
                 }
             }
-            else errorHandle(user, channel->getName(), clientSocket, ERR_NOSUCHCHANNEL);
+            else errorHandle(user, "", clientSocket, ERR_NOSUCHCHANNEL);
         }
         else errorHandle(user, "", clientSocket, ERR_NEEDMOREPARAMS);
     }

diff --git a/ft_irc/Commands/nick.cpp b/ft_irc/Commands/nick.cpp
@@ -41,9 +41,5 @@ void Commands::Nick(map<int, User> &users, int clientSocket) {
         }
         users[clientSocket]._isNicked = true;
     }
-    else 
-    {
-        cout << "\nCONTROL\n" << endl;
-        errorHandle(users[clientSocket], "", clientSocket, ERR_NONICKNAMEGIVEN);
-    }
+    else errorHandle(users[clientSocket], "", clientSocket, ERR_NONICKNAMEGIVEN);
 }
diff --git a/ft_irc/Commands/pass.cpp b/ft_irc/Commands/pass.cpp
@@ -4,11 +4,8 @@ void Commands::Pass(User& user, int clientSocket, string svPasswd) {
     if(args.size() == 2)
     {
         if(user._isAuth) 
-        {
             errorHandle(user, "", clientSocket, 462);
-            return;
-        }
-        if (user._isRegister) {
+        else if (user._isRegister) {
             (void)user;
             string message;
             vector<string>::iterator it = args.begin() + 1;

diff --git a/ft_irc/Commands/topic.cpp b/ft_irc/Commands/topic.cpp
@@ -19,7 +19,7 @@ void Commands::Topic(User &user, vector<Channel> &channels, int clientSocket)
                         SendToClient((*it)->socket, (*it)->getClientName() + " TOPIC Topic has chanced: " + *topic + "!\n");
                 }
             }
-            else errorHandle(user, channel->getName(), clientSocket, ERR_NOSUCHCHANNEL);
+            else errorHandle(user, "", clientSocket, ERR_NOSUCHCHANNEL);
         }
         else errorHandle(user, "", clientSocket, ERR_NEEDMOREPARAMS);
     }

diff --git a/ft_irc/Commands/user.cpp b/ft_irc/Commands/user.cpp
@@ -16,11 +16,11 @@ void Commands::Usèr(User& user, int clientSocket) {
         user._isUser = true;
         if (user._isNicked) {
             user._isRegister = true;
-            SendToClient(clientSocket, user.getClientName() + user.getUserName() + " USER You are registered now!\n");
             string newClientName = user.getNickName() + "!" + user.getUserName() + "@" + user.hostname;
             user.setClientName(newClientName);
+            SendToClient(clientSocket, user.getClientName() + user.getUserName() + " USER You are registered now!\n");
         }
-        else if(user._isUser){
+        else if (user._isUser){
             string newClientName =  "!" + user.getUserName() + "@" + user.hostname;
             user.setClientName(newClientName);
         }

diff --git a/ft_irc/Makefile b/ft_irc/Makefile
@@ -5,11 +5,12 @@ OBJECTS = $(FILE:.cpp=.o)
 FILE = server.cpp \
 	main.cpp \
 	user.cpp \
-	commands.cpp channel.cpp \
+	commands.cpp \
+	channel.cpp \
 	./commands/nick.cpp \
 	./commands/pass.cpp \
 	./commands/user.cpp \
-	./commands/Quit.cpp \
+	./commands/quit.cpp \
 	./commands/ping.cpp \
 	./commands/join.cpp \
 	./commands/kick.cpp \

diff --git a/ft_irc/ircserv.dSYM/Contents/Info.plist b/ft_irc/ircserv.dSYM/Contents/Info.plist
diff --git a/ft_irc/ircserv.dSYM/Contents/Resources/DWARF/ircserv b/ft_irc/ircserv.dSYM/Contents/Resources/DWARF/ircserv
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
                 }
-                else errorHandle(user, channel->getName(), clientSocket, ERR_NOSUCHCHANNEL);
+                else errorHandle(user, "", clientSocket, ERR_NOSUCHCHANNEL);
             }
             else errorHandle(user, "", clientSocket, ERR_NEEDMOREPARAMS);
         }
@@ Expand Down @@