Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-01-20 15:17:52 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-02-09 22:11:44 (GMT) |
| commit | 6b03bde42313bbc45c091930f0c4e6952924308b (patch) | |
| tree | 2d4df7629005912231517d6683d3cf2d37e7a9c8 /Swift/Controllers/Chat/ChatControllerBase.cpp | |
| parent | 6a4e622d9c406ea45bcc8c9740f666ad4a7e589f (diff) | |
| download | swift-6b03bde42313bbc45c091930f0c4e6952924308b.zip swift-6b03bde42313bbc45c091930f0c4e6952924308b.tar.bz2 | |
Fix sender text that is used for matching highlight rules
Old behavior:
MUC group messages are matched against the nickname as sender.
MUC 1-to-1 messages and classic 1-to-1 messages are matched against the
display name as sender.
New behavior:
MUC group messages are matched against the nickname as sender.
MUC 1-to-1 messages are matched against the nickname as sender.
Classic 1-to-1 messages are matched against the bare JID as sender.
Test-Information:
Tested on Mac OS X 10.9.5 that a chat rule matching a nickname string
and a rule matching a full JID are highlighted correctly.
Change-Id: Icaee2c946e34fceb6b1d40561674030740555de1
Diffstat (limited to 'Swift/Controllers/Chat/ChatControllerBase.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatControllerBase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp index 31fecbb..042ed3a 100644 --- a/Swift/Controllers/Chat/ChatControllerBase.cpp +++ b/Swift/Controllers/Chat/ChatControllerBase.cpp @@ -275,7 +275,7 @@ void ChatControllerBase::handleIncomingMessage(boost::shared_ptr<MessageEvent> m // Highlight if (!isIncomingMessageFromMe(message)) { - highlight = highlighter_->findAction(body, senderDisplayNameFromMessage(from)); + highlight = highlighter_->findAction(body, senderHighlightNameFromMessage(from)); } boost::shared_ptr<Replace> replace = message->getPayload<Replace>(); |