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 159e383907fd81e1e82187ebb56c6d46c273197c..b5359397d483d96a87036df69d517d72265d40fd 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -2,62 +2,50 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "message.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_join.h"
-
-extern InspIRCd* ServerInstance;
+#include "commands/cmd_join.h"
 
-void cmd_join::Handle (char **parameters, int pcnt, userrec *user)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-       if (ServerInstance->Parser->LoopCall(this, parameters, pcnt, user, 0, 0, 1))
-               return;
+       return new CommandJoin(Instance);
+}
 
-       if (IsValidChannelName(parameters[0]))
+/** Handle /JOIN
+ */
+CmdResult CommandJoin::Handle (const char** parameters, int pcnt, User *user)
+{
+       if (pcnt > 1)
        {
-               add_channel(user, parameters[0], parameters[1], false);
+               if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0, 1))
+                       return CMD_SUCCESS;
+
+               if (ServerInstance->IsChannel(parameters[0]))
+               {
+                       Channel::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
+                       return CMD_SUCCESS;
+               }
        }
        else
        {
-               WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]);
+               if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+                       return CMD_SUCCESS;
+
+               if (ServerInstance->IsChannel(parameters[0]))
+               {
+                       Channel::JoinUser(ServerInstance, user, parameters[0], false, "");
+                       return CMD_SUCCESS;
+               }
        }
-}
-
-
 
+       user->WriteServ("403 %s %s :Invalid channel name",user->nick, parameters[0]);
+       return CMD_FAILURE;
+}