diff options
| author |  Peter Powell | 2017-12-11 19:42:52 +0000 |
|---|---|---|
| committer | Peter Powell | 2018-01-06 14:18:21 +0000 |
| commit | 2fcb5ff4389a9a82d253acdff02a388ddcf14653 (patch) | |
| tree | 96feee81599adb7ef02bc35293daccba7071a6de /src/modules/m_noctcp.cpp | |
| parent | Improve the method that blockcaps uses to block messages. (diff) | |
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.
Diffstat (limited to 'src/modules/m_noctcp.cpp')
| -rw-r--r-- | src/modules/m_noctcp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp index e9733cf54..26077759a 100644 --- a/src/modules/m_noctcp.cpp +++ b/src/modules/m_noctcp.cpp @@ -39,12 +39,12 @@ class ModuleNoCTCP : public Module return Version("Provides channel mode +C to block CTCPs", VF_VENDOR); } - 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 { - if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user))) + if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user))) { - Channel* c = (Channel*)dest; - if ((text.empty()) || (text[0] != '\001') || (!strncmp(text.c_str(),"\1ACTION ", 8)) || (text == "\1ACTION\1") || (text == "\1ACTION")) + Channel* c = target.Get<Channel>(); + if ((details.text.empty()) || (details.text[0] != '\001') || (!strncmp(details.text.c_str(),"\1ACTION ", 8)) || (details.text == "\1ACTION\1") || (details.text == "\1ACTION")) return MOD_RES_PASSTHRU; ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp"); |