-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2004-2005, 2007 Craig Edwards <craigedwards@brainbox.cc>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
-/* $ModDesc: Provides support for unreal-style SAJOIN command */
+/* $ModDesc: Provides command SAJOIN to allow opers to force-join users to channels */
/** Handle /SAJOIN
*/
-class cmd_sajoin : public command_t
+class CommandSajoin : public Command
{
public:
- cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2)
+ CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 2)
{
- this->source = "m_sajoin.so";
- syntax = "<nick> <channel>";
+ flags_needed = 'o'; Penalty = 0; 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;
}
/* 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
+ * 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))
{
- 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]);
+ 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)
{
if (n->HasUser(dest))
{
- ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+ ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
return CMD_SUCCESS;
}
else
}
else
{
- ServerInstance->WriteOpers("*** "+std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+ 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_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
{
- cmd_sajoin* mycommand;
+ CommandSajoin cmd;
public:
- ModuleSajoin(InspIRCd* Me)
- : Module(Me)
+ ModuleSajoin()
+ : cmd(this)
{
-
- mycommand = new cmd_sajoin(ServerInstance);
- ServerInstance->AddCommand(mycommand);
+ ServerInstance->AddCommand(&cmd);
}
-
+
virtual ~ModuleSajoin()
{
}
-
+
virtual Version GetVersion()
{
- return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR);
}
-
+
};
MODULE_INIT(ModuleSajoin)
projects / user / henk / code / inspircd.git / blobdiff