9 files changed, 67 insertions, 14 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp
index 24341e6..519deda 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.cpp
+++ b/Swift/Controllers/Chat/ChatControllerBase.cpp
@@ -205,7 +205,7 @@ std::string ChatControllerBase::addMessage(const std::string& message, const std
 	if (boost::starts_with(message, "/me ")) {
 		return chatWindow_->addAction(chatMessageParser_->parseMessageBody(String::getSplittedAtFirst(message, ' ').second), senderName, senderIsSelf, label, pathToString(avatarPath), time, highlight);
 	} else {
-		return chatWindow_->addMessage(chatMessageParser_->parseMessageBody(message,senderIsSelf), senderName, senderIsSelf, label, pathToString(avatarPath), time, highlight);
+		return chatWindow_->addMessage(chatMessageParser_->parseMessageBody(message,highlighter_->getNick(),senderIsSelf), senderName, senderIsSelf, label, pathToString(avatarPath), time, highlight);
 	}
 }
 
@@ -213,7 +213,7 @@ void ChatControllerBase::replaceMessage(const std::string& message, const std::s
 	if (boost::starts_with(message, "/me ")) {
 		chatWindow_->replaceWithAction(chatMessageParser_->parseMessageBody(String::getSplittedAtFirst(message, ' ').second), id, time, highlight);
 	} else {
-		chatWindow_->replaceMessage(chatMessageParser_->parseMessageBody(message,senderIsSelf), id, time, highlight);
+		chatWindow_->replaceMessage(chatMessageParser_->parseMessageBody(message,highlighter_->getNick(),senderIsSelf), id, time, highlight);
 	}
 }
 
