More tweaks

[user/henk/code/inspircd.git] / src / cmd_join.cpp

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index bf60e65434b4fc7223e34adce6cd6b37a8558958..3e380143261a17a5cfb8290d5d40441b1fd20f8a 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -17,10 +17,10 @@
 #include "inspircd.h"
 #include "users.h"
 #include "commands.h"
-#include "helperfuncs.h"
+
 #include "commands/cmd_join.h"
 
-extern InspIRCd* ServerInstance;
+
 
 void cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
 {
@@ -29,9 +29,9 @@ void cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0, 1))
                        return;
 
-               if (IsValidChannelName(parameters[0]))
+               if (ServerInstance->IsChannel(parameters[0]))
                {
-                       chanrec::JoinUser(user, parameters[0], false, parameters[1]);
+                       chanrec::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
                        return;
                }
        }
@@ -40,9 +40,9 @@ void cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                        return;
 
-               if (IsValidChannelName(parameters[0]))
+               if (ServerInstance->IsChannel(parameters[0]))
                {
-                       chanrec::JoinUser(user, parameters[0], false);
+                       chanrec::JoinUser(ServerInstance, user, parameters[0], false);
                        return;
                }
        }