From 2fcb5ff4389a9a82d253acdff02a388ddcf14653 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Mon, 11 Dec 2017 19:42:52 +0000 Subject: Rework message handling. - Move all message-related types to their own header to make moving them to a cross-module events easier. - Rename OnUserMessage to OnUserPostMessage. - Rename OnText to OnUserMessage. - Replace the dest, target_type, and status parameters with the MessageTarget class. - Replace the text, exempt_list, and msgtype parameters with the MessageDetails struct. - Add echooriginal and originaltext to the MessageDetails struct to allow spam filtering to not be broken by cap echo-message. --- src/modules/m_nonotice.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/modules/m_nonotice.cpp') diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp index d7ea32d2f..77b0c9aa3 100644 --- a/src/modules/m_nonotice.cpp +++ b/src/modules/m_nonotice.cpp @@ -39,12 +39,12 @@ class ModuleNoNotice : public Module tokens["EXTBAN"].push_back('T'); } - ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { ModResult res; - if ((msgtype == MSG_NOTICE) && (target_type == TYPE_CHANNEL) && (IS_LOCAL(user))) + if ((details.type == MSG_NOTICE) && (target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user))) { - Channel* c = (Channel*)dest; + Channel* c = target.Get(); if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet(nt))) { res = CheckExemption::Call(exemptionprov, user, c, "nonotice"); -- cgit v1.3.1-10-gc9f91