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

some chatcleaner adjustments

Browse Source
This commit is contained in:
doitux
2009-07-27 20:18:18 +00:00
parent e44286044d
commit a612cff91f
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/chatcleaner/cleanerconfig.cpp
+2 -2
View File
@@ -43,7 +43,7 @@ using namespace std;
CleanerConfig::CleanerConfig() CleanerConfig::CleanerConfig()
{ {
// !!!! Revisionsnummer der Configdefaults !!!!! // !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 1; configRev = 2;
// Pfad und Dateinamen setzen // Pfad und Dateinamen setzen
#ifdef _WIN32 #ifdef _WIN32
@@ -114,7 +114,7 @@ CleanerConfig::CleanerConfig()
configList.push_back(ConfigInfo("HostAddress", CONFIG_TYPE_STRING, "127.0.0.1")); configList.push_back(ConfigInfo("HostAddress", CONFIG_TYPE_STRING, "127.0.0.1"));
configList.push_back(ConfigInfo("DefaultListenPort", CONFIG_TYPE_STRING, "4327")); configList.push_back(ConfigInfo("DefaultListenPort", CONFIG_TYPE_STRING, "4327"));
configList.push_back(ConfigInfo("WarnLevelToKick", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("WarnLevelToKick", CONFIG_TYPE_INT, "2"));
configList.push_back(ConfigInfo("TextFloodLevelToTrigger", CONFIG_TYPE_INT, "3")); configList.push_back(ConfigInfo("TextFloodLevelToTrigger", CONFIG_TYPE_INT, "3"));
list<string> badWordsList; list<string> badWordsList;
src/chatcleaner/cleanerserver.cpp
+5 -3
View File
@@ -35,9 +35,11 @@ CleanerServer::~CleanerServer()
} }
void CleanerServer::newCon() void CleanerServer::newCon()
{ {
tcpSocket = tcpServer->nextPendingConnection(); if(!tcpSocket->isOpen()) {
connect(tcpSocket, SIGNAL(readyRead()), this, SLOT(onRead())); tcpSocket = tcpServer->nextPendingConnection();
connect(tcpSocket, SIGNAL(readyRead()), this, SLOT(onRead()));
}
} }
void CleanerServer::onRead() void CleanerServer::onRead()
src/chatcleaner/messagefilter.cpp
+3 -1
View File
@@ -43,9 +43,11 @@ QString MessageFilter::check(unsigned playerId, QString nick, QString msg)
action = WARN; action = WARN;
} }
else { else {
if(i.value().warnLevel == warnLevelToKick) { if(i.value().warnLevel == warnLevelToKick || i.value().lastWarnType == offence) {
// Kick Command // Kick Command
action = KICK; action = KICK;
//remove playerId from all lists and as LAST from myClientWarnLevelList
myTextFloodCheck->removeNickFromList(i.key());
myClientWarnLevelList.remove(i.key()); myClientWarnLevelList.remove(i.key());
} }
else { else {
src/chatcleaner/textfloodcheck.cpp
+9 -3
View File
@@ -31,11 +31,16 @@ bool TextFloodCheck::run(unsigned playerId) {
} }
else { else {
if(timer.elapsed().total_seconds()-i.value().timeStamp <= 1) { if(timer.elapsed().total_seconds()-i.value().timeStamp <= 1) {
if(i.value().floodLevel == textFloodLevelToTrigger) if(i.value().floodLevel == textFloodLevelToTrigger) {
myTextFloodInfos.floodLevel--;
// qDebug () << "set player floodlevel to " << myTextFloodInfos.floodLevel << endl;
myTextFloodInfos.timeStamp = timer.elapsed().total_seconds();
msgTimesList.insert(playerId, myTextFloodInfos);
return true; return true;
else }
else {
myTextFloodInfos.floodLevel++; myTextFloodInfos.floodLevel++;
}
} }
myTextFloodInfos.timeStamp = timer.elapsed().total_seconds(); myTextFloodInfos.timeStamp = timer.elapsed().total_seconds();
msgTimesList.insert(playerId, myTextFloodInfos); msgTimesList.insert(playerId, myTextFloodInfos);
@@ -65,5 +70,6 @@ void TextFloodCheck::cleanMsgTimesList() {
void TextFloodCheck::removeNickFromList(unsigned playerId) { void TextFloodCheck::removeNickFromList(unsigned playerId) {
// qDebug() << "id " << playerId << "removed from textfloodcheck list" << endl;
msgTimesList.remove(playerId); msgTimesList.remove(playerId);
} }