X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreuserinputhandler.cpp;h=b873b40fee315af723afe7b6cd991cce65eab235;hp=5783bdcbed5ad6edfa8dfcae5f1aab5fdb7bfb42;hb=78c51110b152ae89503e6503deaf7413a5ac2c97;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
index 5783bdcb..b873b40f 100644
--- a/src/core/coreuserinputhandler.cpp
+++ b/src/core/coreuserinputhandler.cpp
@@ -15,8 +15,9 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
+
 #include "coreuserinputhandler.h"
 
 #include "util.h"
@@ -225,34 +226,64 @@ void CoreUserInputHandler::handleDelkey(const BufferInfo &bufferInfo, const QStr
 #endif
 }
 
+void CoreUserInputHandler::doMode(const BufferInfo &bufferInfo, const QChar& addOrRemove, const QChar& mode, QStringList nicks)
+{
+    QString m;
+    bool isNumber;
+    int maxModes = network()->support("MODES").toInt(&isNumber);
+    if (!isNumber || maxModes == 0) maxModes = 1;
+    
+    if (nicks.count() == 0) return;
+    
+    while (!nicks.isEmpty()) {
+        int amount = qMin(nicks.count(), maxModes);
+        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();
+        emit putCmd("MODE", serverEncode(params));
+    }
+}
+
 
 void CoreUserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QString &msg)
 {
     QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
-    QString m = "-"; for (int i = 0; i < nicks.count(); i++) m += 'o';
-    QStringList params;
-    params << bufferInfo.bufferName() << m << nicks;
-    emit putCmd("MODE", serverEncode(params));
+    doMode(bufferInfo, '-', 'o', nicks);
 }
 
 
 void CoreUserInputHandler::handleDehalfop(const BufferInfo &bufferInfo, const QString &msg)
 {
     QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
-    QString m = "-"; for (int i = 0; i < nicks.count(); i++) m += 'h';
-    QStringList params;
-    params << bufferInfo.bufferName() << m << nicks;
-    emit putCmd("MODE", serverEncode(params));
+    doMode(bufferInfo, '-', 'h', nicks);
 }
 
 
 void CoreUserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString &msg)
 {
     QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
-    QString m = "-"; for (int i = 0; i < nicks.count(); i++) m += 'v';
-    QStringList params;
-    params << bufferInfo.bufferName() << m << nicks;
-    emit putCmd("MODE", serverEncode(params));
+    doMode(bufferInfo, '-', 'v', nicks);
+}
+
+void CoreUserInputHandler::handleHalfop(const BufferInfo &bufferInfo, const QString &msg)
+{
+    QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
+    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);
+  }
+  doMode(bufferInfo, '+', 'o', nicks);
 }
 
 
@@ -426,25 +457,6 @@ void CoreUserInputHandler::handleNotice(const BufferInfo &bufferInfo, const QStr
 }
 
 
-void CoreUserInputHandler::handleHalfop(const BufferInfo &bufferInfo, const QString &msg)
-{
-    QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
-    QString m = "+"; for (int i = 0; i < nicks.count(); i++) m += 'h';
-    QStringList params;
-    params << bufferInfo.bufferName() << m << nicks;
-    emit putCmd("MODE", serverEncode(params));
-}
-
-
-void CoreUserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg)
-{
-    QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
-    QString m = "+"; for (int i = 0; i < nicks.count(); i++) m += 'o';
-    QStringList params;
-    params << bufferInfo.bufferName() << m << nicks;
-    emit putCmd("MODE", serverEncode(params));
-}
-
 
 void CoreUserInputHandler::handleOper(const BufferInfo &bufferInfo, const QString &msg)
 {