* | 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.
*
* ---------------------------------------------------
*/
-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 */
-Server *Srv;
-
-class cmd_sajoin : public command_t
+/** Handle /SAJOIN
+ */
+class CommandSajoin : public Command
{
public:
- cmd_sajoin() : command_t("SAJOIN", 'o', 2)
+ CommandSajoin (InspIRCd* Instance) : Command(Instance,"SAJOIN", "o", 2, false, 0)
{
- this->source = "m_sajoin.cpp";
+ this->source = "m_sajoin.so";
+ syntax = "<nick> <channel>";
+ TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
}
- void Handle (char **parameters, int pcnt, userrec *user)
+ CmdResult Handle (const char* const* parameters, int pcnt, User *user)
{
- userrec* dest = Srv->FindNick(std::string(parameters[0]));
+ User* dest = ServerInstance->FindNick(parameters[0]);
if (dest)
{
- /* might be nicer to make checking valid channel names an api function sometime --w00t */
- if (parameters[1][0] != '#')
+ if (ServerInstance->ULine(dest->server))
+ {
+ user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick);
+ return CMD_FAILURE;
+ }
+ if (!ServerInstance->IsChannel(parameters[1]))
{
/* we didn't need to check this for each character ;) */
- Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
- return;
+ user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
+ return CMD_FAILURE;
}
- for (unsigned int x = 0; x < strlen(parameters[1]); x++)
+ /* 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 ((parameters[1][x] == ' ') || (parameters[1][x] == ','))
+ Channel::JoinUser(ServerInstance, dest, parameters[1], 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
{
- 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]+" (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]);
+ 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));
+ 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;
}
}
};
class ModuleSajoin : public Module
{
- cmd_sajoin* mycommand;
+ CommandSajoin* mycommand;
public:
- ModuleSajoin(Server* Me)
- : Module::Module(Me)
+ ModuleSajoin(InspIRCd* Me)
+ : Module(Me)
{
- Srv = Me;
- mycommand = new cmd_sajoin();
- Srv->AddCommand(mycommand);
+
+ mycommand = new CommandSajoin(ServerInstance);
+ ServerInstance->AddCommand(mycommand);
+
}
virtual ~ModuleSajoin()
virtual Version GetVersion()
{
- return Version(1,0,0,1,VF_VENDOR);
+ 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(Server* Me)
- {
- return new ModuleSajoin(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleSajoinFactory;
-}
-
+MODULE_INIT(ModuleSajoin)