Update m_cloaking to use free-form keys instead of weakening the hash IV

[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 f40451dfad4e205296b21d71c81f1456ee43c63f..28634e4f9e2c5bf42e75cb52cbee402ac27ae780 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -20,9 +20,9 @@
 class CommandSajoin : public Command
 {
  public:
-       CommandSajoin (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SAJOIN", "o", 2, false, 0)
+       CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 2)
        {
-               syntax = "<nick> <channel>";
+               flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
@@ -49,7 +49,7 @@ 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)
@@ -83,14 +83,22 @@ 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 cmd;
  public:
-       ModuleSajoin(InspIRCd* Me)
-               : Module(Me), cmd(Me, this)
+       ModuleSajoin()
+               : cmd(this)
        {
                ServerInstance->AddCommand(&cmd);
        }
@@ -101,7 +109,7 @@ class ModuleSajoin : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style SAJOIN command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
        }
 
 };