diff options
| author | 2017-12-11 19:42:52 +0000 | |
|---|---|---|
| committer | 2018-01-06 14:18:21 +0000 | |
| commit | 2fcb5ff4389a9a82d253acdff02a388ddcf14653 (patch) | |
| tree | 96feee81599adb7ef02bc35293daccba7071a6de /src/modules/m_silence.cpp | |
| parent | Improve the method that blockcaps uses to block messages. (diff) | |
| download | inspircd++-2fcb5ff4389a9a82d253acdff02a388ddcf14653.tar.gz inspircd++-2fcb5ff4389a9a82d253acdff02a388ddcf14653.tar.bz2 inspircd++-2fcb5ff4389a9a82d253acdff02a388ddcf14653.zip | |
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_silence.cpp')
| -rw-r--r-- | src/modules/m_silence.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index edcc77468..0aa957e1d 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -332,16 +332,16 @@ class ModuleSilence : public Module } } - 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_USER && IS_LOCAL(((User*)dest))) + if (target.type == MessageTarget::TYPE_USER && IS_LOCAL(target.Get<User>())) { - return MatchPattern((User*)dest, user, ((msgtype == MSG_PRIVMSG) ? SILENCE_PRIVATE : SILENCE_NOTICE)); + return MatchPattern(target.Get<User>(), user, ((details.type == MSG_PRIVMSG) ? SILENCE_PRIVATE : SILENCE_NOTICE)); } - else if (target_type == TYPE_CHANNEL) + else if (target.type == MessageTarget::TYPE_CHANNEL) { - Channel* chan = (Channel*)dest; - BuildExemptList(msgtype, chan, user, exempt_list); + Channel* chan = target.Get<Channel>(); + BuildExemptList(details.type, chan, user, details.exemptions); } return MOD_RES_PASSTHRU; } |
