1 files changed, 12 insertions, 0 deletions
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
@@ -70,70 +70,82 @@ bool HighlightRule::isMatch(const std::string& body, const std::string& sender,
 		bool matchesSender = senders_.empty();
 
 		if (!matchesKeyword && nickIsKeyword_ && !nick.empty()) {
 			if (boost::regex_search(body, regexFromString(nick))) {
 				matchesKeyword = true;
 			}
 		}
 
 		foreach (const boost::regex & rx, senderRegex_) {
 			if (boost::regex_search(sender, rx)) {
 				matchesSender = true;
 				break;
 			}
 		}
 
 		if (matchesKeyword && matchesSender) {
 			return true;
 		}
 	}
 
 	return false;
 }
 
 void HighlightRule::setSenders(const std::vector<std::string>& senders)
 {
 	senders_ = senders;
 	updateRegex();
 }
 
 void HighlightRule::setKeywords(const std::vector<std::string>& keywords)
 {
 	keywords_ = 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;
 	updateRegex();
 }
 
 void HighlightRule::setMatchCase(bool matchCase)
 {
 	matchCase_ = matchCase;
 	updateRegex();
 }
 
 void HighlightRule::setMatchWholeWords(bool matchWholeWords)
 {
 	matchWholeWords_ = matchWholeWords;
 	updateRegex();
 }
 
 void HighlightRule::setMatchChat(bool matchChat)
 {
 	matchChat_ = matchChat;
 	updateRegex();
 }
 
 void HighlightRule::setMatchMUC(bool matchMUC)
 {
 	matchMUC_ = matchMUC;
 	updateRegex();
 }
 
 bool HighlightRule::isEmpty() const
 {
 	return senders_.empty() && keywords_.empty() && !nickIsKeyword_ && !matchChat_ && !matchMUC_ && action_.isEmpty();
 }