X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fuserinputhandler.cpp;h=fcb879ea49ef5616985d5375a355152b9ce62167;hb=99934fe47293f61e1e62ecc0f0d49f958a992c32;hp=64e71ea9a6ea7371b007d71fc4f8ed999bb9cdac;hpb=95627754cb6c78964f2d6be30b1bf0d8a47ff1ab;p=quassel.git

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 64e71ea9..fcb879ea 100644
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -38,7 +38,7 @@ void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QStri
       return;
     QString cmd;
     QString msg = msg_;
-    // leading slashes indicate there's a command to call unless there is anothere one in the first section (like a path /proc/cpuinfo)
+    // leading slashes indicate there's a command to call unless there is another one in the first section (like a path /proc/cpuinfo)
     int secondSlashPos = msg.indexOf('/', 1);
     int firstSpacePos = msg.indexOf(' ');
     if(!msg.startsWith('/') || (secondSlashPos != -1 && (secondSlashPos < firstSpacePos || firstSpacePos == -1))) {
@@ -72,11 +72,19 @@ void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &m
   }
   if(me)
     me->setAwayMessage(awayMsg);
-  
+
   putCmd("AWAY", serverEncode(awayMsg));
 }
 
 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;
 
@@ -104,12 +112,13 @@ void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &ms
       int secondLastPeriodPosition = generalizedHost.lastIndexOf(".", generalizedHost.lastIndexOf(".")-1);
       generalizedHost.replace(0, secondLastPeriodPosition, "*");
     }
-    banUser = QString("*!%1@%2").arg(ircuser->user()).arg(generalizedHost);
+    banUser = QString("*!%1@%2").arg(ircuser->user(), generalizedHost);
   } else {
     banUser = params.join(" ");
   }
 
-  QString banMsg = QString("MODE %1 +b %2").arg(banChannel).arg(banUser);
+  QString banMode = ban ? "+b" : "-b";
+  QString banMsg = QString("MODE %1 %2 %3").arg(banChannel, banMode, banUser);
   emit putRawLine(serverEncode(banMsg));
 }
 
@@ -218,7 +227,7 @@ void UserInputHandler::handleMode(const BufferInfo &bufferInfo, const QString &m
   // if the first argument is neither a channel nor us (user modes are only to oneself) the current buffer is assumed to be the target
   if(!params.isEmpty() && !network()->isChannelName(params[0]) && !network()->isMyNick(params[0]))
     params.prepend(bufferInfo.bufferName());
-  
+
   // TODO handle correct encoding for buffer modes (channelEncode())
   emit putCmd("MODE", serverEncode(params));
 }
@@ -242,6 +251,15 @@ void UserInputHandler::handleNick(const BufferInfo &bufferInfo, const QString &m
   emit putCmd("NICK", serverEncode(nick));
 }
 
+void UserInputHandler::handleNotice(const BufferInfo &bufferInfo, const QString &msg) {
+  QString bufferName = msg.section(' ', 0, 0);
+  QString payload = msg.section(' ', 1);
+  QList<QByteArray> params;
+  params << serverEncode(bufferName) << channelEncode(bufferInfo.bufferName(), payload);
+  emit putCmd("NOTICE", params);
+  emit displayMsg(Message::Notice, bufferName, payload, network()->myNick(), Message::Self);
+}
+
 void UserInputHandler::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';
@@ -267,7 +285,7 @@ void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &m
   } else {
     partReason = msg.mid(channelName.length() + 1);
   }
-  
+
   if(partReason.isEmpty())
     partReason = networkConnection()->identity()->partReason();
 
@@ -364,14 +382,34 @@ void UserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo,
       return;
     }
   }
-  emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Error: %1 %2").arg(cmd).arg(msg));
+  emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Error: %1 %2").arg(cmd, msg));
 }
 
 void UserInputHandler::expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg) {
+  QRegExp paramRangeR("\\$(\\d+)\\.\\.(\\d*)");
   QStringList commands = alias.split(QRegExp("; ?"));
   QStringList params = msg.split(' ');
   for(int i = 0; i < commands.count(); i++) {
     QString command = commands[i];
+
+    // replace ranges like $1..3
+    if(!params.isEmpty()) {
+      int pos;
+      while((pos = paramRangeR.indexIn(command)) != -1) {
+	int start = paramRangeR.cap(1).toInt();
+	bool ok;
+	int end = paramRangeR.cap(2).toInt(&ok);
+	if(!ok) {
+	  end = params.count();
+	}
+	if(end < start)
+	  command = command.replace(pos, paramRangeR.matchedLength(), QString());
+	else {
+	  command = command.replace(pos, paramRangeR.matchedLength(), QStringList(params.mid(start - 1, end - start + 1)).join(" "));
+	}
+      }
+    }
+
     for(int j = params.count(); j > 0; j--) {
       IrcUser *ircUser = network()->ircUser(params[j - 1]);
       command = command.replace(QString("$%1:hostname").arg(j), ircUser ? ircUser->host() : QString("*"));