1 files changed, 98 insertions, 39 deletions
diff --git a/Swift/Controllers/Chat/ChatMessageParser.cpp b/Swift/Controllers/Chat/ChatMessageParser.cpp
index 8449901..de4abb1 100644
--- a/Swift/Controllers/Chat/ChatMessageParser.cpp
+++ b/Swift/Controllers/Chat/ChatMessageParser.cpp
@@ -27,7 +27,7 @@ namespace Swift {
 
 	typedef std::pair<std::string, std::string> StringPair;
 
-	ChatWindow::ChatMessage ChatMessageParser::parseMessageBody(const std::string& body) {
+	ChatWindow::ChatMessage ChatMessageParser::parseMessageBody(const std::string& body, bool senderIsSelf) {
 		ChatWindow::ChatMessage parsedMessage;
 		std::string remaining = body;
 		/* Parse one, URLs */
@@ -52,9 +52,20 @@ namespace Swift {
 				}
 			}
 		}
-		
 
+		/* do emoticon substitution */
+		parsedMessage = emoticonHighlight(parsedMessage);
 
+		if (!senderIsSelf) { /* do not highlight our own messsages */
+			/* do word-based color highlighting */
+			parsedMessage = splitHighlight(parsedMessage);
+		}
+
+		return parsedMessage;
+	}
+
+	ChatWindow::ChatMessage ChatMessageParser::emoticonHighlight(const ChatWindow::ChatMessage& message)
+	{
 		std::string regexString;
 		/* Parse two, emoticons */
 		foreach (StringPair emoticon, emoticons_) {
@@ -62,52 +73,100 @@ namespace Swift {
 			regexString += regexString.empty() ? "(" : "|";
 			regexString += Regex::escape(emoticon.first);
 		}
-		if (!regexString.empty()) {
-			regexString += ")";
-			boost::regex emoticonRegex(regexString);
-
-			ChatWindow::ChatMessage newMessage;
-			foreach (boost::shared_ptr<ChatWindow::ChatMessagePart> part, parsedMessage.getParts()) {
-				boost::shared_ptr<ChatWindow::ChatTextMessagePart> textPart;
-				if ((textPart = boost::dynamic_pointer_cast<ChatWindow::ChatTextMessagePart>(part))) {
-					try {
-						boost::match_results<std::string::const_iterator> match;
-						const std::string& text = textPart->text;
-						std::string::const_iterator start = text.begin();
-						while (regex_search(start, text.end(), match, emoticonRegex)) {
-							std::string::const_iterator matchStart = match[0].first;
-							std::string::const_iterator matchEnd = match[0].second;
-							if (start != matchStart) {
-								/* If we're skipping over plain text since the previous emoticon, record it as plain text */
-								newMessage.append(boost::make_shared<ChatWindow::ChatTextMessagePart>(std::string(start, matchStart)));
-							}
-							boost::shared_ptr<ChatWindow::ChatEmoticonMessagePart> emoticonPart = boost::make_shared<ChatWindow::ChatEmoticonMessagePart>();
-							std::map<std::string, std::string>::const_iterator emoticonIterator = emoticons_.find(match.str());
-							assert (emoticonIterator != emoticons_.end());
-							const StringPair& emoticon = *emoticonIterator;
-							emoticonPart->imagePath = emoticon.second;
-							emoticonPart->alternativeText = emoticon.first;
-							newMessage.append(emoticonPart);
-							start = matchEnd;
-						}
-						if (start != text.end()) {
-							/* If there's plain text after the last emoticon, record it */
-							newMessage.append(boost::make_shared<ChatWindow::ChatTextMessagePart>(std::string(start, text.end())));
-						}
 
+		if (regexString.empty()) {
+			return message;
+		}
+
+		regexString += ")";
+		boost::regex emoticonRegex(regexString);
+
+		ChatWindow::ChatMessage newMessage;
+		foreach (boost::shared_ptr<ChatWindow::ChatMessagePart> part, message.getParts()) {
+			boost::shared_ptr<ChatWindow::ChatTextMessagePart> textPart;
+			if ((textPart = boost::dynamic_pointer_cast<ChatWindow::ChatTextMessagePart>(part))) {
+				try {
+					boost::match_results<std::string::const_iterator> match;
+					const std::string& text = textPart->text;
+					std::string::const_iterator start = text.begin();
+					while (regex_search(start, text.end(), match, emoticonRegex)) {
+						std::string::const_iterator matchStart = match[0].first;
+						std::string::const_iterator matchEnd = match[0].second;
+						if (start != matchStart) {
+							/* If we're skipping over plain text since the previous emoticon, record it as plain text */
+							newMessage.append(boost::make_shared<ChatWindow::ChatTextMessagePart>(std::string(start, matchStart)));
+						}
+						boost::shared_ptr<ChatWindow::ChatEmoticonMessagePart> emoticonPart = boost::make_shared<ChatWindow::ChatEmoticonMessagePart>();
+						std::map<std::string, std::string>::const_iterator emoticonIterator = emoticons_.find(match.str());
+						assert (emoticonIterator != emoticons_.end());
+						const StringPair& emoticon = *emoticonIterator;
+						emoticonPart->imagePath = emoticon.second;
+						emoticonPart->alternativeText = emoticon.first;
+						newMessage.append(emoticonPart);
+						start = matchEnd;
 					}
-					catch (std::runtime_error) {
-						/* Basically too expensive to compute the regex results and it gave up, so pass through as text */
-						newMessage.append(part);
+					if (start != text.end()) {
+						/* If there's plain text after the last emoticon, record it */
+						newMessage.append(boost::make_shared<ChatWindow::ChatTextMessagePart>(std::string(start, text.end())));
 					}
 				}
-				else {
+				catch (std::runtime_error) {
+					/* Basically too expensive to compute the regex results and it gave up, so pass through as text */
 					newMessage.append(part);
 				}
+			} else {
+				newMessage.append(part);
 			}
-			parsedMessage = newMessage;
+		}
+
+		return newMessage;
+	}
 
+	ChatWindow::ChatMessage ChatMessageParser::splitHighlight(const ChatWindow::ChatMessage& message)
+	{
+		ChatWindow::ChatMessage parsedMessage = message;
+
+		foreach(const HighlightRule &rule, highlightRules_) {
+			foreach(const boost::regex &regex, rule.getKeywordRegex()) {
+				ChatWindow::ChatMessage newMessage;
+				foreach (boost::shared_ptr<ChatWindow::ChatMessagePart> part, parsedMessage.getParts()) {
+					boost::shared_ptr<ChatWindow::ChatTextMessagePart> textPart;
+					if ((textPart = boost::dynamic_pointer_cast<ChatWindow::ChatTextMessagePart>(part))) {
+						try {
+							boost::match_results<std::string::const_iterator> match;
+							const std::string& text = textPart->text;
+							std::string::const_iterator start = text.begin();
+							while (regex_search(start, text.end(), match, regex)) {
+								std::string::const_iterator matchStart = match[0].first;
+								std::string::const_iterator matchEnd = match[0].second;
+								if (start != matchStart) {
+									/* If we're skipping over plain text since the previous emoticon, record it as plain text */
+									newMessage.append(boost::make_shared<ChatWindow::ChatTextMessagePart>(std::string(start, matchStart)));
+								}
+								boost::shared_ptr<ChatWindow::ChatHighlightingMessagePart> highlightPart = boost::make_shared<ChatWindow::ChatHighlightingMessagePart>();
+								highlightPart->text = match.str();
+								highlightPart->foregroundColor = rule.getAction().getTextColor();
+								highlightPart->backgroundColor = rule.getAction().getTextBackground();
+								newMessage.append(highlightPart);
+								start = matchEnd;
+							}
+							if (start != text.end()) {
+								/* If there's plain text after the last emoticon, record it */
+								newMessage.append(boost::make_shared<ChatWindow::ChatTextMessagePart>(std::string(start, text.end())));
+							}
+						}
+						catch (std::runtime_error) {
+							/* Basically too expensive to compute the regex results and it gave up, so pass through as text */
+							newMessage.append(part);
+						}
+					} else {
+						newMessage.append(part);
+					}
+				}
+				parsedMessage = newMessage;
+			}
 		}
+
 		return parsedMessage;
 	}
 }