X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=44373b604506df2b7abdb42b692f360de02cf748;hp=e804c260cce54905bb1d846e8ef1819496d937ff;hb=b55d0de3c731948432ddb2851fe728c4edff374c;hpb=5cb19c841e567f26c34e77dbe254e530efacd6b3

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index e804c260..44373b60 100644
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -317,15 +317,16 @@ void UserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &
 
 void UserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &msg) {
   Q_UNUSED(bufferInfo)
+  networkConnection()->disconnectFromIrc(true, msg);
+}
 
+void UserInputHandler::issueQuit(const QString &reason) {
   QString quitReason;
-  if(msg.isEmpty())
+  if(reason.isEmpty())
     quitReason = networkConnection()->identity()->quitReason();
   else
-    quitReason = msg;
-
+    quitReason = reason;
   emit putCmd("QUIT", serverEncode(quitReason));
-  networkConnection()->disconnectFromIrc();
 }
 
 void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) {
@@ -343,13 +344,11 @@ void UserInputHandler::handleSay(const BufferInfo &bufferInfo, const QString &ms
 
 void UserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QString &msg) {
   if(bufferInfo.bufferName().isEmpty()) return;
-  if(!msg.isEmpty()) {
-    QList<QByteArray> params;
-    params << serverEncode(bufferInfo.bufferName()) << channelEncode(bufferInfo.bufferName(), msg);
-    emit putCmd("TOPIC", params);
-  } else {
-    emit networkConnection()->putRawLine("TOPIC " + serverEncode(bufferInfo.bufferName()) + " :");
-  }
+  QList<QByteArray> params;
+  params << serverEncode(bufferInfo.bufferName());
+  if(!msg.isEmpty())
+    params << channelEncode(bufferInfo.bufferName(), msg);
+  emit putCmd("TOPIC", params);
 }
 
 void UserInputHandler::handleVoice(const BufferInfo &bufferInfo, const QString &msg) {
@@ -386,10 +385,30 @@ void UserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo,
 }
 
 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("*"));