CmdResult HandleRMB(const std::vector<std::string>& parameters, User *user, bool neworder)
{
- const char* channame;
- const char* username;
User* target;
Channel* channel;
std::string reason;
* /remove <nick> <channel> [reason ...]
* /fpart <channel> <nick> [reason ...]
*/
- channame = parameters[ neworder ? 0 : 1].c_str();
- username = parameters[ neworder ? 1 : 0].c_str();
+ const std::string& channame = parameters[neworder ? 0 : 1];
+ const std::string& username = parameters[neworder ? 1 : 0];
/* Look up the user we're meant to be removing from the channel */
target = ServerInstance->FindNick(username);
/* Fix by brain - someone needs to learn to validate their input! */
if (!target || !channel)
{
- user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !target ? username : channame);
+ user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !target ? username.c_str() : channame.c_str());
return CMD_FAILURE;
}
hasnokicks = (ServerInstance->Modules->Find("m_nokicks.so") && channel->IsModeSet('Q'));
- if((ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick.c_str()))){
- user->WriteNumeric(482, "%s %s :Only a u-line may remove a u-line from a channel.", user->nick.c_str(), channame);
+ if (ServerInstance->ULine(target->server))
+ {
+ user->WriteNumeric(482, "%s %s :Only a u-line may remove a u-line from a channel.", user->nick.c_str(), channame.c_str());
return CMD_FAILURE;
}
*/
if ((!IS_LOCAL(user)) || ((ulevel > VOICE_VALUE) && (ulevel >= tlevel) && (tlevel != 50000)))
{
- // no you can't just go from a std::ostringstream to a std::string, Om. -nenolod
- // but you can do this, nenolod -brain
-
- std::string reasonparam("No reason given");
+ std::string reasonparam;
/* If a reason is given, use it */
if(parameters.size() > 2)
- {
- /* Join params 2 ... pcnt - 1 (inclusive) into one */
- irc::stringjoiner reason_join(" ", parameters, 2, parameters.size() - 1);
- reasonparam = reason_join.GetJoined();
- }
+ reasonparam = parameters[2];
+ else
+ reasonparam = "No reason given";
/* Build up the part reason string. */
reason = "Removed by " + user->nick + ": " + reasonparam;
- channel->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str());
+ channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str());
target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick.c_str(), user->nick.c_str(), channel->name.c_str(), reasonparam.c_str());
channel->PartUser(target, reason);
virtual void OnRehash(User* user)
{
- ConfigReader conf;
- supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
+ supportnokicks = ServerInstance->Config->ConfValue("remove")->getBool("supportnokicks");
}
virtual ~ModuleRemove()