X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_svshold.cpp;h=df487199a48143c9bb4f38f028d28788e1de6475;hb=e57d1b19ff4823b7885eb7f4d3b37c84d2edca0e;hp=5009ad408a490a5de0c5b4e9f45e6edd8e21abc1;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 5009ad408..df487199a 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -1,59 +1,71 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2006-2008 Dennis Friis + * Copyright (C) 2006 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" #include "xline.h" +#include "modules/stats.h" -/* $ModDesc: Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services. */ +namespace +{ + bool silent; +} /** Holds a SVSHold item */ class SVSHold : public XLine { public: - irc::string nickname; + std::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, unsigned long d, const std::string& src, const std::string& re, const std::string& nick) + : XLine(s_time, d, src, re, "SVSHOLD") { this->nickname = nick; } - ~SVSHold() - { - } - - bool Matches(User *u) + bool Matches(User* u) CXX11_OVERRIDE { if (u->nick == nickname) return true; return false; } - bool Matches(const std::string &s) + bool Matches(const std::string& s) CXX11_OVERRIDE { - if (nickname == s) - return true; - return false; + return InspIRCd::Match(s, nickname); } - void DisplayExpiry() + void DisplayExpiry() CXX11_OVERRIDE { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed SVSHOLD %s (set by %s %ld seconds ago)", this->nickname.c_str(), this->source, this->duration); + if (!silent) + { + ServerInstance->SNO->WriteToSnoMask('x', "Removing expired SVSHOLD %s (set by %s %s ago): %s", + nickname.c_str(), source.c_str(), InspIRCd::DurationString(ServerInstance->Time() - set_time).c_str(), reason.c_str()); + } } - const char* Displayable() + const std::string& Displayable() CXX11_OVERRIDE { - return nickname.c_str(); + return nickname; } }; @@ -62,13 +74,18 @@ public: class SVSHoldFactory : public XLineFactory { public: - SVSHoldFactory(InspIRCd* Instance) : XLineFactory(Instance, "SVSHOLD") { } + SVSHoldFactory() : XLineFactory("SVSHOLD") { } - /** Generate a shun + /** Generate an SVSHOLD */ - 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, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { - return new SVSHold(ServerInstance, set_time, duration, source, reason, xline_specific_mask); + return new SVSHold(set_time, duration, source, reason, xline_specific_mask); + } + + bool AutoApplyToUserList(XLine* x) CXX11_OVERRIDE + { + return false; } }; @@ -77,19 +94,17 @@ class SVSHoldFactory : public XLineFactory 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 = " [ :]"; - TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END); + flags_needed = 'o'; this->syntax = " [ :]"; } - CmdResult Handle(const std::vector ¶meters, User *user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { /* syntax: svshold nickname time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ - if (!ServerInstance->ULine(user->server)) + if (!user->server->IsULine()) { /* don't allow SVSHOLD from non-ulined clients */ return CMD_FAILURE; @@ -97,98 +112,118 @@ class CommandSvshold : public Command if (parameters.size() == 1) { - if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SVSHOLD", user)) + std::string reason; + + if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SVSHOLD", reason, user)) { - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed SVSHOLD on %s.",user->nick.c_str(),parameters[0].c_str()); + if (!silent) + ServerInstance->SNO->WriteToSnoMask('x', "%s removed SVSHOLD on %s: %s", user->nick.c_str(), parameters[0].c_str(), reason.c_str()); } else { - user->WriteServ("NOTICE %s :*** SVSHOLD %s not found in list, try /stats S.",user->nick.c_str(),parameters[0].c_str()); + user->WriteNotice("*** SVSHOLD " + parameters[0] + " not found on the list."); } - - return CMD_SUCCESS; } - else if (parameters.size() >= 2) + else { - // Adding - XXX todo make this respect tag perhaps.. - long duration = ServerInstance->Duration(parameters[1]); - SVSHold *r = NULL; + if (parameters.size() < 3) + return CMD_FAILURE; - try - { - r = new SVSHold(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); - } - catch (...) + unsigned long duration; + if (!InspIRCd::Duration(parameters[1], duration)) { - ; // Do nothing. + user->WriteNotice("*** Invalid duration for SVSHOLD."); + return CMD_FAILURE; } + SVSHold* r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); - if (r) + if (ServerInstance->XLines->AddLine(r, user)) { - if (ServerInstance->XLines->AddLine(r, user)) + if (silent) + return CMD_SUCCESS; + + if (!duration) { - ServerInstance->XLines->ApplyLines(); + ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent SVSHOLD for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str()); } else { - delete r; + ServerInstance->SNO->WriteGlobalSno('x', "%s added timed SVSHOLD for %s, expires in %s (on %s): %s", + user->nick.c_str(), parameters[0].c_str(), InspIRCd::DurationString(duration).c_str(), + InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str()); } } + else + { + delete r; + return CMD_FAILURE; + } } return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + { + return ROUTE_BROADCAST; + } }; -class ModuleSVSHold : public Module +class ModuleSVSHold : public Module, public Stats::EventListener { - CommandSvshold *mycommand; - SVSHoldFactory *s; + CommandSvshold cmd; + SVSHoldFactory s; public: - ModuleSVSHold(InspIRCd* Me) : Module(Me) + ModuleSVSHold() + : Stats::EventListener(this) + , 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); } + void init() CXX11_OVERRIDE + { + ServerInstance->XLines->RegisterFactory(&s); + } + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + ConfigTag* tag = ServerInstance->Config->ConfValue("svshold"); + silent = tag->getBool("silent", true); + } - virtual int OnStats(char symbol, User* user, string_list &out) + ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE { - if(symbol != 'S') - return 0; + if (stats.GetSymbol() != 'S') + return MOD_RES_PASSTHRU; - ServerInstance->XLines->InvokeStats("SVSHOLD", 210, user, out); - return 1; + ServerInstance->XLines->InvokeStats("SVSHOLD", 210, stats); + return MOD_RES_DENY; } - virtual int OnUserPreNick(User *user, const std::string &newnick) + ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE { 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->WriteNumeric(ERR_ERRONEUSNICKNAME, newnick, InspIRCd::Format("Services reserved nickname: %s", rl->reason.c_str())); + return MOD_RES_DENY; } - return 0; + return MOD_RES_PASSTHRU; } - virtual ~ModuleSVSHold() + ~ModuleSVSHold() { ServerInstance->XLines->DelAll("SVSHOLD"); - ServerInstance->XLines->UnregisterFactory(s); + ServerInstance->XLines->UnregisterFactory(&s); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - 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); } };