Correctly handle mention keywords

diff --git a/palaver.cpp b/palaver.cpp
index 97236973f8ab5245b51d37ee0449de74dac381d9..c41747fa09ecaa59a5f4d91eddabdf158fb58133 100644 (file)
--- 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.WildCmp("*" + sNick + "*")) {
+                       if (sKeyword.Equals("{nick}") && sMessage.find(sNick) != std::string::npos) {
                                bResult = true;
                                break;
                        }
 
-                       if (sMessage.WildCmp("*" + sKeyword + "*")) {
+                       if (sMessage.find(sKeyword) != std::string::npos) {
                                bResult = true;
                                break;
                        }
@@ -277,7 +277,7 @@ public:
                                it != m_vIgnoreKeywords.end(); ++it) {
                        const CString& sKeyword = *it;
 
-                       if (sMessage.WildCmp("*" + sKeyword + "*")) {
+                       if (sMessage.find(sKeyword) != std::string::npos) {
                                bResult = true;
                                break;
                        }