/* Support for a dancer-style /remove command, an alternative to /kick to try and avoid auto-rejoin-on-kick scripts */
/* Written by Om, 25-03-05 */
-using namespace std;
-
-#include <stdio.h>
+#include <sstream>
#include <string>
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel */
* eg: +h can remove +hv and users with no modes. +a can remove +aohv and users with no modes.
*/
-static Server *Srv;
-
-/* This little function just converts a chanmode character (~ & @ & +) into an integer (5 4 3 2 1) */
-/* XXX - this could be handy in the core, so it can be used elsewhere */
-int chartolevel(std::string &privs)
-{
- const char* n = privs.c_str();
-
- switch (*n)
- {
- case '~':
- return 5;
- break;
- case '&':
- return 4;
- break;
- case '@':
- return 3;
- break;
- case '%':
- return 2;
- break;
- default:
- return 1;
- break;
- }
- return 1;
-}
-
-class cmd_remove : public command_t
+class RemoveBase
{
- public:
- cmd_remove () : command_t("REMOVE", 0, 2)
+ private:
+ Server* Srv;
+ bool& supportnokicks;
+
+ protected:
+ RemoveBase(Server* Me, bool& snk)
+ : Srv(Me), supportnokicks(snk)
{
- this->source = "m_remove.so";
+ }
+
+ enum ModeLevel { PEON = 0, HALFOP = 1, OP = 2, ADMIN = 3, OWNER = 4, ULINE = 5 };
+
+ /* This little function just converts a chanmode character (U ~ & @ & +) into an integer (5 4 3 2 1 0) */
+ /* XXX - this could be handy in the core, so it can be used elsewhere */
+ ModeLevel chartolevel(const std::string &privs)
+ {
+ if(privs.empty())
+ {
+ return PEON;
+ }
+
+ switch (privs[0])
+ {
+ case 'U':
+ /* Ulined */
+ return ULINE;
+ case '~':
+ /* Owner */
+ return OWNER;
+ case '&':
+ /* Admin */
+ return ADMIN;
+ case '@':
+ /* Operator */
+ return OP;
+ case '%':
+ /* Halfop */
+ return HALFOP;
+ default:
+ /* Peon */
+ return PEON;
+ }
}
-
- void Handle (char **parameters, int pcnt, userrec *user)
+
+ void Handle (const char** parameters, int pcnt, userrec *user, bool neworder)
{
+ const char* channame;
+ const char* username;
+ userrec* target;
+ chanrec* channel;
+ ModeLevel tlevel;
+ ModeLevel ulevel;
+ std::ostringstream reason;
+ std::string protectkey;
+ std::string founderkey;
+ bool hasnokicks;
+
+ /* Set these to the parameters needed, the new version of this module switches it's parameters around
+ * supplying a new command with the new order while keeping the old /remove with the older order.
+ * /remove <nick> <channel> [reason ...]
+ * /fpart <channel> <nick> [reason ...]
+ */
+ channame = parameters[ neworder ? 0 : 1];
+ username = parameters[ neworder ? 1 : 0];
+
/* Look up the user we're meant to be removing from the channel */
- userrec* target = Srv->FindNick(std::string(parameters[0]));
+ target = Srv->FindNick(username);
+
/* And the channel we're meant to be removing them from */
- chanrec* channel = Srv->FindChannel(std::string(parameters[1]));
+ channel = Srv->FindChannel(channame);
/* Fix by brain - someone needs to learn to validate their input! */
if (!target || !channel)
{
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, !target ? parameters[0] : parameters[1]);
+ WriteServ(user->fd,"401 %s %s :No such nick/channel", user->nick, !target ? username : channame);
return;
}
- /* And see if the person calling the command has access to use it on the channel */
- std::string privs = Srv->ChanMode(user, channel);
- /* Check what privs the person being removed has */
- std::string targetprivs = Srv->ChanMode(target, channel);
-
- int tlevel;
- int ulevel;
- int n = 2;
- std::string result;
+ if (!channel->HasUser(target))
+ {
+ WriteServ(user->fd, "NOTICE %s :*** The user %s is not on channel %s", user->nick, target->nick, channel->name);
+ return;
+ }
+
+ /* This is adding support for the +q and +a channel modes, basically if they are enabled, and the remover has them set.
+ * Then we change the @|%|+ to & if they are +a, or ~ if they are +q */
+ protectkey = "cm_protect_" + std::string(channel->name);
+ founderkey = "cm_founder_" + std::string(channel->name);
- /* This turns all the parameters after the first two into a single string, so the part reason can be multi-word */
- while (n < pcnt)
+ if (Srv->IsUlined(user->server) || Srv->IsUlined(user->nick))
+ {
+ log(DEBUG, "Setting ulevel to U");
+ ulevel = chartolevel("U");
+ }
+ if (user->GetExt(founderkey))
+ {
+ log(DEBUG, "Setting ulevel to ~");
+ ulevel = chartolevel("~");
+ }
+ else if (user->GetExt(protectkey))
+ {
+ log(DEBUG, "Setting ulevel to &");
+ ulevel = chartolevel("&");
+ }
+ else
+ {
+ log(DEBUG, "Setting ulevel to %s", Srv->ChanMode(user, channel).c_str());
+ ulevel = chartolevel(Srv->ChanMode(user, channel));
+ }
+
+ /* Now it's the same idea, except for the target. If they're ulined make sure they get a higher level than the sender can */
+ if (Srv->IsUlined(target->server) || Srv->IsUlined(target->nick))
+ {
+ log(DEBUG, "Setting tlevel to U");
+ tlevel = chartolevel("U");
+ }
+ else if (target->GetExt(founderkey))
+ {
+ log(DEBUG, "Setting tlevel to ~");
+ tlevel = chartolevel("~");
+ }
+ else if (target->GetExt(protectkey))
{
- result=result + std::string(" ") + std::string(parameters[n]);
- n++;
+ log(DEBUG, "Setting tlevel to &");
+ tlevel = chartolevel("&");
}
+ else
+ {
+ log(DEBUG, "Setting tlevel to %s", Srv->ChanMode(target, channel).c_str());
+ tlevel = chartolevel(Srv->ChanMode(target, channel));
+ }
+
+ hasnokicks = (Srv->FindModule("m_nokicks.so") && channel->IsModeSet('Q'));
- /* If the target nick exists... */
- if (target && channel)
+ /* We support the +Q channel mode via. the m_nokicks module, if the module is loaded and the mode is set then disallow the /remove */
+ if(!supportnokicks || !hasnokicks || (ulevel == ULINE))
{
- for (unsigned int x = 0; x < strlen(parameters[1]); x++)
+ /* We'll let everyone remove their level and below, eg:
+ * ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1)
+ * a ulined target will get a higher level than it's possible for a /remover to get..so they're safe.
+ * Nobody may remove a founder.
+ */
+ if ((ulevel > PEON) && (ulevel >= tlevel) && (tlevel != OWNER))
{
- if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ','))
- {
- Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
- return;
- }
- }
-
- /* This is adding support for the +q and +a channel modes, basically if they are enabled, and the remover has them set. */
- /* Then we change the @|%|+ to & if they are +a, or ~ if they are +q */
- if (user->GetExt("cm_protect_"+std::string(channel->name)))
- privs = std::string("&");
- if (user->GetExt("cm_founder_"+std::string(channel->name)))
- privs = std::string("~");
-
- /* Now it's the same idea, except for the target */
- if (target->GetExt("cm_protect_"+std::string(channel->name)))
- targetprivs = std::string("&");
- if (target->GetExt("cm_founder_"+std::string(channel->name)))
- targetprivs = std::string("~");
+ std::string reasonparam;
- tlevel = chartolevel(targetprivs);
- ulevel = chartolevel(privs);
-
- /* If the user calling the command is either an admin, owner, operator or a half-operator on the channel */
- if(ulevel > 1)
- {
- /* For now, we'll let everyone remove their level and below, eg ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1) */
- if(ulevel >= tlevel)
+ /* If a reason is given, use it */
+ if(pcnt > 2)
{
- Srv->PartUserFromChannel(target,std::string(parameters[1]), "Removed by "+std::string(user->nick)+":"+result);
- Srv->SendTo(NULL,user,"NOTICE "+std::string(channel->name)+" : "+std::string(user->nick)+" removed "+std::string(target->nick)+ " from the channel");
- Srv->SendTo(NULL,target,"NOTICE "+std::string(target->nick)+" :*** "+std::string(user->nick)+" removed you from "+std::string(channel->name)+" with the message:"+std::string(result));
- }
- else
- {
- Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** You do not have access to remove "+std::string(target->nick)+" from the "+std::string(channel->name));
+ reason << ":";
+
+ /* Use all the remaining parameters as the reason */
+ for(int i = 2; i < pcnt; i++)
+ {
+ reason << " " << parameters[i];
+ }
+
+ reasonparam = reason.str();
+ reason.clear();
}
+
+ /* Build up the part reason string. */
+ reason << "Removed by " << user->nick << reasonparam;
+
+ channel->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :%s removed %s from the channel", channel->name, user->nick, target->nick);
+ WriteServ(target->fd, "NOTICE %s :*** %s removed you from %s with the message: %s", target->nick, user->nick, channel->name, reasonparam.c_str());
+
+ if (!channel->PartUser(target, reason.str().c_str()))
+ delete channel;
}
else
{
- Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** You do not have access to use /remove on "+std::string(channel->name));
+ WriteServ(user->fd, "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick, target->nick, channel->name);
}
}
+ else
+ {
+ /* m_nokicks.so was loaded and +Q was set, block! */
+ WriteServ(user->fd, "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick, channel->name, target->nick);
+ }
}
};
+class cmd_remove : public command_t, public RemoveBase
+{
+ public:
+ cmd_remove(Server* Srv, bool& snk) : command_t("REMOVE", 0, 2), RemoveBase(Srv, snk)
+ {
+ this->source = "m_remove.so";
+ syntax = "<nick> <channel> [<reason>]";
+ }
+
+ void Handle (const char** parameters, int pcnt, userrec *user)
+ {
+ RemoveBase::Handle(parameters, pcnt, user, false);
+ }
+};
+
+class cmd_fpart : public command_t, public RemoveBase
+{
+ public:
+ cmd_fpart(Server* Srv, bool snk) : command_t("FPART", 0, 2), RemoveBase(Srv, snk)
+ {
+ this->source = "m_remove.so";
+ syntax = "<channel> <nick> [<reason>]";
+ }
+
+ void Handle (const char** parameters, int pcnt, userrec *user)
+ {
+ RemoveBase::Handle(parameters, pcnt, user, true);
+ }
+};
+
class ModuleRemove : public Module
{
cmd_remove* mycommand;
+ cmd_fpart* mycommand2;
+ bool supportnokicks;
+
public:
ModuleRemove(Server* Me)
- : Module::Module(Me)
+ : Module::Module(Me)
{
- Srv = Me;
- mycommand = new cmd_remove();
- Srv->AddCommand(mycommand);
+ mycommand = new cmd_remove(Me, supportnokicks);
+ mycommand2 = new cmd_fpart(Me, supportnokicks);
+ Me->AddCommand(mycommand);
+ Me->AddCommand(mycommand2);
+ OnRehash("");
}
void Implements(char* List)
{
- List[I_On005Numeric] = 1;
+ List[I_On005Numeric] = List[I_OnRehash] = 1;
}
- virtual void On005Numeric(std::string &output)
- {
- output = output + std::string(" REMOVE");
- }
+ virtual void On005Numeric(std::string &output)
+ {
+ output.append(" REMOVE");
+ }
+
+ virtual void OnRehash(const std::string&)
+ {
+ ConfigReader conf;
+
+ supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
+ }
virtual ~ModuleRemove()
{
+ delete mycommand;
+ delete mycommand2;
}
virtual Version GetVersion()
{
- return Version(1,0,0,1,VF_VENDOR);
+ return Version(1,0,1,0,VF_VENDOR);
}
};
{
return new ModuleRemoveFactory;
}
-
projects / user / henk / code / inspircd.git / blobdiff