Add a command to the cgiirc module for encoding/decoding hex idents.

[user/henk/code/inspircd.git] / src / modules / m_timedbans.cpp

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index ef62294fde7544c15729c406e937355c56e2aa40..061a251668301c1e7585679183261d56ae8301e2 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -1,6 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2020 iwalkalone <iwalkalone69@gmail.com>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
  *   Copyright (C) 2016, 2019 Matt Schatz <genius3000@g3k.solutions>
@@ -71,6 +72,8 @@ class CommandTban : public Command
        }
 
  public:
+       bool sendnotice;
+
        CommandTban(Module* Creator)
                : Command(Creator,"TBAN", 3)
                , banmode(Creator, "ban")
@@ -131,13 +134,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 +210,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 +235,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);