A ton more clear() and empty() stuff thats been lingering on the long term todo for...

[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 ad5aef213dc49881d6d799ed19c53bdf64ccf77d..29abc0ba9347352e53fb8756ff180b164ed8f2e0 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -11,14 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include "inspircd.h"
-
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
 
 /** Handle /SAJOIN
@@ -49,27 +46,38 @@ class cmd_sajoin : public command_t
                                return CMD_FAILURE;
                        }
 
-                       chanrec::JoinUser(ServerInstance, dest, parameters[1], 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]);
-                       if (n)
+                       /* 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
+                        * and then that server will generate the users JOIN or FJOIN instead.
+                        */
+                       if (IS_LOCAL(dest))
                        {
-                               if (n->HasUser(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]);
+                               if (n)
                                {
-                                       ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
-                                       return CMD_SUCCESS;
+                                       if (n->HasUser(dest))
+                                       {
+                                               ServerInstance->WriteOpers("*** "+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]+" (User is probably banned, or blocking modes)");
+                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]);
                                        return CMD_FAILURE;
                                }
                        }
                        else
                        {
-                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]);
-                               return CMD_FAILURE;
+                               ServerInstance->WriteOpers("*** "+std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+                               return CMD_SUCCESS;
                        }
                }
                else
@@ -85,7 +93,7 @@ class ModuleSajoin : public Module
        cmd_sajoin*     mycommand;
  public:
        ModuleSajoin(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                mycommand = new cmd_sajoin(ServerInstance);
@@ -124,7 +132,7 @@ class ModuleSajoinFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleSajoinFactory;
 }