public:
std::string matchtext;
- Shun(time_t s_time, long d, std::string src, std::string re, std::string shunmask)
+ Shun(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& shunmask)
: XLine(s_time, d, src, re, "SHUN")
+ , matchtext(shunmask)
{
- this->matchtext = shunmask;
}
~Shun()
std::string target = parameters[0];
- User *find = ServerInstance->FindNick(target.c_str());
- if (find)
+ User *find = ServerInstance->FindNick(target);
+ if ((find) && (find->registered == REG_ALL))
target = std::string("*!*@") + find->GetIPString();
if (parameters.size() == 1)
else
{
time_t c_requires_crap = duration + ServerInstance->Time();
+ std::string timestr = ServerInstance->TimeString(c_requires_crap);
ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s to expire on %s: %s",
- user->nick.c_str(), target.c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), expr.c_str());
+ user->nick.c_str(), target.c_str(), timestr.c_str(), expr.c_str());
}
}
else
RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
{
- return ROUTE_LOCALONLY;
+ if (IS_LOCAL(user))
+ return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
+
+ return ROUTE_BROADCAST;
}
};
public:
ModuleShun() : cmd(this)
+ {
+ }
+
+ void init()
{
ServerInstance->XLines->RegisterFactory(&f);
- ServerInstance->AddCommand(&cmd);
+ ServerInstance->Modules->AddService(cmd);
Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, 3);
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
OnRehash(NULL);
}
virtual void OnRehash(User* user)
{
- ConfigReader MyConf;
- std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0);
+ ConfigTag* tag = ServerInstance->Config->ConfValue("shun");
+ std::string cmds = tag->getString("enabledcommands");
std::transform(cmds.begin(), cmds.end(), cmds.begin(), ::toupper);
if (cmds.empty())
ShunEnabledCommands.insert(thiscmd);
}
- NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
- affectopers = MyConf.ReadFlag("shun", "affectopers", "no", 0);
+ NotifyOfShun = tag->getBool("notifyuser", true);
+ affectopers = tag->getBool("affectopers", false);
}
virtual ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, LocalUser* user, bool validated, const std::string &original_line)