* | 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-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.
+ * 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 */
/** Handle /SAJOIN
*/
-class cmd_sajoin : public command_t
+class CommandSajoin : public Command
{
public:
- cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2)
+ 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);
}
- 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;
}
- 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 propagate 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))
+ 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)
{
- 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->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]+" (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->SNO->WriteToSnoMask('A', std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+ return CMD_SUCCESS;
}
}
-
- return CMD_SUCCESS;
+ else
+ {
+ user->WriteServ("NOTICE "+std::string(user->nick)+" :*** No such nickname "+parameters[0]);
+ return CMD_FAILURE;
+ }
}
};
class ModuleSajoin : public Module
{
- cmd_sajoin* mycommand;
+ CommandSajoin* mycommand;
public:
ModuleSajoin(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
-
- mycommand = new cmd_sajoin(ServerInstance);
+
+ mycommand = new CommandSajoin(ServerInstance);
ServerInstance->AddCommand(mycommand);
+
}
-
+
virtual ~ModuleSajoin()
{
}
-
+
virtual Version GetVersion()
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version("$Id$", 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(InspIRCd* Me)
- {
- return new ModuleSajoin(Me);
- }
-
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleSajoinFactory;
-}
-
+MODULE_INIT(ModuleSajoin)