diff options
| author |  Attila Molnar | 2014-01-08 12:52:07 +0100 |
|---|---|---|
| committer | Attila Molnar | 2014-01-08 12:52:07 +0100 |
| commit | 833ae95adc3d8e0b7ba0e82af4cbd173bb98431e (patch) | |
| tree | 572ed0df4e949a343ad51731eba42936151544bb /src/modules/m_callerid.cpp | |
| parent | Read uline state in spanningtree; remove ConfigReader::ulines (diff) | |
Remove PreText()-like functions
Do processing in OnUserPreMessage()
Diffstat (limited to 'src/modules/m_callerid.cpp')
| -rw-r--r-- | src/modules/m_callerid.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 1a2fd3a84..3dc932958 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -383,8 +383,12 @@ public: tokens["CALLERID"] = "g"; } - ModResult PreText(User* user, User* dest, std::string& text) + ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE { + if (!IS_LOCAL(user) || target_type != TYPE_USER) + return MOD_RES_PASSTHRU; + + User* dest = static_cast<User*>(voiddest); if (!dest->IsModeSet(myumode) || (user == dest)) return MOD_RES_PASSTHRU; @@ -411,14 +415,6 @@ public: return MOD_RES_PASSTHRU; } - ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE - { - if (IS_LOCAL(user) && target_type == TYPE_USER) - return PreText(user, (User*)dest, text); - - return MOD_RES_PASSTHRU; - } - void OnUserPostNick(User* user, const std::string& oldnick) CXX11_OVERRIDE { if (!tracknick) |