support '*' as a target for modes

diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
index b873b40..e4b094d 100644 (file)
--- a/src/core/coreuserinputhandler.cpp
+++ b/src/core/coreuserinputhandler.cpp
@@ -226,63 +226,61 @@ void CoreUserInputHandler::handleDelkey(const BufferInfo &bufferInfo, const QStr
 #endif
 }
 
 #endif
 }
 

-void CoreUserInputHandler::doMode(const BufferInfo &bufferInfo, const QChar& addOrRemove, const QChar& mode, QStringList nicks)
+void CoreUserInputHandler::doMode(const BufferInfo &bufferInfo, const QChar& addOrRemove, const QChar& mode, QString nicks)

 {
     QString m;
     bool isNumber;
     int maxModes = network()->support("MODES").toInt(&isNumber);
     if (!isNumber || maxModes == 0) maxModes = 1;
     
 {
     QString m;
     bool isNumber;
     int maxModes = network()->support("MODES").toInt(&isNumber);
     if (!isNumber || maxModes == 0) maxModes = 1;
     

-    if (nicks.count() == 0) return;
+    QStringList nickList;
+    if (nicks == "*") { // All users in channel
+        const QList<IrcUser*> users = network()->ircChannel(bufferInfo.bufferName())->ircUsers();
+        foreach(IrcUser *user, users) {
+            if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))
+                || (addOrRemove == '-' && network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode)))
+                nickList.append(user->nick());
+        }
+    } else { 
+        nickList = nicks.split(' ', QString::SkipEmptyParts);
+    }

     
     

-    while (!nicks.isEmpty()) {
-        int amount = qMin(nicks.count(), maxModes);
+    if (nickList.count() == 0) return;
+    
+    while (!nickList.isEmpty()) {
+        int amount = qMin(nickList.count(), maxModes);

         QString m = addOrRemove; for(int i = 0; i < amount; i++) m += mode;
         QStringList params;
         params << bufferInfo.bufferName() << m;
         QString m = addOrRemove; for(int i = 0; i < amount; i++) m += mode;
         QStringList params;
         params << bufferInfo.bufferName() << m;

-        for(int i = 0; i < amount; i++) params << nicks.takeFirst();
+        for(int i = 0; i < amount; i++) params << nickList.takeFirst();

         emit putCmd("MODE", serverEncode(params));
     }
 }
 
 
         emit putCmd("MODE", serverEncode(params));
     }
 }
 
 

-void CoreUserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QString &msg)
+void CoreUserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QString &nicks)

 {
 {

-    QStringList nicks = msg.split(' ', QString::SkipEmptyParts);

     doMode(bufferInfo, '-', 'o', nicks);
 }
 
 
     doMode(bufferInfo, '-', 'o', nicks);
 }
 
 

-void CoreUserInputHandler::handleDehalfop(const BufferInfo &bufferInfo, const QString &msg)
+void CoreUserInputHandler::handleDehalfop(const BufferInfo &bufferInfo, const QString &nicks)

 {
 {

-    QStringList nicks = msg.split(' ', QString::SkipEmptyParts);

     doMode(bufferInfo, '-', 'h', nicks);
 }
 
 
     doMode(bufferInfo, '-', 'h', nicks);
 }
 
 

-void CoreUserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString &msg)
+void CoreUserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString &nicks)

 {
 {

-    QStringList nicks = msg.split(' ', QString::SkipEmptyParts);

     doMode(bufferInfo, '-', 'v', nicks);
 }
 
     doMode(bufferInfo, '-', 'v', nicks);
 }
 

-void CoreUserInputHandler::handleHalfop(const BufferInfo &bufferInfo, const QString &msg)
+void CoreUserInputHandler::handleHalfop(const BufferInfo &bufferInfo, const QString &nicks)

 {
 {

-    QStringList nicks = msg.split(' ', QString::SkipEmptyParts);

     doMode(bufferInfo, '+', 'h', nicks);
 }
 
     doMode(bufferInfo, '+', 'h', nicks);
 }
 

