Move InspIRCd::IsValidMask() to helperfuncs.cpp

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

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index aa2f537a5da9e23a3393d943bbfe7f4948226979..b5359397d483d96a87036df69d517d72265d40fd 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -12,17 +12,16 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_join.h"
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-       return new cmd_join(Instance);
+       return new CommandJoin(Instance);
 }
 
 /** Handle /JOIN
  */
-CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult CommandJoin::Handle (const char** parameters, int pcnt, User *user)
 {
        if (pcnt > 1)
        {
@@ -31,7 +30,7 @@ CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
 
                if (ServerInstance->IsChannel(parameters[0]))
                {
-                       chanrec::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
+                       Channel::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
                        return CMD_SUCCESS;
                }
        }
@@ -42,7 +41,7 @@ CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
 
                if (ServerInstance->IsChannel(parameters[0]))
                {
-                       chanrec::JoinUser(ServerInstance, user, parameters[0], false);
+                       Channel::JoinUser(ServerInstance, user, parameters[0], false, "");
                        return CMD_SUCCESS;
                }
        }