From 9a3052e9cba62ca84034e8dadee86d98895f4c08 Mon Sep 17 00:00:00 2001
From: Anselme <anselme.francois@gmail.com>
Date: Mon, 20 Jun 2016 11:48:25 +0200
Subject: [PATCH] fixed remove

---
 app/punishermodule.cpp | 74 ++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/app/punishermodule.cpp b/app/punishermodule.cpp
index 801f397..67d1494 100644
--- a/app/punishermodule.cpp
+++ b/app/punishermodule.cpp
@@ -10,13 +10,39 @@ PunisherModule::PunisherModule()
 
 bool PunisherModule::messageHandler(Message msg)
 {
-    for(const QString &w : forbidden_words)
+    if(msg.args.startsWith("!forbidden remove ") && getUsers()->getFromNick(msg.nick)->isOp())
     {
-        if(msg.args.contains(w, Qt::CaseInsensitive))
+        QStringList str = msg.args.split(' ');
+        int i=2;
+        answer = QString("");
+        for(; i<str.size(); ++i)
         {
-            answer = QString("KICK #%1 %2\r\n").arg(getChan()).arg(msg.nick);
-            return true;
+            bool found = false;
+            for(auto it = forbidden_words.begin(); it != forbidden_words.end(); it++)
+            {
+                if(str[i].compare(*it, Qt::CaseInsensitive) == 0)
+                {
+                    forbidden_words.erase(it);
+                    found = true;
+                    break;
+                }
+            }
+            if(found)
+                answer += say(QString("removed %1 to the list of forbidden words").arg(str[i]));
+            else
+                answer += say(QString("%1 was not part of the list of forbidden words").arg(str[i]));
+            
         }
+        if(i==2)
+            answer = say(QString("missing argument"));
+        return true;
+    }
+    
+    if(msg.args.compare("!forbidden reset") == 0 && getUsers()->getFromNick(msg.nick)->isOp())
+    {
+        forbidden_words.clear();
+        answer = say(QString("removed all forbidden words"));
+        return true;
     }
     
     if(msg.args.startsWith("!forbidden add ") && getUsers()->getFromNick(msg.nick)->isOp())
@@ -34,37 +60,6 @@ bool PunisherModule::messageHandler(Message msg)
         return true;
     }
     
-    if(msg.args.startsWith("!forbidden remove ") && getUsers()->getFromNick(msg.nick)->isOp())
-    {
-        QStringList str = msg.args.split(' ');
-        int i=2;
-        answer = QString("");
-        for(; i<str.size(); ++i)
-        {
-            for(auto it = forbidden_words.begin(); it != forbidden_words.end(); it++)
-            {
-                if(str[i].compare(*it, Qt::CaseInsensitive) == 0)
-                {
-                    forbidden_words.erase(it);
-                    answer += say(QString("removed %1 to the list of forbidden words").arg(str[i]));
-                }
-                else
-                    answer += say(QString("%1 was not part of the list of forbidden words").arg(str[i]));
-            }
-            
-        }
-        if(i==2)
-            answer = say(QString("missing argument"));
-        return true;
-    }
-    
-    if(msg.args.compare("!forbidden reset") == 0 && getUsers()->getFromNick(msg.nick)->isOp())
-    {
-        forbidden_words.clear();
-        answer = say(QString("removed all forbidden words"));
-        return true;
-    }
-    
     if(msg.args.compare("!forbidden list") == 0)
     {
         QString str = QString("Forbidden words are : ");
@@ -73,6 +68,15 @@ bool PunisherModule::messageHandler(Message msg)
         answer = say(str);
         return true;
     }
+    
+    for(const QString &w : forbidden_words)
+    {
+        if(msg.args.contains(w, Qt::CaseInsensitive))
+        {
+            answer = QString("KICK #%1 %2\r\n").arg(getChan()).arg(msg.nick);
+            return true;
+        }
+    }
 
     return false;
 }