X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=197bbc1bf9823a26086c44f6b2c0978baf07113c;hb=0b3a4371c504c45c8a4504d114efb2ca674374e0;hp=e07c2cd8d541961ff0b89d2127c273380bcf795e;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index e07c2cd8d..197bbc1bf 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -1,20 +1,29 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2008 Craig Edwards + * Copyright (C) 2008 Thomas Stagner * - * 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" -/* $ModDesc: Provides the /shun command, which stops a user executing all commands except PING and PONG. */ +/* $ModDesc: Provides the /SHUN command, which stops a user from executing all except configured commands. */ class Shun : public XLine { @@ -50,11 +59,6 @@ public: return false; } - void Apply(User *u) - { - } - - void DisplayExpiry() { ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)", @@ -80,6 +84,11 @@ class ShunFactory : public XLineFactory { return new Shun(set_time, duration, source, reason, xline_specific_mask); } + + bool AutoApplyToUserList(XLine *x) + { + return false; + } }; //typedef std::vector shunlist; @@ -111,13 +120,11 @@ class CommandShun : public Command } else { - // XXX todo implement stats - user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats S.",user->nick.c_str(),target.c_str()); + user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats H.",user->nick.c_str(),target.c_str()); + return CMD_FAILURE; } - - return CMD_SUCCESS; } - else if (parameters.size() >= 2) + else { // Adding - XXX todo make this respect tag perhaps.. long duration; @@ -132,49 +139,35 @@ class CommandShun : public Command duration = 0; expr = parameters[1]; } - Shun *r = NULL; - - try - { - r = new Shun(ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), target.c_str()); - } - catch (...) - { - ; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up. - } - if (r) + Shun* r = new Shun(ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), target.c_str()); + if (ServerInstance->XLines->AddLine(r, user)) { - if (ServerInstance->XLines->AddLine(r, user)) + if (!duration) { - if (!duration) - { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent SHUN for %s: %s", - user->nick.c_str(), target.c_str(), expr.c_str()); - } - else - { - time_t c_requires_crap = duration + ServerInstance->Time(); - 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()); - } - - ServerInstance->XLines->ApplyLines(); + ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent SHUN for %s: %s", + user->nick.c_str(), target.c_str(), expr.c_str()); } else { - delete r; - user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), expr.c_str()); + time_t c_requires_crap = duration + ServerInstance->Time(); + 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()); } } + else + { + delete r; + user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), target.c_str()); + return CMD_FAILURE; + } } - - return CMD_FAILURE; + return CMD_SUCCESS; } RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - return ROUTE_BROADCAST; + return ROUTE_LOCALONLY; } }; @@ -192,8 +185,8 @@ class ModuleShun : public Module ServerInstance->XLines->RegisterFactory(&f); ServerInstance->AddCommand(&cmd); - Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 4); + Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 3); OnRehash(NULL); } @@ -203,9 +196,15 @@ class ModuleShun : public Module ServerInstance->XLines->UnregisterFactory(&f); } + void Prioritize() + { + Module* alias = ServerInstance->Modules->Find("m_alias.so"); + ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, &alias); + } + virtual ModResult OnStats(char symbol, User* user, string_list& out) { - if (symbol != 'S') + if (symbol != 'H') return MOD_RES_PASSTHRU; ServerInstance->XLines->InvokeStats("SHUN", 223, user, out); @@ -221,8 +220,6 @@ class ModuleShun : public Module cmds = "PING PONG QUIT"; ShunEnabledCommands.clear(); - NotifyOfShun = true; - affectopers = false; std::stringstream dcmds(cmds); std::string thiscmd; @@ -236,22 +233,7 @@ class ModuleShun : public Module affectopers = MyConf.ReadFlag("shun", "affectopers", "no", 0); } - virtual void OnUserConnect(LocalUser* user) - { - if (!IS_LOCAL(user)) - return; - - // Apply lines on user connect - XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user); - - if (rl) - { - // Bang. :P - rl->Apply(user); - } - } - - virtual ModResult OnPreCommand(std::string &command, std::vector& parameters, User* user, bool validated, const std::string &original_line) + virtual ModResult OnPreCommand(std::string &command, std::vector& parameters, LocalUser* user, bool validated, const std::string &original_line) { if (validated) return MOD_RES_PASSTHRU; @@ -282,10 +264,10 @@ class ModuleShun : public Module /* Allow QUIT but dont show any quit message */ parameters.clear(); } - else if (command == "PART") + else if ((command == "PART") && (parameters.size() > 1)) { /* same for PART */ - parameters[1] = ""; + parameters[1].clear(); } /* if we're here, allow the command. */ @@ -294,7 +276,7 @@ class ModuleShun : public Module virtual Version GetVersion() { - return Version("Provides the /shun command, which stops a user executing all commands except PING and PONG.",VF_VENDOR|VF_COMMON); + return Version("Provides the /SHUN command, which stops a user from executing all except configured commands.",VF_VENDOR|VF_COMMON); } };