From c2218abac11a2ddaff197f93721818efdcc9ae01 Mon Sep 17 00:00:00 2001 From: iwalkalone Date: Wed, 22 Jul 2020 15:31:55 +0200 Subject: Allow disabling the timedbans set/unset notices (#1789). --- src/modules/m_timedbans.cpp | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index ef62294fd..47fbd7fb6 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -71,6 +71,8 @@ class CommandTban : public Command } public: + bool sendnotice; + CommandTban(Module* Creator) : Command(Creator,"TBAN", 3) , banmode(Creator, "ban") @@ -131,13 +133,17 @@ class CommandTban : public Command T.chan = channel; TimedBanList.push_back(T); - const std::string message = InspIRCd::Format("Timed ban %s added by %s on %s lasting for %s.", + if (sendnotice) + { + 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() : '@'; + // 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->WriteRemoteNotice(message, pfxchar); + } - channel->WriteRemoteNotice(message, pfxchar); return CMD_SUCCESS; } @@ -203,6 +209,12 @@ class ModuleTimedBans : public Module { } + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + ConfigTag* tag = ServerInstance->Config->ConfValue("timedbans"); + cmd.sendnotice = tag->getBool("sendnotice", true); + } + void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE { timedbans expired; @@ -222,13 +234,16 @@ class ModuleTimedBans : public Module const std::string mask = i->mask; Channel* cr = i->chan; - const std::string message = InspIRCd::Format("Timed ban %s set by %s on %s has expired.", + if (cmd.sendnotice) + { + 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() : '@'; + // 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); + cr->WriteRemoteNotice(message, pfxchar); + } Modes::ChangeList setban; setban.push_remove(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask); -- cgit v1.2.3