diff --git a/Swift/Controllers/Chat/ChatMessageParser.cpp b/Swift/Controllers/Chat/ChatMessageParser.cpp
index 09d93ac..5a608db 100644
--- a/Swift/Controllers/Chat/ChatMessageParser.cpp
+++ b/Swift/Controllers/Chat/ChatMessageParser.cpp
@@ -26,7 +26,7 @@ namespace Swift {
 
 	typedef std::pair<std::string, std::string> StringPair;
 
-	ChatWindow::ChatMessage ChatMessageParser::parseMessageBody(const std::string& body, bool senderIsSelf) {
+	ChatWindow::ChatMessage ChatMessageParser::parseMessageBody(const std::string& body, const std::string& nick, bool senderIsSelf) {
 		ChatWindow::ChatMessage parsedMessage;
 		std::string remaining = body;
 		/* Parse one, URLs */
@@ -57,7 +57,7 @@ namespace Swift {
 
 		if (!senderIsSelf) { /* do not highlight our own messsages */
 			/* do word-based color highlighting */
-			parsedMessage = splitHighlight(parsedMessage);
+			parsedMessage = splitHighlight(parsedMessage, nick);
 		}
 
 		return parsedMessage;
@@ -138,7 +138,7 @@ namespace Swift {
 		return parsedMessage;
 	}
 
-	ChatWindow::ChatMessage ChatMessageParser::splitHighlight(const ChatWindow::ChatMessage& message)
+	ChatWindow::ChatMessage ChatMessageParser::splitHighlight(const ChatWindow::ChatMessage& message, const std::string& nick)
 	{
 		ChatWindow::ChatMessage parsedMessage = message;
 
@@ -149,7 +149,8 @@ namespace Swift {
 			} else if (rule.getMatchChat() && mucMode_) {
 				continue; /* this rule only applies to CHAT's, and this is a MUC */
 			}
-			foreach(const boost::regex &regex, rule.getKeywordRegex()) {
+			const std::vector<boost::regex> keywordRegex = rule.getKeywordRegex(nick);
+			foreach(const boost::regex& regex, keywordRegex) {
 				ChatWindow::ChatMessage newMessage;
 				foreach (boost::shared_ptr<ChatWindow::ChatMessagePart> part, parsedMessage.getParts()) {
 					boost::shared_ptr<ChatWindow::ChatTextMessagePart> textPart;
diff --git a/Swift/Controllers/Chat/ChatMessageParser.h b/Swift/Controllers/Chat/ChatMessageParser.h
index cff4ffa..2f5c171 100644
--- a/Swift/Controllers/Chat/ChatMessageParser.h
+++ b/Swift/Controllers/Chat/ChatMessageParser.h
@@ -15,10 +15,10 @@ namespace Swift {
 	class ChatMessageParser {
 		public:
 			ChatMessageParser(const std::map<std::string, std::string>& emoticons, HighlightRulesListPtr highlightRules, bool mucMode = false);
-			ChatWindow::ChatMessage parseMessageBody(const std::string& body, bool senderIsSelf = false);
+			ChatWindow::ChatMessage parseMessageBody(const std::string& body, const std::string& nick = "", bool senderIsSelf = false);
 		private:
 			ChatWindow::ChatMessage emoticonHighlight(const ChatWindow::ChatMessage& parsedMessage);
-			ChatWindow::ChatMessage splitHighlight(const ChatWindow::ChatMessage& parsedMessage);
+			ChatWindow::ChatMessage splitHighlight(const ChatWindow::ChatMessage& parsedMessage, const std::string& nick);
 			std::map<std::string, std::string> emoticons_;
 			HighlightRulesListPtr highlightRules_;
 			bool mucMode_;
diff --git a/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp
index 5dca63a..2a07654 100644
--- a/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp
+++ b/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp
@@ -85,6 +85,18 @@ public:
 		return list;
 	}
 
+	static HighlightRulesListPtr ruleListWithNickHighlight()
+	{
+		HighlightRule rule;
+		rule.setMatchChat(true);
+		rule.setNickIsKeyword(true);
+		rule.setMatchCase(true);
+		rule.setMatchWholeWords(true);
+		boost::shared_ptr<HighlightManager::HighlightRulesList> list = boost::make_shared<HighlightManager::HighlightRulesList>();
+		list->addRule(rule);
+		return list;
+	}
+
 	void testFullBody() {
 		const std::string no_special_message = "a message with no special content";
 		ChatMessageParser testling(emoticons_, boost::make_shared<HighlightManager::HighlightRulesList>());
@@ -174,6 +186,30 @@ public:
 		testling = ChatMessageParser(emoticons_, ruleListFromKeywords(ruleFromKeyword("one", false, true), ruleFromKeyword("three", false, true)));
 		result = testling.parseMessageBody("zeroonetwothree");
 		assertText(result, 0, "zeroonetwothree");
+
+		testling = ChatMessageParser(emoticons_, ruleListWithNickHighlight());
+		result = testling.parseMessageBody("Alice", "Alice");
+		assertHighlight(result, 0, "Alice");
+
+		testling = ChatMessageParser(emoticons_, ruleListWithNickHighlight());
+		result = testling.parseMessageBody("TextAliceText", "Alice");
+		assertText(result, 0, "TextAliceText");
+
+		testling = ChatMessageParser(emoticons_, ruleListWithNickHighlight());
+		result = testling.parseMessageBody("Text Alice Text", "Alice");
+		assertText(result, 0, "Text ");
+		assertHighlight(result, 1, "Alice");
+		assertText(result, 2, " Text");
+
+		testling = ChatMessageParser(emoticons_, ruleListWithNickHighlight());
+		result = testling.parseMessageBody("Alice Text", "Alice");
+		assertHighlight(result, 0, "Alice");
+		assertText(result, 1, " Text");
+
+		testling = ChatMessageParser(emoticons_, ruleListWithNickHighlight());
+		result = testling.parseMessageBody("Text Alice", "Alice");
+		assertText(result, 0, "Text ");
+		assertHighlight(result, 1, "Alice");
 	}
 
 	void testOneEmoticon() {
diff --git a/Swift/Controllers/HighlightAction.cpp b/Swift/Controllers/HighlightAction.cpp
index d4d199d..492d4d2 100644
--- a/Swift/Controllers/HighlightAction.cpp
+++ b/Swift/Controllers/HighlightAction.cpp
@@ -8,7 +8,7 @@
 
 namespace Swift {
 
-void HighlightAction::setHighlightText(bool highlightText)
+void HighlightAction::setHighlightAllText(bool highlightText)
 {
 	highlightText_ = highlightText;
 	if (!highlightText_) {
diff --git a/Swift/Controllers/HighlightAction.h b/Swift/Controllers/HighlightAction.h
index de1f201..90768a7 100644
--- a/Swift/Controllers/HighlightAction.h
+++ b/Swift/Controllers/HighlightAction.h
@@ -25,17 +25,20 @@ namespace Swift {
 		public:
 			HighlightAction() : highlightText_(false), playSound_(false) {}
 
-			bool highlightText() const { return highlightText_; }
-			void setHighlightText(bool highlightText);
+			/**
+			* Gets the flag that indicates the entire message should be highlighted.
+			*/
+			bool highlightAllText() const { return highlightText_; }
+			void setHighlightAllText(bool highlightText);
 
 			/**
-			* Gets the foreground highlight color. If the string is empty, assume a default color.
+			* Gets the foreground highlight color.
 			*/
 			const std::string& getTextColor() const { return textColor_; }
 			void setTextColor(const std::string& textColor) { textColor_ = textColor; }
 
 			/**
-			* Gets the background highlight color. If the string is empty, assume a default color.
+			* Gets the background highlight color.
 			*/
 			const std::string& getTextBackground() const { return textBackground_; }
 			void setTextBackground(const std::string& textBackground) { textBackground_ = textBackground; }
diff --git a/Swift/Controllers/HighlightRule.cpp b/Swift/Controllers/HighlightRule.cpp
index f1a5235..3251067 100644
--- a/Swift/Controllers/HighlightRule.cpp
+++ b/Swift/Controllers/HighlightRule.cpp
@@ -102,6 +102,18 @@ void HighlightRule::setKeywords(const std::vector<std::string>& keywords)
 	updateRegex();
 }
 
+std::vector<boost::regex> HighlightRule::getKeywordRegex(const std::string& nick) const {
+	if (nickIsKeyword_) {
+		std::vector<boost::regex> regex;
+		if (!nick.empty()) {
+			regex.push_back(regexFromString(nick));
+		}
+		return regex;
+	} else {
+		return keywordRegex_;
+	}
+}
+
 void HighlightRule::setNickIsKeyword(bool nickIsKeyword)
 {
 	nickIsKeyword_ = nickIsKeyword;
diff --git a/Swift/Controllers/HighlightRule.h b/Swift/Controllers/HighlightRule.h
index ae1a3d3..c0226bc 100644
--- a/Swift/Controllers/HighlightRule.h
+++ b/Swift/Controllers/HighlightRule.h
@@ -40,7 +40,7 @@ namespace Swift {
 
 			const std::vector<std::string>& getKeywords() const { return keywords_; }
 			void setKeywords(const std::vector<std::string>&);
-			const std::vector<boost::regex>& getKeywordRegex() const { return keywordRegex_; }
+			std::vector<boost::regex> getKeywordRegex(const std::string& nick) const;
 
 			bool getNickIsKeyword() const { return nickIsKeyword_; }
 			void setNickIsKeyword(bool);
diff --git a/Swift/Controllers/Highlighter.h b/Swift/Controllers/Highlighter.h
index d026f29..d5d846b 100644
--- a/Swift/Controllers/Highlighter.h
+++ b/Swift/Controllers/Highlighter.h
@@ -22,6 +22,7 @@ namespace Swift {
 			void setMode(Mode mode);
 
 			void setNick(const std::string& nick) { nick_ = nick; }
+			std::string getNick() const { return nick_; }
 
 			HighlightAction findAction(const std::string& body, const std::string& sender) const;