sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hopefully bugfix for chatbot regression (#164)

Browse Source
This commit is contained in:
doitux
2012-12-25 22:31:49 +01:00
parent d9d56300bb
commit 341c564d49
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/chatcleaner/badwordcheck.cpp
-2
View File
@@ -46,7 +46,6 @@ bool BadWordCheck::run(QString msg)
QString bw=it.next(); QString bw=it.next();
if(msg.contains(bw)) { if(msg.contains(bw)) {
badMessage=true; badMessage=true;
//exception check //exception check
QStringListIterator it2(badWordsException); QStringListIterator it2(badWordsException);
while (it2.hasNext()) { while (it2.hasNext()) {
@@ -60,5 +59,4 @@ bool BadWordCheck::run(QString msg)
if(badMessage) return true; if(badMessage) return true;
else return false; else return false;
} }
src/chatcleaner/cleanerconfig.cpp
+6 -1
View File
@@ -54,7 +54,7 @@ using namespace std;
CleanerConfig::CleanerConfig() CleanerConfig::CleanerConfig()
{ {
// !!!! Revisionsnummer der Configdefaults !!!!! // !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 9; configRev = 10;
// Pfad und Dateinamen setzen // Pfad und Dateinamen setzen
#ifdef _WIN32 #ifdef _WIN32
@@ -149,6 +149,7 @@ CleanerConfig::CleanerConfig()
badWordsList.push_back("gay"); badWordsList.push_back("gay");
badWordsList.push_back("horny"); badWordsList.push_back("horny");
badWordsList.push_back("hure"); badWordsList.push_back("hure");
badWordsList.push_back("idiot");
badWordsList.push_back("mistgeburt"); badWordsList.push_back("mistgeburt");
badWordsList.push_back("missgeburt"); badWordsList.push_back("missgeburt");
badWordsList.push_back("motherfucker"); badWordsList.push_back("motherfucker");
@@ -171,6 +172,10 @@ CleanerConfig::CleanerConfig()
list<string> badWordsExceptionList; list<string> badWordsExceptionList;
badWordsExceptionList.push_back("idiots end"); badWordsExceptionList.push_back("idiots end");
badWordsExceptionList.push_back("all-in-idiot");
badWordsExceptionList.push_back("all-in idiot");
badWordsExceptionList.push_back("allin idiot");
badWordsExceptionList.push_back("all in idiot");
configList.push_back(ConfigInfo("BadWordsException", CONFIG_TYPE_STRING_LIST, "BadWordsException", badWordsExceptionList)); configList.push_back(ConfigInfo("BadWordsException", CONFIG_TYPE_STRING_LIST, "BadWordsException", badWordsExceptionList));
src/chatcleaner/messagefilter.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ void MessageFilter::refreshConfig()
} }
myBadWordCheck->setBadWords(bwList); myBadWordCheck->setBadWords(bwList);
std::list<std::string> badWordsExceptionList = config->readConfigStringList("BadWordsList"); std::list<std::string> badWordsExceptionList = config->readConfigStringList("BadWordsException");
std::list<std::string>::iterator it1; std::list<std::string>::iterator it1;
QStringList bweList; QStringList bweList;
for(it1= badWordsExceptionList.begin(); it1 != badWordsExceptionList.end(); ++it1) { for(it1= badWordsExceptionList.begin(); it1 != badWordsExceptionList.end(); ++it1) {