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_repeat.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_repeat.cpp')
| -rw-r--r-- | src/modules/m_repeat.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp index 75105ca0d..a57e96740 100644 --- a/src/modules/m_repeat.cpp +++ b/src/modules/m_repeat.cpp @@ -355,12 +355,12 @@ class RepeatModule : public Module rm.ReadConfig(); } - 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)) return MOD_RES_PASSTHRU; - Channel* chan = reinterpret_cast<Channel*>(dest); + Channel* chan = target.Get<Channel>(); ChannelSettings* settings = rm.ext.get(chan); if (!settings) return MOD_RES_PASSTHRU; @@ -373,7 +373,7 @@ class RepeatModule : public Module if (res == MOD_RES_ALLOW) return MOD_RES_PASSTHRU; - if (rm.MatchLine(memb, settings, text)) + if (rm.MatchLine(memb, settings, details.text)) { if (settings->Action == ChannelSettings::ACT_BLOCK) { |