diff options
author | Peter Powell <petpow@saberuk.com> | 2018-08-14 23:22:14 +0100 |
---|---|---|
committer | Peter Powell <petpow@saberuk.com> | 2018-08-15 08:58:06 +0100 |
commit | c5c5a867d29c98c73e4f9cc67841617c2598a320 (patch) | |
tree | 430cb3cbb9e4bb5547eb5492ad2c9d1214b0fb16 /src/modules/m_ircv3_echomessage.cpp | |
parent | be0c4f6a3c0e65435f211d817270073dce047396 (diff) |
Fix aliases that resolve to messages echoing with echo-message.
Fixes #1459.
Diffstat (limited to 'src/modules/m_ircv3_echomessage.cpp')
-rw-r--r-- | src/modules/m_ircv3_echomessage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/m_ircv3_echomessage.cpp b/src/modules/m_ircv3_echomessage.cpp index 68505a195..f6eae5a00 100644 --- 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); } |