#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 */
void Handle (char **parameters, int pcnt, userrec *user)
{
+ userrec* target;
+ chanrec* channel;
+ int tlevel, ulevel;
+ std::string tprivs, uprivs, reason;
+
+
/* Look up the user we're meant to be removing from the channel */
- userrec* target = Srv->FindNick(std::string(parameters[0]));
+ target = Srv->FindNick(parameters[0]);
+
/* And the channel we're meant to be removing them from */
- chanrec* channel = Srv->FindChannel(std::string(parameters[1]));
+ channel = Srv->FindChannel(parameters[1]);
/* Fix by brain - someone needs to learn to validate their input! */
if (!target || !channel)
}
/* And see if the person calling the command has access to use it on the channel */
- std::string privs = Srv->ChanMode(user, channel);
+ uprivs = Srv->ChanMode(user, channel);
+
/* Check what privs the person being removed has */
- std::string targetprivs = Srv->ChanMode(target, channel);
+ tprivs = Srv->ChanMode(target, channel);
- int tlevel;
- int ulevel;
- int n = 2;
- std::string result;
+ if(pcnt > 2)
+ reason = "Removed by " + std::string(user->nick) + ":";
+ else
+ reason = "Removed by " + std::string(user->nick);
/* This turns all the parameters after the first two into a single string, so the part reason can be multi-word */
- while (n < pcnt)
+ for (int n = 2; n < pcnt; n++)
{
- result=result + std::string(" ") + std::string(parameters[n]);
- n++;
+ reason += " ";
+ reason += parameters[n];
}
- /* If the target nick exists... */
- if (target && channel)
- {
- for (unsigned int x = 0; x < strlen(parameters[1]); x++)
- {
- 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)))
+ uprivs = "&";
+ if (user->GetExt("cm_founder_"+std::string(channel->name)))
+ uprivs = "~";
- /* 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("~");
-
- tlevel = chartolevel(targetprivs);
- ulevel = chartolevel(privs);
+ /* Now it's the same idea, except for the target */
+ if (target->GetExt("cm_protect_"+std::string(channel->name)))
+ tprivs = "&";
+ if (target->GetExt("cm_founder_"+std::string(channel->name)))
+ tprivs = "~";
- /* If the user calling the command is either an admin, owner, operator or a half-operator on the channel */
- if(ulevel > 1)
+ tlevel = chartolevel(tprivs);
+ ulevel = chartolevel(uprivs);
+
+ /* 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 && tlevel != 5)
{
- /* 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)
- {
- 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));
- }
+ Srv->PartUserFromChannel(target, channel->name, reason);
+ WriteServ(user->fd, "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, reason.c_str());
}
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
+ {
+ WriteServ(user->fd, "NOTICE %s :*** You do not have access to use /remove on %s", user->nick, channel->name);
+ }
}
};
List[I_On005Numeric] = 1;
}
- virtual void On005Numeric(std::string &output)
- {
- output = output + std::string(" REMOVE");
- }
+ virtual void On005Numeric(std::string &output)
+ {
+ output = output + std::string(" REMOVE");
+ }
virtual ~ModuleRemove()
{
{
return new ModuleRemoveFactory;
}
-
projects / user / henk / code / inspircd.git / blobdiff