2 files changed, 75 insertions, 9 deletions
diff --git a/Swift/Controllers/Chat/ChatMessageParser.cpp b/Swift/Controllers/Chat/ChatMessageParser.cpp
index ce184ea..698b766 100644
--- a/Swift/Controllers/Chat/ChatMessageParser.cpp
+++ b/Swift/Controllers/Chat/ChatMessageParser.cpp
@@ -1,112 +1,127 @@
 /*
- * Copyright (c) 2013 Kevin Smith
+ * Copyright (c) 2013-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swift/Controllers/Chat/ChatMessageParser.h>
 
 #include <vector>
 #include <utility>
 
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include <Swiften/Base/Regex.h>
 #include <Swiften/Base/foreach.h>
 
 #include <SwifTools/Linkify.h>
 
 
 namespace Swift {
 
 	ChatMessageParser::ChatMessageParser(const std::map<std::string, std::string>& emoticons) : emoticons_(emoticons) {
 
 	}
 
 	typedef std::pair<std::string, std::string> StringPair;
 
 	ChatWindow::ChatMessage ChatMessageParser::parseMessageBody(const std::string& body) {
 		ChatWindow::ChatMessage parsedMessage;
 		std::string remaining = body;
 		/* Parse one, URLs */
 		while (!remaining.empty()) {
 			bool found = false;
 			std::pair<std::vector<std::string>, size_t> links = Linkify::splitLink(remaining);
 			remaining = "";
 			for (size_t i = 0; i < links.first.size(); i++) {
 				const std::string& part = links.first[i];
 				if (found) {
 					// Must be on the last part, then
 					remaining = part;
 				}
 				else {
 					if (i == links.second) {
 						found = true;
 						parsedMessage.append(boost::make_shared<ChatWindow::ChatURIMessagePart>(part));
 					}
 					else {
 						parsedMessage.append(boost::make_shared<ChatWindow::ChatTextMessagePart>(part));
 					}
 				}
 			}
 		}
 		
 
 
 		std::string regexString;
 		/* Parse two, emoticons */
 		foreach (StringPair emoticon, emoticons_) {
-			/* Construct a regexp that finds an instance of any of the emoticons inside a group */
-			regexString += regexString.empty() ? "(" : "|";
-			regexString += Regex::escape(emoticon.first);
+			/* Construct a regexp that finds an instance of any of the emoticons inside a group
+			 * at the start or end of the line, or beside whitespace.
+			 */
+			regexString += regexString.empty() ? "" : "|";
+			std::string escaped = "(" + Regex::escape(emoticon.first) + ")";
+			regexString += "^" + escaped + "|";
+			regexString += escaped + "$|";
+			regexString += "\\s" + escaped + "|";
+			regexString += escaped + "\\s";
+
 		}
 		if (!regexString.empty()) {
-			regexString += ")";
+			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;
+							int matchIndex = 0;
+							for (matchIndex = 1; matchIndex < static_cast<int>(match.size()); matchIndex++) {
+								if (match[matchIndex].length() > 0) {
+									//This is the matching subgroup
+									break;
+								}
+							}
+							std::string::const_iterator matchStart = match[matchIndex].first;
+							std::string::const_iterator matchEnd = match[matchIndex].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());
+							std::string matchString = match[matchIndex].str();
+							std::map<std::string, std::string>::const_iterator emoticonIterator = emoticons_.find(matchString);
 							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())));
 						}
 
 					}
 					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;
 	}
 }