-void CoreUserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg) {
-  QStringList nicks;
-  if (msg == "*") {
-    const QList<IrcUser*> users = network()->ircChannel(bufferInfo.bufferName())->ircUsers();
-    foreach(IrcUser *user, users) {
-      if (!network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains("o"))
-    nicks.append(user->nick());
-    }
-  } else { 
-    nicks = msg.split(' ', QString::SkipEmptyParts);
-  }
+void CoreUserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &nicks) {

   doMode(bufferInfo, '+', 'o', nicks);
 }
 
   doMode(bufferInfo, '+', 'o', nicks);
 }
 

diff --git a/src/core/coreuserinputhandler.h b/src/core/coreuserinputhandler.h
index 1375bd7..c5fcf11 100644 (file)
--- a/src/core/coreuserinputhandler.h
+++ b/src/core/coreuserinputhandler.h
@@ -43,9 +43,9 @@ public slots:
     void handleUnban(const BufferInfo &bufferInfo, const QString &text);
     void handleCtcp(const BufferInfo &bufferInfo, const QString &text);
     void handleDelkey(const BufferInfo &bufferInfo, const QString &text);
     void handleUnban(const BufferInfo &bufferInfo, const QString &text);
     void handleCtcp(const BufferInfo &bufferInfo, const QString &text);
     void handleDelkey(const BufferInfo &bufferInfo, const QString &text);

-    void handleDeop(const BufferInfo &bufferInfo, const QString &text);
-    void handleDehalfop(const BufferInfo &bufferInfo, const QString &text);
-    void handleDevoice(const BufferInfo &bufferInfo, const QString &text);
+    void handleDeop(const BufferInfo& bufferInfo, const QString& nicks);
+    void handleDehalfop(const BufferInfo& bufferInfo, const QString& nicks);
+    void handleDevoice(const BufferInfo& bufferInfo, const QString& nicks);

     void handleInvite(const BufferInfo &bufferInfo, const QString &text);
     void handleJoin(const BufferInfo &bufferInfo, const QString &text);
     void handleKick(const BufferInfo &bufferInfo, const QString &text);
     void handleInvite(const BufferInfo &bufferInfo, const QString &text);
     void handleJoin(const BufferInfo &bufferInfo, const QString &text);
     void handleKick(const BufferInfo &bufferInfo, const QString &text);


@@ -57,8 +57,8 @@ public slots:
     void handleNick(const BufferInfo &bufferInfo, const QString &text);
     void handleNotice(const BufferInfo &bufferInfo, const QString &text);
     void handleOper(const BufferInfo &bufferInfo, const QString &text);
     void handleNick(const BufferInfo &bufferInfo, const QString &text);
     void handleNotice(const BufferInfo &bufferInfo, const QString &text);
     void handleOper(const BufferInfo &bufferInfo, const QString &text);

-    void handleOp(const BufferInfo &bufferInfo, const QString &text);
-    void handleHalfop(const BufferInfo &bufferInfo, const QString &text);
+    void handleOp(const BufferInfo& bufferInfo, const QString& nicks);
+    void handleHalfop(const BufferInfo& bufferInfo, const QString& nicks);

     void handlePart(const BufferInfo &bufferInfo, const QString &text);
     void handlePing(const BufferInfo &bufferInfo, const QString &text);
     void handleQuery(const BufferInfo &bufferInfo, const QString &text);
     void handlePart(const BufferInfo &bufferInfo, const QString &text);
     void handlePing(const BufferInfo &bufferInfo, const QString &text);
     void handleQuery(const BufferInfo &bufferInfo, const QString &text);


@@ -83,7 +83,7 @@ protected:
     void timerEvent(QTimerEvent *event);
 
 private:
     void timerEvent(QTimerEvent *event);
 
 private:

-    void doMode(const BufferInfo& bufferInfo, const QChar& addOrRemove, const QChar& mode, QStringList nicks);
+    void doMode(const BufferInfo& bufferInfo, const QChar& addOrRemove, const QChar& mode, QString nickList);

     void banOrUnban(const BufferInfo &bufferInfo, const QString &text, bool ban);
     void putPrivmsg(const QByteArray &target, const QByteArray &message, Cipher *cipher = 0);
     int lastParamOverrun(const QString &cmd, const QList<QByteArray> &params);
     void banOrUnban(const BufferInfo &bufferInfo, const QString &text, bool ban);
     void putPrivmsg(const QByteArray &target, const QByteArray &message, Cipher *cipher = 0);
     int lastParamOverrun(const QString &cmd, const QList<QByteArray> &params);