X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=ef62294fde7544c15729c406e937355c56e2aa40;hb=355d51770e9a6d868eab7aa5442f4c0ac08a0046;hp=2decc2d3a584e282e8101e814646fe63e9ab7ef2;hpb=124c17e14134a4999afc1a5e981ab7c75b3694b9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 2decc2d3a..ef62294fd 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -1,10 +1,19 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2018 linuxdaemon + * Copyright (C) 2017 B00mX0r + * Copyright (C) 2016, 2019 Matt Schatz + * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Daniel De Graaf - * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 John Brooks + * Copyright (C) 2007-2008, 2010 Craig Edwards + * Copyright (C) 2007 Robin Burchell * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Robin Burchell * * 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 @@ -23,12 +32,12 @@ #include "inspircd.h" #include "listmode.h" -/** Holds a timed ban - */ +// Holds a timed ban class TimedBan { public: std::string mask; + std::string setter; time_t expire; Channel* chan; }; @@ -36,8 +45,7 @@ class TimedBan typedef std::vector timedbans; timedbans TimedBanList; -/** Handle /TBAN - */ +// Handle /TBAN class CommandTban : public Command { ChanModeReference banmode; @@ -47,13 +55,14 @@ class CommandTban : public Command ListModeBase* banlm = static_cast(*banmode); if (!banlm) return false; + const ListModeBase::ModeList* bans = banlm->GetList(chan); if (bans) { for (ListModeBase::ModeList::const_iterator i = bans->begin(); i != bans->end(); ++i) { const ListModeBase::ListItem& ban = *i; - if (!strcasecmp(ban.mask.c_str(), mask.c_str())) + if (irc::equals(ban.mask, mask)) return true; } } @@ -62,13 +71,14 @@ class CommandTban : public Command } public: - CommandTban(Module* Creator) : Command(Creator,"TBAN", 3) + CommandTban(Module* Creator) + : Command(Creator,"TBAN", 3) , banmode(Creator, "ban") { syntax = " "; } - CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { Channel* channel = ServerInstance->FindChan(parameters[0]); if (!channel) @@ -76,6 +86,7 @@ class CommandTban : public Command user->WriteNumeric(Numerics::NoSuchChannel(parameters[0])); return CMD_FAILURE; } + unsigned int cm = channel->GetPrefixValue(user); if (cm < HALFOP_VALUE) { @@ -84,13 +95,14 @@ class CommandTban : public Command } TimedBan T; - unsigned long duration = InspIRCd::Duration(parameters[1]); - unsigned long expire = duration + ServerInstance->Time(); - if (duration < 1) + unsigned long duration; + if (!InspIRCd::Duration(parameters[1], duration)) { user->WriteNotice("Invalid ban time"); return CMD_FAILURE; } + unsigned long expire = duration + ServerInstance->Time(); + std::string mask = parameters[2]; bool isextban = ((mask.size() > 2) && (mask[1] == ':')); if (!isextban && !InspIRCd::IsValidMask(mask)) @@ -107,29 +119,29 @@ class CommandTban : public Command // Pass the user (instead of ServerInstance->FakeClient) to ModeHandler::Process() to // make it so that the user sets the mode themselves ServerInstance->Modes->Process(user, channel, NULL, setban); - if (ServerInstance->Modes->GetLastParse().empty()) + if (ServerInstance->Modes->GetLastChangeList().empty()) { user->WriteNotice("Invalid ban mask"); return CMD_FAILURE; } - CUList tmp; T.mask = mask; + T.setter = user->nick; T.expire = expire + (IS_REMOTE(user) ? 5 : 0); T.chan = channel; TimedBanList.push_back(T); - const std::string addban = user->nick + " added a timed ban on " + mask + " lasting for " + ConvToStr(duration) + " seconds."; + const std::string message = InspIRCd::Format("Timed ban %s added by %s on %s lasting for %s.", + mask.c_str(), user->nick.c_str(), channel->name.c_str(), InspIRCd::DurationString(duration).c_str()); // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; - channel->WriteAllExcept(ServerInstance->FakeClient, true, pfxchar, tmp, "NOTICE %s :%s", channel->name.c_str(), addban.c_str()); - ServerInstance->PI->SendChannelNotice(channel, pfxchar, addban); + channel->WriteRemoteNotice(message, pfxchar); return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_BROADCAST; } @@ -207,22 +219,20 @@ class ModuleTimedBans : public Module for (timedbans::iterator i = expired.begin(); i != expired.end(); i++) { - std::string mask = i->mask; + const std::string mask = i->mask; Channel* cr = i->chan; - { - CUList empty; - const std::string expiry = "*** Timed ban on " + cr->name + " expired."; - // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above - PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); - char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; - - cr->WriteAllExcept(ServerInstance->FakeClient, true, pfxchar, empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str()); - ServerInstance->PI->SendChannelNotice(cr, pfxchar, expiry); - - Modes::ChangeList setban; - setban.push_remove(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask); - ServerInstance->Modes->Process(ServerInstance->FakeClient, cr, NULL, setban); - } + + const std::string message = InspIRCd::Format("Timed ban %s set by %s on %s has expired.", + mask.c_str(), i->setter.c_str(), cr->name.c_str()); + // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above + PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); + char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; + + cr->WriteRemoteNotice(message, pfxchar); + + Modes::ChangeList setban; + setban.push_remove(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask); + ServerInstance->Modes->Process(ServerInstance->FakeClient, cr, NULL, setban); } } @@ -234,7 +244,7 @@ class ModuleTimedBans : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Adds timed bans", VF_COMMON | VF_VENDOR); + return Version("Adds the /TBAN command which allows channel operators to add bans which will be expired after the specified period.", VF_COMMON | VF_VENDOR); } };