#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
+
#include "inspircd.h"
/* $ModDesc: Provides support for unreal-style SAJOIN command */
-static Server *Srv;
-
+/** Handle /SAJOIN
+ */
class cmd_sajoin : public command_t
{
public:
- cmd_sajoin() : command_t("SAJOIN", 'o', 2)
+ cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2)
{
this->source = "m_sajoin.so";
syntax = "<nick> <channel>";
}
- void Handle (const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle (const char** parameters, int pcnt, userrec *user)
{
- userrec* dest = Srv->FindNick(std::string(parameters[0]));
+ userrec* dest = ServerInstance->FindNick(parameters[0]);
if (dest)
{
- if (Srv->IsUlined(dest->server))
+ if (ServerInstance->ULine(dest->server))
{
user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
- return;
+ return CMD_FAILURE;
}
- if (!IsValidChannelName(parameters[1]))
+ if (!ServerInstance->IsChannel(parameters[1]))
{
/* we didn't need to check this for each character ;) */
user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
- return;
+ return CMD_FAILURE;
}
- Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
- chanrec::JoinUser(dest, parameters[1], true);
+ 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)
+ {
+ 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]);
+ return CMD_FAILURE;
+ }
}
+
+ return CMD_FAILURE;
}
};
{
cmd_sajoin* mycommand;
public:
- ModuleSajoin(Server* Me)
+ ModuleSajoin(InspIRCd* Me)
: Module::Module(Me)
{
- Srv = Me;
- mycommand = new cmd_sajoin();
- Srv->AddCommand(mycommand);
+
+ mycommand = new cmd_sajoin(ServerInstance);
+ ServerInstance->AddCommand(mycommand);
}
virtual ~ModuleSajoin()
virtual Version GetVersion()
{
- return Version(1,0,0,1,VF_VENDOR);
+ return Version(1,1,0,1,VF_VENDOR,API_VERSION);
}
};
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleSajoin(Me);
}