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 da81712c62dac82b4d90ff2bef1c1926ae79f3bb..28634e4f9e2c5bf42e75cb52cbee402ac27ae780 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-2008 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.
@@ -20,10 +20,9 @@
 class CommandSajoin : public Command
 {
  public:
-       CommandSajoin (InspIRCd* Instance) : Command(Instance,"SAJOIN", "o", 2, false, 0)
+       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);
        }
 
@@ -34,13 +33,13 @@ class CommandSajoin : public Command
                {
                        if (ServerInstance->ULine(dest->server))
                        {
-                               user->WriteNumeric(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].c_str()))
+                       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;
                        }
 
@@ -50,14 +49,14 @@ class CommandSajoin : public Command
                         */
                        if (IS_LOCAL(dest))
                        {
-                               Channel::JoinUser(ServerInstance, dest, parameters[1].c_str(), true, "", false, ServerInstance->Time());
+                               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]);
+                                               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 +73,7 @@ class CommandSajoin : public Command
                        }
                        else
                        {
-                               ServerInstance->SNO->WriteToSnoMask('A', 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;
                        }
                }
@@ -84,30 +83,35 @@ class CommandSajoin : public Command
                        return CMD_FAILURE;
                }
        }
+
+       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
 {
-       CommandSajoin*  mycommand;
+       CommandSajoin cmd;
  public:
-       ModuleSajoin(InspIRCd* Me)
-               : Module(Me)
+       ModuleSajoin()
+               : cmd(this)
        {
-               
-               mycommand = new CommandSajoin(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-
+               ServerInstance->AddCommand(&cmd);
        }
-       
+
        virtual ~ModuleSajoin()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style SAJOIN command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleSajoin)