Allow commands to optionally route themselves using ENCAP

[user/henk/code/inspircd.git] / src / modules / m_sajoin.cpp

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index b99f6f65d6fae21bc16a2adf85f5c196610a8601..8fad7bc42d650c90353a411b6a7421fdef71b6c6 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,47 +17,47 @@
 
 /** Handle /SAJOIN
  */
-class cmd_sajoin : public command_t
+class CommandSajoin : public Command
 {
  public:
- cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2)
+       CommandSajoin (InspIRCd* Instance) : Command(Instance,"SAJOIN", "o", 2, false, 0)
        {
                this->source = "m_sajoin.so";
                syntax = "<nick> <channel>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
+               User* dest = ServerInstance->FindNick(parameters[0]);
                if (dest)
                {
                        if (ServerInstance->ULine(dest->server))
                        {
-                               user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
                                return CMD_FAILURE;
                        }
-                       if (!ServerInstance->IsChannel(parameters[1]))
+                       if (IS_LOCAL(user) && !ServerInstance->IsChannel(parameters[1].c_str(), ServerInstance->Config->Limits.ChanMax))
                        {
                                /* we didn't need to check this for each character ;) */
-                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
+                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name or name too long");
                                return CMD_FAILURE;
                        }
 
                        /* For local users, we send the JoinUser which may create a channel and set its TS.
-                        * For non-local users, we just return CMD_SUCCESS, knowing this will propogate it where it needs to be
+                        * For non-local users, we just return CMD_SUCCESS, knowing this will propagate it where it needs to be
                         * and then that server will generate the users JOIN or FJOIN instead.
                         */
                        if (IS_LOCAL(dest))
                        {
-                               chanrec::JoinUser(ServerInstance, dest, parameters[1], true, "", ServerInstance->Time(true));
-                               /* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propogate */
-                               chanrec* n = ServerInstance->FindChan(parameters[1]);
+                               Channel::JoinUser(ServerInstance, dest, parameters[1].c_str(), true, "", false, ServerInstance->Time());
+                               /* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propagate */
+                               Channel* n = ServerInstance->FindChan(parameters[1]);
                                if (n)
                                {
                                        if (n->HasUser(dest))
                                        {
-                                               ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+                                               ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
                                                return CMD_SUCCESS;
                                        }
                                        else
@@ -74,7 +74,7 @@ class cmd_sajoin : public command_t
                        }
                        else
                        {
-                               ServerInstance->WriteOpers("*** "+std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+                               ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
                                return CMD_SUCCESS;
                        }
                }
@@ -88,25 +88,23 @@ class cmd_sajoin : public command_t
 
 class ModuleSajoin : public Module
 {
-       cmd_sajoin*     mycommand;
+       CommandSajoin cmd;
  public:
        ModuleSajoin(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(Me)
        {
-               
-               mycommand = new cmd_sajoin(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
        }
-       
+
        virtual ~ModuleSajoin()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleSajoin)