Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-10-22 12:07:23 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-10-22 15:27:06 (GMT) |
| commit | 991f0774c006a2c9a0998090dae4729059cc72b6 (patch) | |
| tree | 1c396b2c3e1700cc80c2ddabad4c55492ebb74e3 /Swift/Controllers/Chat/MUCController.cpp | |
| parent | 077a1cf938d007874c2915b5fd703d4776bb25cd (diff) | |
| download | swift-991f0774c006a2c9a0998090dae4729059cc72b6.zip swift-991f0774c006a2c9a0998090dae4729059cc72b6.tar.bz2 | |
Minor fixes to MUCs.
Resolves: #626
Resolves: #632
Release-Notes: Notices will now be generated if someone says your nick in the MUC in any variant of capitalisation, and will not be generated if it was you that said it.
Diffstat (limited to 'Swift/Controllers/Chat/MUCController.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/MUCController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index 9cf235e..8b9f3fa 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp @@ -228,13 +228,13 @@ JID MUCController::nickToJID(const String& nick) { } bool MUCController::messageTargetsMe(boost::shared_ptr<Message> message) { - return message->getBody().contains(nick_); + return message->getBody().getLowerCase().contains(nick_.getLowerCase()); } void MUCController::preHandleIncomingMessage(boost::shared_ptr<MessageEvent> messageEvent) { clearPresenceQueue(); boost::shared_ptr<Message> message = messageEvent->getStanza(); - if (joined_ && messageTargetsMe(message) && !message->getPayload<Delay>()) { + if (joined_ && messageEvent->getStanza()->getFrom().getResource() != nick_ && messageTargetsMe(message) && !message->getPayload<Delay>()) { eventController_->handleIncomingEvent(messageEvent); if (messageEvent->isReadable()) { chatWindow_->flash(); |