Fixing BR #335 - needs a core restart

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index e804c26..fcb879e 100644 (file)
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -386,10 +386,30 @@ void UserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo,
 }
 
 void UserInputHandler::expand(const QString &alias, const BufferInfo &bufferInfo, const QString &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];
   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("*"));
     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("*"));

diff --git a/src/qtui/settingspages/aliasesmodel.cpp b/src/qtui/settingspages/aliasesmodel.cpp
index a072330..baaaa9b 100644 (file)
--- a/src/qtui/settingspages/aliasesmodel.cpp
+++ b/src/qtui/settingspages/aliasesmodel.cpp
@@ -54,6 +54,8 @@ QVariant AliasesModel::data(const QModelIndex &index, int role) const {
       return "<b>The string the shortcut will be expanded to</b><br />"
        "<b>special variables:</b><br />"
        " - <b>$i</b> represenents the i'th parameter.<br />"
       return "<b>The string the shortcut will be expanded to</b><br />"
        "<b>special variables:</b><br />"
        " - <b>$i</b> represenents the i'th parameter.<br />"

+       " - <b>$i..j</b> represenents the i'th to j'th parameter separated by spaces.<br />"
+       " - <b>$i..</b> represenents all parameters from i on separated by spaces.<br />"

        " - <b>$i:hostname</b> represents the hostname of the user identified by the i'th parameter or a * if unknown.<br />"
        " - <b>$0</b> the whole string.<br />"
        " - <b>$currentnick</b> your current nickname<br />"
        " - <b>$i:hostname</b> represents the hostname of the user identified by the i'th parameter or a * if unknown.<br />"
        " - <b>$0</b> the whole string.<br />"
        " - <b>$currentnick</b> your current nickname<br />"