Don't update the idle timer when a user replies to a CTCP.

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

diff --git a/src/modules/m_ircv3_echomessage.cpp b/src/modules/m_ircv3_echomessage.cpp
index 68505a1957363121a7d1f3b2ea1323d7ee498074..f6eae5a00741c92038d8ca61c3811ad8831b026a 100644 (file)
--- a/src/modules/m_ircv3_echomessage.cpp
+++ b/src/modules/m_ircv3_echomessage.cpp
@@ -33,13 +33,13 @@ class ModuleIRCv3EchoMessage : public Module
 
        void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
        {
-               if (!cap.get(user))
+               if (!cap.get(user) || !details.echo)
                        return;
 
                // Caps are only set on local users
                LocalUser* const localuser = static_cast<LocalUser*>(user);
 
-               const std::string& text = details.echooriginal ? details.originaltext : details.text;
+               const std::string& text = details.echo_original ? details.original_text : details.text;
                if (target.type == MessageTarget::TYPE_USER)
                {
                        User* destuser = target.Get<User>();
@@ -66,7 +66,7 @@ class ModuleIRCv3EchoMessage : public Module
        void OnUserMessageBlocked(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
        {
                // Prevent spammers from knowing that their spam was blocked.
-               if (details.echooriginal)
+               if (details.echo_original)
                        OnUserPostMessage(user, target, details);
        }