diff options
| author |  Sadie Powell | 2023-07-21 15:55:58 +0100 |
|---|---|---|
| committer | Sadie Powell | 2023-07-21 15:57:32 +0100 |
| commit | a2d6e36abe7ac2bd4cf2b0a2e8226acfaa10ae9d (patch) | |
| tree | 234b51f8132e6d1f5a12dd00b770754ca8964b76 /src/modules | |
| parent | If we can't add an X-line on an DNSBLed user then kill them instead. (diff) | |
Remove the ability to treat notices specially in delaymsg.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_delaymsg.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp index 5aa734b1f..943010738 100644 --- a/src/modules/m_delaymsg.cpp +++ b/src/modules/m_delaymsg.cpp @@ -59,9 +59,8 @@ class ModuleDelayMsg final { private: DelayMsgMode djm; - bool allownotice; CheckExemption::EventProvider exemptionprov; - ModResult HandleMessage(User* user, const MessageTarget& target, bool notice); + ModResult HandleMessage(User* user, const MessageTarget& target); public: ModuleDelayMsg() @@ -75,7 +74,6 @@ public: void OnUserJoin(Membership* memb, bool sync, bool created, CUList&) override; ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override; ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override; - void ReadConfig(ConfigStatus& status) override; }; bool DelayMsgMode::OnSet(User* source, Channel* chan, std::string& parameter) @@ -105,20 +103,17 @@ void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CULis ModResult ModuleDelayMsg::OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) { - return HandleMessage(user, target, details.type == MessageType::NOTICE); + return HandleMessage(user, target); } ModResult ModuleDelayMsg::OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) { - return HandleMessage(user, target, false); + return HandleMessage(user, target); } -ModResult ModuleDelayMsg::HandleMessage(User* user, const MessageTarget& target, bool notice) +ModResult ModuleDelayMsg::HandleMessage(User* user, const MessageTarget& target) { - if (!IS_LOCAL(user)) - return MOD_RES_PASSTHRU; - - if ((target.type != MessageTarget::TYPE_CHANNEL) || ((!allownotice) && (notice))) + if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_CHANNEL) return MOD_RES_PASSTHRU; Channel* channel = target.Get<Channel>(); @@ -155,10 +150,4 @@ ModResult ModuleDelayMsg::HandleMessage(User* user, const MessageTarget& target, return MOD_RES_PASSTHRU; } -void ModuleDelayMsg::ReadConfig(ConfigStatus& status) -{ - const auto& tag = ServerInstance->Config->ConfValue("delaymsg"); - allownotice = tag->getBool("allownotice", true); -} - MODULE_INIT(ModuleDelayMsg) |