added and to predefined alias variables. (needs core restart)

[quassel.git] / src / core / userinputhandler.cpp

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 1bd29bd..deddc92 100644 (file)
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -146,13 +146,6 @@ void UserInputHandler::handleInvite(const BufferInfo &bufferInfo, const QString
   emit putCmd("INVITE", serverEncode(params));
 }
 
-void UserInputHandler::handleJ(const BufferInfo &bufferInfo, const QString &msg) {
-  QString trimmed = msg.trimmed();
-  if(trimmed.length() == 0) return;
-  if(trimmed[0].isLetter()) trimmed.prepend("#");
-  handleJoin(bufferInfo, trimmed);
-}
-
 void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &msg) {
   Q_UNUSED(bufferInfo)
   QStringList params = msg.trimmed().split(" ");
@@ -266,6 +259,16 @@ void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &m
   emit putCmd("PART", params);
 }
 
+void UserInputHandler::handlePing(const BufferInfo &bufferInfo, const QString &msg) {
+  Q_UNUSED(bufferInfo)
+
+  QString param = msg;
+  if(param.isEmpty())
+    param = QTime::currentTime().toString("hh:mm:ss.zzz");
+
+  putCmd("PING", serverEncode(param));
+}
+
 // TODO: implement queries
 void UserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &msg) {
   Q_UNUSED(bufferInfo)
@@ -339,8 +342,29 @@ void UserInputHandler::handleWhowas(const BufferInfo &bufferInfo, const QString
 }
 
 void UserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &msg) {
-  Q_UNUSED(bufferInfo)
+  for(int i = 0; i < coreSession()->aliasManager().count(); i++) {
+    if(coreSession()->aliasManager()[i].name.toLower() == cmd.toLower()) {
+      expand(coreSession()->aliasManager()[i].expansion, bufferInfo, msg);
+      return;
+    }
+  }
   emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Error: %1 %2").arg(cmd).arg(msg));
 }
 
+void UserInputHandler::expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg) {
+  QStringList commands = alias.split(QRegExp("; ?"));
+  QStringList params = msg.split(' ');
+  for(int i = 0; i < commands.count(); i++) {
+    QString command = commands[i];
+    for(int j = params.count(); j > 0; j--) {
+      command = command.replace(QString("$%1").arg(j), params[j - 1]);
+    }
+    command = command.replace("$0", msg);
+    command = command.replace("$channelname", bufferInfo.bufferName());
+    command = command.replace("$currentnick", network()->myNick());
+    handleUserInput(bufferInfo, command);
+  }
+}
+
+