diff --git a/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp
index 44d7834..0a14303 100644
--- a/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp
+++ b/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp
@@ -1,74 +1,125 @@
 /*
- * Copyright (c) 2013 Kevin Smith
+ * Copyright (c) 2013-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <hippomocks.h>
 
 #include <Swift/Controllers/Chat/ChatMessageParser.h>
 
 using namespace Swift;
 
 class ChatMessageParserTest : public CppUnit::TestFixture {
 	CPPUNIT_TEST_SUITE(ChatMessageParserTest);
 	CPPUNIT_TEST(testFullBody);
+	CPPUNIT_TEST(testOneEmoticon);
+	CPPUNIT_TEST(testBareEmoticon);
+	CPPUNIT_TEST(testHiddenEmoticon);
+	CPPUNIT_TEST(testEndlineEmoticon);
+	CPPUNIT_TEST(testBoundedEmoticons);
 	CPPUNIT_TEST_SUITE_END();
 	
 public:
 	void setUp() {
 		smile1_ = ":)";
 		smile1Path_ = "/blah/smile1.png";
 		smile2_ = ":(";
 		smile2Path_ = "/blah/smile2.jpg";
 		emoticons_[smile1_] = smile1Path_;
 		emoticons_[smile2_] = smile2Path_;
 	}
 	
 	void tearDown() {
 		emoticons_.clear();
 	}
 
 	void assertText(const ChatWindow::ChatMessage& result, size_t index, const std::string& text) {
 		boost::shared_ptr<ChatWindow::ChatTextMessagePart> part = boost::dynamic_pointer_cast<ChatWindow::ChatTextMessagePart>(result.getParts()[index]);
 		CPPUNIT_ASSERT_EQUAL(text, part->text);
 	}
 
 	void assertEmoticon(const ChatWindow::ChatMessage& result, size_t index, const std::string& text, const std::string& path) {
 		boost::shared_ptr<ChatWindow::ChatEmoticonMessagePart> part = boost::dynamic_pointer_cast<ChatWindow::ChatEmoticonMessagePart>(result.getParts()[index]);
+		CPPUNIT_ASSERT(!!part);
 		CPPUNIT_ASSERT_EQUAL(text, part->alternativeText);
 		CPPUNIT_ASSERT_EQUAL(path, part->imagePath);
 	}
 
 	void assertURL(const ChatWindow::ChatMessage& result, size_t index, const std::string& text) {
 		boost::shared_ptr<ChatWindow::ChatURIMessagePart> part = boost::dynamic_pointer_cast<ChatWindow::ChatURIMessagePart>(result.getParts()[index]);
 		CPPUNIT_ASSERT_EQUAL(text, part->target);
 	}
 
 	void testFullBody() {
 		ChatMessageParser testling(emoticons_);
 		ChatWindow::ChatMessage result = testling.parseMessageBody(":) shiny :( :) http://wonderland.lit/blah http://denmark.lit boom boom");
 		assertEmoticon(result, 0, smile1_, smile1Path_);
 		assertText(result, 1, " shiny ");
 		assertEmoticon(result, 2, smile2_, smile2Path_);
 		assertText(result, 3, " ");
 		assertEmoticon(result, 4, smile1_, smile1Path_);
 		assertText(result, 5, " ");
 		assertURL(result, 6, "http://wonderland.lit/blah");
 		assertText(result, 7, " ");
 		assertURL(result, 8, "http://denmark.lit");
 		assertText(result, 9, " boom boom");
 	}
 
+	void testOneEmoticon() {
+		ChatMessageParser testling(emoticons_);
+		ChatWindow::ChatMessage result = testling.parseMessageBody(" :) ");
+		assertText(result, 0, " ");
+		assertEmoticon(result, 1, smile1_, smile1Path_);
+		assertText(result, 2, " ");
+	}
+
+
+	void testBareEmoticon() {
+		ChatMessageParser testling(emoticons_);
+		ChatWindow::ChatMessage result = testling.parseMessageBody(":)");
+		assertEmoticon(result, 0, smile1_, smile1Path_);
+	}
+
+	void testHiddenEmoticon() {
+		ChatMessageParser testling(emoticons_);
+		ChatWindow::ChatMessage result = testling.parseMessageBody("b:)a");
+		assertText(result, 0, "b:)a");
+	}
+
+	void testEndlineEmoticon() {
+		ChatMessageParser testling(emoticons_);
+		ChatWindow::ChatMessage result = testling.parseMessageBody("Lazy:)");
+		assertText(result, 0, "Lazy");
+		assertEmoticon(result, 1, smile1_, smile1Path_);
+	}
+
+	void testBoundedEmoticons() {
+		ChatMessageParser testling(emoticons_);
+		ChatWindow::ChatMessage result = testling.parseMessageBody(":)Lazy:(");
+		assertEmoticon(result, 0, smile1_, smile1Path_);
+		assertText(result, 1, "Lazy");
+		assertEmoticon(result, 2, smile2_, smile2Path_);
+	}
+
+	void testEmoticonParenthesis() {
+		ChatMessageParser testling(emoticons_);
+		ChatWindow::ChatMessage result = testling.parseMessageBody("(Like this :))");
+		assertText(result, 0, "(Like this ");
+		assertEmoticon(result, 1, smile1_, smile1Path_);
+		assertText(result, 2, ")");
+	}
+
+
 private:
 	std::map<std::string, std::string> emoticons_;
 	std::string smile1_;
 	std::string smile1Path_;
 	std::string smile2_;
 	std::string smile2Path_;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ChatMessageParserTest);