Remove InspIRCd* parameters and fields

[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 2fe790b6f1e208a563ec072745b79b96b5efbba1..28634e4f9e2c5bf42e75cb52cbee402ac27ae780 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -2,113 +2,116 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
 
-
-
-
-class cmd_sajoin : public command_t
+/** Handle /SAJOIN
+ */
+class CommandSajoin : public Command
 {
  public:
- cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2)
+       CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 2)
        {
-               this->source = "m_sajoin.so";
-               syntax = "<nick> <channel>";
+               flags_needed = 'o'; Penalty = 0; 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;
                        }
 
-                       ServerInstance->WriteOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
-                       chanrec::JoinUser(ServerInstance, dest, parameters[1], true);
+                       /* 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 propagate it where it needs to be
+                        * and then that server will generate the users JOIN or FJOIN instead.
+                        */
+                       if (IS_LOCAL(dest))
+                       {
+                               Channel::JoinUser(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->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+                                               return CMD_SUCCESS;
+                                       }
+                                       else
+                                       {
+                                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
+                                               return CMD_FAILURE;
+                                       }
+                               }
+                               else
+                               {
+                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]);
+                                       return CMD_FAILURE;
+                               }
+                       }
+                       else
+                       {
+                               ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+                               return CMD_SUCCESS;
+                       }
+               }
+               else
+               {
+                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** No such nickname "+parameters[0]);
+                       return CMD_FAILURE;
                }
+       }
 
-               return CMD_SUCCESS;
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               if (dest)
+                       return ROUTE_OPT_UCAST(dest->server);
+               return ROUTE_LOCALONLY;
        }
 };
 
 class ModuleSajoin : public Module
 {
-       cmd_sajoin*     mycommand;
+       CommandSajoin cmd;
  public:
-       ModuleSajoin(InspIRCd* Me)
-               : Module::Module(Me)
+       ModuleSajoin()
+               : cmd(this)
        {
-               
-               mycommand = new cmd_sajoin(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
        }
-       
+
        virtual ~ModuleSajoin()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version("Provides support for unreal-style SAJOIN command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
        }
-       
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleSajoinFactory : public ModuleFactory
-{
- public:
-       ModuleSajoinFactory()
-       {
-       }
-       
-       ~ModuleSajoinFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSajoin(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSajoinFactory;
-}
-
+MODULE_INIT(ModuleSajoin)