X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_svshold.cpp;h=276fef038cab386c6695a06b738eb8ce689d5e11;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=f26454d3e0017c33b68223fbc3ba09e334e7cff9;hpb=694e307c09334c21aaf1a6c3f0b7b6d95440dd3e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index f26454d3e..276fef038 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 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. @@ -12,52 +12,79 @@ */ #include "inspircd.h" +#include "xline.h" /* $ModDesc: Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services. */ /** Holds a SVSHold item */ -class SVSHold : public classbase +class SVSHold : public XLine { public: - std::string nickname; - std::string set_by; - time_t set_on; - long length; - std::string reason; + irc::string nickname; - SVSHold() + 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") { + this->nickname = nick; } - SVSHold(const std::string &nn, const std::string &sb, const time_t so, const long ln, const std::string &rs) : nickname(nn), set_by(sb), set_on(so), length(ln), reason(rs) + ~SVSHold() { } -}; + bool Matches(User *u) + { + if (u->nick == nickname) + return true; + return false; + } -bool SVSHoldComp(const SVSHold* ban1, const SVSHold* ban2); + bool Matches(const std::string &s) + { + if (nickname == s) + return true; + return false; + } -typedef std::vector SVSHoldlist; -typedef std::map SVSHoldMap; + void DisplayExpiry() + { + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)", this->nickname.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time)); + } -/* SVSHolds is declared here, as our type is right above. Don't try move it. */ -SVSHoldlist SVSHolds; -SVSHoldMap HoldMap; + const char* Displayable() + { + return nickname.c_str(); + } +}; + +/** An XLineFactory specialized to generate SVSHOLD pointers + */ +class SVSHoldFactory : public XLineFactory +{ + public: + SVSHoldFactory(InspIRCd* Instance) : XLineFactory(Instance, "SVSHOLD") { } + + /** Generate a shun + */ + XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask) + { + return new SVSHold(ServerInstance, set_time, duration, source, reason, xline_specific_mask); + } +}; /** Handle /SVSHold */ -class cmd_svshold : public Command +class CommandSvshold : public Command { public: - cmd_svshold(InspIRCd* Me) : Command(Me, "SVSHOLD", 'o', 1) + CommandSvshold(InspIRCd* Me) : Command(Me, "SVSHOLD", "o", 1) { this->source = "m_svshold.so"; this->syntax = " [ :]"; TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END); } - CmdResult Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const std::vector ¶meters, User *user) { /* syntax: svshold nickname time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ @@ -68,210 +95,98 @@ class cmd_svshold : public Command return CMD_FAILURE; } - if (pcnt == 1) + if (parameters.size() == 1) { - SVSHoldMap::iterator n = HoldMap.find(parameters[0]); - if (n != HoldMap.end()) + if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SVSHOLD", user)) { - /* form: svshold nickname removes a hold. */ - for (SVSHoldlist::iterator iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++) - { - if (parameters[0] == assign((*iter)->nickname)) - { - unsigned long remaining = 0; - if ((*iter)->length) - { - remaining = ((*iter)->set_on + (*iter)->length) - ServerInstance->Time(); - user->WriteServ( "386 %s %s :Removed SVSHOLD with %lu seconds left before expiry (%s)", user->nick, (*iter)->nickname.c_str(), remaining, (*iter)->reason.c_str()); - } - else - { - user->WriteServ( "386 %s %s :Removed permanent SVSHOLD (%s)", user->nick, (*iter)->nickname.c_str(), (*iter)->reason.c_str()); - } - SVSHolds.erase(iter); - break; - } - } - - HoldMap.erase(n); - delete n->second; + ServerInstance->SNO->WriteToSnoMask('x',"%s Removed SVSHOLD on %s.",user->nick.c_str(),parameters[0].c_str()); } - } - else if (pcnt >= 2) - { - /* full form to add a SVSHold */ - if (ServerInstance->IsNick(parameters[0])) + else { - // parameters[0] = w00t - // parameters[1] = 1h3m2s - // parameters[2] = Registered nickname - - /* Already exists? */ - if (HoldMap.find(parameters[0]) != HoldMap.end()) - { - user->WriteServ( "385 %s %s :SVSHOLD already exists", user->nick, parameters[0]); - return CMD_FAILURE; - } + user->WriteServ("NOTICE %s :*** SVSHOLD %s not found in list, try /stats S.",user->nick.c_str(),parameters[0].c_str()); + } - long length = ServerInstance->Duration(parameters[1]); - std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied"; - - SVSHold* S = new SVSHold(parameters[0], user->nick, ServerInstance->Time(), length, reason); - SVSHolds.push_back(S); - HoldMap[parameters[0]] = S; + return CMD_SUCCESS; + } + else if (parameters.size() >= 2) + { + // Adding - XXX todo make this respect tag perhaps.. + long duration = ServerInstance->Duration(parameters[1]); + SVSHold *r = NULL; - std::sort(SVSHolds.begin(), SVSHolds.end(), SVSHoldComp); + try + { + r = new SVSHold(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); + } + catch (...) + { + ; // Do nothing. + } - if(length > 0) + if (r) + { + if (ServerInstance->XLines->AddLine(r, user)) { - user->WriteServ( "385 %s %s :Added %lu second SVSHOLD (%s)", user->nick, parameters[0], length, reason.c_str()); - ServerInstance->WriteOpers("*** %s added %lu second SVSHOLD on %s (%s)", user->nick, length, parameters[0], reason.c_str()); + ServerInstance->XLines->ApplyLines(); } else { - user->WriteServ( "385 %s %s :Added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], parameters[0], reason.c_str()); - ServerInstance->WriteOpers("*** %s added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], reason.c_str()); + delete r; } } - else - { - /* as this is primarily a Services command, do not provide an error */ - return CMD_FAILURE; - } } return CMD_SUCCESS; } }; -bool SVSHoldComp(const SVSHold* ban1, const SVSHold* ban2) -{ - return ((ban1->set_on + ban1->length) < (ban2->set_on + ban2->length)); -} - class ModuleSVSHold : public Module { - cmd_svshold *mycommand; - + CommandSvshold cmd; + SVSHoldFactory s; + public: - ModuleSVSHold(InspIRCd* Me) : Module(Me) + ModuleSVSHold(InspIRCd* Me) : Module(Me), cmd(Me), s(Me) { - mycommand = new cmd_svshold(Me); - ServerInstance->AddCommand(mycommand); + ServerInstance->XLines->RegisterFactory(&s); + ServerInstance->AddCommand(&cmd); + Implementation eventlist[] = { I_OnUserPreNick, I_OnStats }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - void Implements(char* List) - { - List[I_OnUserPreNick] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1; - } - - virtual int OnStats(char symbol, userrec* user, string_list &results) + + virtual int OnStats(char symbol, User* user, string_list &out) { - ExpireBans(); - - if(symbol == 'S') - { - for(SVSHoldlist::iterator iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++) - { - unsigned long remaining = ((*iter)->set_on + (*iter)->length) - ServerInstance->Time(); - results.push_back(std::string(ServerInstance->Config->ServerName)+" 210 "+user->nick+" "+(*iter)->nickname.c_str()+" "+(*iter)->set_by+" "+ConvToStr((*iter)->set_on)+" "+ConvToStr((*iter)->length)+" "+ConvToStr(remaining)+" :"+(*iter)->reason); - } - } - - return 0; + if(symbol != 'S') + return 0; + + ServerInstance->XLines->InvokeStats("SVSHOLD", 210, user, out); + return 1; } - virtual int OnUserPreNick(userrec *user, const std::string &newnick) + virtual int OnUserPreNick(User *user, const std::string &newnick) { - ExpireBans(); - - /* check SVSHolds in here, and apply as necessary. */ - SVSHoldMap::iterator n = HoldMap.find(assign(newnick)); - if (n != HoldMap.end()) + XLine *rl = ServerInstance->XLines->MatchesLine("SVSHOLD", newnick); + + if (rl) { - user->WriteServ( "432 %s %s :Reserved nickname: %s", user->nick, newnick.c_str(), n->second->reason.c_str()); + user->WriteServ( "432 %s %s :Services reserved nickname: %s", user->nick.c_str(), newnick.c_str(), rl->reason); return 1; } - return 0; - } - - virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable) - { - for(SVSHoldMap::iterator iter = HoldMap.begin(); iter != HoldMap.end(); iter++) - { - proto->ProtoSendMetaData(opaque, TYPE_OTHER, NULL, "SVSHold", EncodeSVSHold(iter->second)); - } - } - virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) - { - if((target_type == TYPE_OTHER) && (extname == "SVSHold")) - { - SVSHold* S = DecodeSVSHold(extdata); /* NOTE: Allocates a new SVSHold* */ - if (HoldMap.find(assign(S->nickname)) == HoldMap.end()) - { - SVSHolds.push_back(S); - HoldMap[assign(S->nickname)] = S; - std::sort(SVSHolds.begin(), SVSHolds.end(), SVSHoldComp); - } - else - { - delete S; - } - } + return 0; } virtual ~ModuleSVSHold() { - } - - virtual Version GetVersion() - { - return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION); - } - - std::string EncodeSVSHold(const SVSHold* ban) - { - std::ostringstream stream; - stream << ban->nickname << " " << ban->set_by << " " << ban->set_on << " " << ban->length << " :" << ban->reason; - return stream.str(); + ServerInstance->XLines->DelAll("SVSHOLD"); + ServerInstance->XLines->UnregisterFactory(&s); } - SVSHold* DecodeSVSHold(const std::string &data) - { - SVSHold* res = new SVSHold(); - int set_on; - irc::tokenstream tokens(data); - tokens.GetToken(res->nickname); - tokens.GetToken(res->set_by); - tokens.GetToken(set_on); - res->set_on = set_on; - tokens.GetToken(res->length); - tokens.GetToken(res->reason); - return res; - } - - void ExpireBans() + virtual Version GetVersion() { - SVSHoldlist::iterator iter,safeiter; - for (iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++) - { - /* 0 == permanent, don't mess with them! -- w00t */ - if ((*iter)->length != 0) - { - if ((*iter)->set_on + (*iter)->length <= ServerInstance->Time()) - { - ServerInstance->Log(DEBUG, "m_svshold.so: hold on %s expired, removing...", (*iter)->nickname.c_str()); - ServerInstance->WriteOpers("*** %li second SVSHOLD on %s (%s) set %u seconds ago expired", (*iter)->length, (*iter)->nickname.c_str(), (*iter)->reason.c_str(), ServerInstance->Time() - (*iter)->set_on); - HoldMap.erase(assign((*iter)->nickname)); - delete *iter; - safeiter = iter; - --iter; - SVSHolds.erase(safeiter); - } - } - } + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } };