* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
public:
irc::string nickname;
- SVSHold(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char *nick) : XLine(Instance, s_time, d, src, re, "SVSHOLD")
+ SVSHold(time_t s_time, long d, std::string src, std::string re, std::string nick)
+ : XLine(s_time, d, src, re, "SVSHOLD")
{
- this->nickname = nick;
+ this->nickname = nick.c_str();
}
~SVSHold()
void DisplayExpiry()
{
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed SVSHOLD %s (set by %s %ld seconds ago)", this->nickname.c_str(), this->source, this->duration);
+ ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
+ this->nickname.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
}
const char* Displayable()
class SVSHoldFactory : public XLineFactory
{
public:
- SVSHoldFactory(InspIRCd* Instance) : XLineFactory(Instance, "SVSHOLD") { }
+ SVSHoldFactory() : XLineFactory("SVSHOLD") { }
/** Generate a shun
*/
- XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask)
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
{
- return new SVSHold(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
+ return new SVSHold(set_time, duration, source, reason, xline_specific_mask);
}
};
class CommandSvshold : public Command
{
public:
- CommandSvshold(InspIRCd* Me) : Command(Me, "SVSHOLD", "o", 1)
+ CommandSvshold(Module* Creator) : Command(Creator, "SVSHOLD", 1)
{
- this->source = "m_svshold.so";
- this->syntax = "<nickname> [<duration> :<reason>]";
+ flags_needed = 'o'; this->syntax = "<nickname> [<duration> :<reason>]";
TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
}
{
if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SVSHOLD", user))
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s Removed SVSHOLD on %s.",user->nick.c_str(),parameters[0].c_str());
+ ServerInstance->SNO->WriteToSnoMask('x',"%s removed SVSHOLD on %s",user->nick.c_str(),parameters[0].c_str());
}
else
{
try
{
- r = new SVSHold(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
+ r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
}
catch (...)
{
{
if (ServerInstance->XLines->AddLine(r, user))
{
+ if (!duration)
+ {
+ ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent SVSHOLD for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
+ }
+ else
+ {
+ time_t c_requires_crap = duration + ServerInstance->Time();
+ ServerInstance->SNO->WriteGlobalSno('x', "%s added timed SVSHOLD for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
+ }
+
ServerInstance->XLines->ApplyLines();
}
else
return CMD_SUCCESS;
}
+
+ RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+ {
+ return ROUTE_BROADCAST;
+ }
};
class ModuleSVSHold : public Module
{
- CommandSvshold *mycommand;
- SVSHoldFactory *s;
+ CommandSvshold cmd;
+ SVSHoldFactory s;
public:
- ModuleSVSHold(InspIRCd* Me) : Module(Me)
+ ModuleSVSHold() : cmd(this)
{
- s = new SVSHoldFactory(ServerInstance);
- ServerInstance->XLines->RegisterFactory(s);
- mycommand = new CommandSvshold(Me);
- ServerInstance->AddCommand(mycommand);
- Implementation eventlist[] = { I_OnUserPreNick, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnStats };
- ServerInstance->Modules->Attach(eventlist, this, 4);
+ ServerInstance->XLines->RegisterFactory(&s);
+ ServerInstance->AddCommand(&cmd);
+ Implementation eventlist[] = { I_OnUserPreNick, I_OnStats };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
- virtual int OnStats(char symbol, User* user, string_list &out)
+ virtual ModResult OnStats(char symbol, User* user, string_list &out)
{
if(symbol != 'S')
- return 0;
+ return MOD_RES_PASSTHRU;
ServerInstance->XLines->InvokeStats("SVSHOLD", 210, user, out);
- return 1;
+ return MOD_RES_DENY;
}
- virtual int OnUserPreNick(User *user, const std::string &newnick)
+ virtual ModResult OnUserPreNick(User *user, const std::string &newnick)
{
XLine *rl = ServerInstance->XLines->MatchesLine("SVSHOLD", newnick);
if (rl)
{
- user->WriteServ( "432 %s %s :Services reserved nickname: %s", user->nick.c_str(), newnick.c_str(), rl->reason);
- return 1;
+ user->WriteServ( "432 %s %s :Services reserved nickname: %s", user->nick.c_str(), newnick.c_str(), rl->reason.c_str());
+ return MOD_RES_DENY;
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
virtual ~ModuleSVSHold()
{
ServerInstance->XLines->DelAll("SVSHOLD");
- ServerInstance->XLines->UnregisterFactory(s);
+ ServerInstance->XLines->UnregisterFactory(&s);
}
virtual Version GetVersion()
{
- return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR);
}
};