fixing BR #303 partially - introducing unban

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 3219d4d..da3cc24 100644 (file)
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -77,6 +77,14 @@ void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &m
 }
 
 void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &msg) {
 }
 
 void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &msg) {

+  banOrUnban(bufferInfo, msg, true);
+}
+
+void UserInputHandler::handleUnban(const BufferInfo &bufferInfo, const QString &msg) {
+  banOrUnban(bufferInfo, msg, false);
+}
+
+void UserInputHandler::banOrUnban(const BufferInfo &bufferInfo, const QString &msg, bool ban) {

   QString banChannel;
   QString banUser;
 
   QString banChannel;
   QString banUser;
 


@@ -109,7 +117,8 @@ void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &ms
     banUser = params.join(" ");
   }
 
     banUser = params.join(" ");
   }
 

-  QString banMsg = QString("MODE %1 +b %2").arg(banChannel, banUser);
+  QString banMode = ban ? "+b" : "-b";
+  QString banMsg = QString("MODE %1 %2 %3").arg(banChannel, banMode, banUser);

   emit putRawLine(serverEncode(banMsg));
 }
 
   emit putRawLine(serverEncode(banMsg));
 }
 

diff --git a/src/core/userinputhandler.h b/src/core/userinputhandler.h
index 436b254..ea248f3 100644 (file)
--- a/src/core/userinputhandler.h
+++ b/src/core/userinputhandler.h
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

-#ifndef _USERINPUTHANDLER_H_
-#define _USERINPUTHANDLER_H_
+#ifndef USERINPUTHANDLER_H
+#define USERINPUTHANDLER_H

 
 #include "basichandler.h"
 
 
 #include "basichandler.h"
 


@@ -36,6 +36,7 @@ public:
 public slots:
   void handleAway(const BufferInfo &bufferInfo, const QString &text);
   void handleBan(const BufferInfo &bufferInfo, const QString &text);
 public slots:
   void handleAway(const BufferInfo &bufferInfo, const QString &text);
   void handleBan(const BufferInfo &bufferInfo, const QString &text);

+  void handleUnban(const BufferInfo &bufferInfo, const QString &text);

   void handleCtcp(const BufferInfo &bufferInfo, const QString &text);
   void handleDeop(const BufferInfo &bufferInfo, const QString &text);
   void handleDevoice(const BufferInfo &bufferInfo, const QString &text);
   void handleCtcp(const BufferInfo &bufferInfo, const QString &text);
   void handleDeop(const BufferInfo &bufferInfo, const QString &text);
   void handleDevoice(const BufferInfo &bufferInfo, const QString &text);


@@ -66,6 +67,7 @@ public slots:
 
 private:
   void expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg);
 
 private:
   void expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg);

+  void banOrUnban(const BufferInfo &bufferInfo, const QString &text, bool ban);

 };
 
 
 };