Allow the maximum length of a chanfilter message to be configured.

[user/henk/code/inspircd.git] / src / modules / m_callerid.cpp

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 137ab6b93b9c69deb2c1793ae8aafcd69a6d7cd6..349c48c297cf0aa9987818678abb34f0dd421978 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -371,15 +371,15 @@ public:
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               tokens["CALLERID"] = "g";
+               tokens["CALLERID"] = ConvToStr(myumode.GetModeChar());
        }
 
-       ModResult OnUserPreMessage(User* user, void* voiddest, 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) || target_type != TYPE_USER)
+               if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_USER)
                        return MOD_RES_PASSTHRU;
 
-               User* dest = static_cast<User*>(voiddest);
+               User* dest = target.Get<User>();
                if (!dest->IsModeSet(myumode) || (user == dest))
                        return MOD_RES_PASSTHRU;