summaryrefslogtreecommitdiff
path: root/include/message.h
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2018-08-14 23:22:14 +0100
committerPeter Powell <petpow@saberuk.com>2018-08-15 08:58:06 +0100
commitc5c5a867d29c98c73e4f9cc67841617c2598a320 (patch)
tree430cb3cbb9e4bb5547eb5492ad2c9d1214b0fb16 /include/message.h
parentbe0c4f6a3c0e65435f211d817270073dce047396 (diff)
Fix aliases that resolve to messages echoing with echo-message.
Fixes #1459.
Diffstat (limited to 'include/message.h')
-rw-r--r--include/message.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/include/message.h b/include/message.h
index 1799e6119..8c7c7592a 100644
--- a/include/message.h
+++ b/include/message.h
@@ -32,14 +32,17 @@ enum MessageType
class CoreExport MessageDetails
{
public:
+ /** Whether to echo the message at all. */
+ bool echo;
+
/* Whether to send the original message back to clients with echo-message support. */
- bool echooriginal;
+ bool echo_original;
/** The users who are exempted from receiving this message. */
CUList exemptions;
/* The original message as sent by the user. */
- const std::string originaltext;
+ const std::string original_text;
/** IRCv3 message tags sent to the server by the user. */
const ClientProtocol::TagMap tags_in;
@@ -54,8 +57,9 @@ class CoreExport MessageDetails
const MessageType type;
MessageDetails(MessageType mt, const std::string& msg, const ClientProtocol::TagMap& tags)
- : echooriginal(false)
- , originaltext(msg)
+ : echo(true)
+ , echo_original(false)
+ , original_text(msg)
, tags_in(tags)
, text(msg)
, type(mt)