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_dccallow.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_dccallow.cpp')
| -rw-r--r-- | src/modules/m_dccallow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index 18ec87179..65eeeba11 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -299,27 +299,27 @@ class ModuleDCCAllow : public Module RemoveNick(user); } - 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 (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; - if (target_type == TYPE_USER) + if (target.type == MessageTarget::TYPE_USER) { - User* u = (User*)dest; + User* u = target.Get<User>(); /* Always allow a user to dcc themselves (although... why?) */ if (user == u) return MOD_RES_PASSTHRU; - if ((text.length()) && (text[0] == '\1')) + if ((details.text.length()) && (details.text[0] == '\1')) { Expire(); // :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :DCC SEND m_dnsbl.cpp 3232235786 52650 9676 // :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :VERSION - if (strncmp(text.c_str(), "\1DCC ", 5) == 0) + if (strncmp(details.text.c_str(), "\1DCC ", 5) == 0) { dl = ext.get(u); if (dl && dl->size()) @@ -329,7 +329,7 @@ class ModuleDCCAllow : public Module return MOD_RES_PASSTHRU; } - std::string buf = text.substr(5); + std::string buf = details.text.substr(5); size_t s = buf.find(' '); if (s == std::string::npos) return MOD_RES_PASSTHRU; |