More compile fixes

[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 4ad3fe7a0cdedeb1b0c74397325e8d660a7e9e32..c320287e1462003de4d0261e410febc4d9b65d28 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -2,93 +2,112 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#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 */
 
-Server *Srv;
-        
-void handle_sajoin(char **parameters, int pcnt, userrec *user)
+/** Handle /SAJOIN
+ */
+class CommandSajoin : public Command
 {
-       userrec* dest = Srv->FindNick(std::string(parameters[0]));
-       if (dest)
+ public:
+       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);
+       }
 
-               for (int x = 0; x < strlen(parameters[1]); x++)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       {
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               if (dest)
                {
-                               if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ','))
+                       if (ServerInstance->ULine(dest->server))
+                       {
+                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
+                               return CMD_FAILURE;
+                       }
+                       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 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 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(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->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
                                {
-                                       Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-                                       return;
+                                       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;
                }
-
-               Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
-               Srv->JoinUserToChannel(dest,std::string(parameters[1]),std::string(dest->nick));
        }
-}
-
+};
 
 class ModuleSajoin : public Module
 {
+       CommandSajoin*  mycommand;
  public:
-       ModuleSajoin()
+       ModuleSajoin(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = new Server;
-               Srv->AddCommand("SAJOIN",handle_sajoin,'o',2,"m_sajoin.so");
+               
+               mycommand = new CommandSajoin(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleSajoin()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,0);
+               return Version(1, 2, 0, 1, VF_COMMON | 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()
-       {
-               return new ModuleSajoin;
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSajoinFactory;
-}
-
+MODULE_INIT(ModuleSajoin)