From: Kyle Fuller <redacted>
Date: Sun, 16 Jun 2013 10:42:01 +0000 (+0100)
Subject: Don't match on {nick}
X-Git-Tag: 1.0.0~27
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=1b9b71abfd05c9043f8b370187dc65c2ca609c9c;p=znc-palaver.git

Don't match on {nick}
---

diff --git a/palaver.cpp b/palaver.cpp
index 3f85379..1dcc205 100644
--- a/palaver.cpp
+++ b/palaver.cpp
@@ -256,12 +256,12 @@ public:
 				it != m_vMentionKeywords.end(); ++it) {
 			const CString& sKeyword = *it;
 
-			if (sKeyword.Equals("{nick}") && sMessage.find(sNick) != std::string::npos) {
-				bResult = true;
-				break;
-			}
-
-			if (sMessage.find(sKeyword) != std::string::npos) {
+			if (sKeyword.Equals("{nick}")) {
+				if (sMessage.find(sNick) != std::string::npos) {
+					bResult = true;
+					break;
+				}
+			} else if (sMessage.find(sKeyword) != std::string::npos) {
 				bResult = true;
 				break;
 			}