added some more ctcp handlers

diff --git a/core/server.cpp b/core/server.cpp
index 09e1583..01cf281 100644 (file)
--- a/core/server.cpp
+++ b/core/server.cpp
@@ -32,6 +32,11 @@ Server::Server(QString net) : network(net) {
   ctcpMDequoteHash[MQUOTE + 'n'] = QString('\n');
   ctcpMDequoteHash[MQUOTE + 'r'] = QString('\r');
   ctcpMDequoteHash[MQUOTE + MQUOTE] = MQUOTE;
   ctcpMDequoteHash[MQUOTE + 'n'] = QString('\n');
   ctcpMDequoteHash[MQUOTE + 'r'] = QString('\r');
   ctcpMDequoteHash[MQUOTE + MQUOTE] = MQUOTE;

+
+  XDELIM = QString('\001');
+  QString XQUOTE = QString('\134');
+  ctcpXDelimDequoteHash[XQUOTE + XQUOTE] = XQUOTE;
+  ctcpXDelimDequoteHash[XQUOTE + QString('a')] = XDELIM;

 }
 
 Server::~Server() {
 }
 
 Server::~Server() {


@@ -299,43 +304,40 @@ QStringList Server::providesUserHandlers() {
 QString Server::ctcpDequote(QString message) {
   QString dequotedMessage;
   QString messagepart;
 QString Server::ctcpDequote(QString message) {
   QString dequotedMessage;
   QString messagepart;

-  int offset;
-
+  QHash<QString, QString>::iterator ctcpquote;
+  

   // copy dequote Message
   for(int i = 0; i < message.size(); i++) {
     messagepart = message[i];
   // copy dequote Message
   for(int i = 0; i < message.size(); i++) {
     messagepart = message[i];

-    offset = 0;

     if(i+1 < message.size()) {
     if(i+1 < message.size()) {

-      for(QHash<QString, QString>::iterator ctcpquote = ctcpMDequoteHash.begin(); ctcpquote != ctcpMDequoteHash.end(); ++ctcpquote) {
+      for(ctcpquote = ctcpMDequoteHash.begin(); ctcpquote != ctcpMDequoteHash.end(); ++ctcpquote) {

         if(message.mid(i,2) == ctcpquote.key()) {
           dequotedMessage += ctcpquote.value();
         if(message.mid(i,2) == ctcpquote.key()) {
           dequotedMessage += ctcpquote.value();

-          offset = 1;
+          i++;
+          break;

         }
       }
     }
     dequotedMessage += messagepart;
         }
       }
     }
     dequotedMessage += messagepart;

-    i += offset;

   }
   return dequotedMessage;
 }
 
   }
   return dequotedMessage;
 }
 

+

 QString Server::ctcpXdelimDequote(QString message) {
   QString dequotedMessage;
   QString messagepart;
 QString Server::ctcpXdelimDequote(QString message) {
   QString dequotedMessage;
   QString messagepart;

-  QString XQUOTE = QString('\134');
-  QString XQUOTEQUOTED = XQUOTE + QString('\134');
-  QString XDELIM = QString('\001');
-  QString XDELIMQUOTED = XQUOTE + QString('a');
-  
+  QHash<QString, QString>::iterator xdelimquote;
+

   for(int i = 0; i < message.size(); i++) {
     messagepart = message[i];
     if(i+1 < message.size()) {
   for(int i = 0; i < message.size(); i++) {
     messagepart = message[i];
     if(i+1 < message.size()) {

-      if(message.mid(i,2) == XQUOTEQUOTED) {
-        messagepart = XQUOTE;
-        i++;
-      } else if(message.mid(i,2) == XDELIMQUOTED) {
-        messagepart = XDELIM;
-        i++;
+      for(xdelimquote = ctcpXDelimDequoteHash.begin(); xdelimquote != ctcpXDelimDequoteHash.end(); ++xdelimquote) {
+        if(message.mid(i,2) == xdelimquote.key()) {
+          messagepart = xdelimquote.value();
+          i++;
+          break;
+        }

       }
     }
     dequotedMessage += messagepart;
       }
     }
     dequotedMessage += messagepart;


@@ -351,17 +353,15 @@ QStringList Server::parseCtcp(CtcpType ctcptype, QString prefix, QString target,
   QString dequotedMessage = ctcpDequote(message);
   
   // extract tagged / extended data
   QString dequotedMessage = ctcpDequote(message);
   
   // extract tagged / extended data

-  QString XDELIM = QString('\001');

   while(dequotedMessage.contains(XDELIM)) {
     messages << dequotedMessage.section(XDELIM,0,0);
   while(dequotedMessage.contains(XDELIM)) {
     messages << dequotedMessage.section(XDELIM,0,0);

-    ctcp = dequotedMessage.section(XDELIM,1,1);
+    ctcp = ctcpXdelimDequote(dequotedMessage.section(XDELIM,1,1));

     dequotedMessage = dequotedMessage.section(XDELIM,2,2);
     
     //dispatch the ctcp command
     QString ctcpcmd = ctcp.section(' ', 0, 0);
     QString ctcpparam = ctcp.section(' ', 1);
     
     dequotedMessage = dequotedMessage.section(XDELIM,2,2);
     
     //dispatch the ctcp command
     QString ctcpcmd = ctcp.section(' ', 0, 0);
     QString ctcpparam = ctcp.section(' ', 1);
     

-    // Now we try to find a handler for this message. BTW, I do love the Trolltech guys ;-)

     QString hname = ctcpcmd.toLower();
     hname[0] = hname[0].toUpper();
     hname = "handleCtcp" + hname;
     QString hname = ctcpcmd.toLower();
     hname[0] = hname[0].toUpper();
     hname = "handleCtcp" + hname;


@@ -369,14 +369,27 @@ QStringList Server::parseCtcp(CtcpType ctcptype, QString prefix, QString target,
       // Ok. Default handler it is.
       defaultCtcpHandler(ctcptype, prefix, ctcpcmd, target, ctcpparam);
     }
       // Ok. Default handler it is.
       defaultCtcpHandler(ctcptype, prefix, ctcpcmd, target, ctcpparam);
     }

-
-

   }
   if(!dequotedMessage.isEmpty()) {
     messages << dequotedMessage;
   }
   return messages;
   }
   if(!dequotedMessage.isEmpty()) {
     messages << dequotedMessage;
   }
   return messages;

-  
+}
+
+QString Server::ctcpPack(QString ctcpTag, QString message) {
+  return XDELIM + ctcpTag + ' ' + message + XDELIM;
+}
+
+void Server::ctcpQuery(QString bufname, QString ctcpTag, QString message) {
+  QStringList params;
+  params << bufname << ctcpPack(ctcpTag, message);
+  putCmd("PRIVMSG", params); 
+}
+
+void Server::ctcpReply(QString bufname, QString ctcpTag, QString message) {
+  QStringList params;
+  params << bufname << ctcpPack(ctcpTag, message);
+  putCmd("NOTICE", params);

 }
 
 /**********************************************************************************/
 }
 
 /**********************************************************************************/


@@ -487,6 +500,12 @@ void Server::handleUserSay(QString bufname, QString msg) {
   }
 }
 
   }
 }
 

+void Server::handleUserMe(QString bufname, QString msg) {
+  if(bufname.isEmpty()) return; // server buffer
+  ctcpQuery(bufname, "ACTION", msg);
+  emit displayMsg(Message::Action, bufname, msg, ownNick);
+}
+

 void Server::handleUserTopic(QString bufname, QString msg) {
   if(bufname.isEmpty()) return;
   QStringList params;
 void Server::handleUserTopic(QString bufname, QString msg) {
   if(bufname.isEmpty()) return;
   QStringList params;


@@ -845,8 +864,27 @@ void Server::handleCtcpAction(CtcpType ctcptype, QString prefix, QString target,
   emit displayMsg(Message::Action, target, param, prefix);
 }
 
   emit displayMsg(Message::Action, target, param, prefix);
 }
 

+void Server::handleCtcpPing(CtcpType ctcptype, QString prefix, QString target, QString param) {
+  if(ctcptype == CtcpQuery) {
+    ctcpReply(userFromMask(prefix), "PING", param);
+    emit displayMsg(Message::Plain, "", tr("Received CTCP PING request by %1").arg(prefix));
+  } else {
+    // display ping answer
+  }
+}
+
+void Server::handleCtcpVersion(CtcpType ctcptype, QString prefix, QString target, QString param) {
+  if(ctcptype == CtcpQuery) {
+    // FIXME use real Info about quasel :)
+    ctcpReply(userFromMask(prefix), "VERSION", QString("Quassel:pre Release:*nix"));
+    emit displayMsg(Message::Plain, "", tr("Received CTCP VERSION request by %1").arg(prefix));
+  } else {
+    // TODO display Version answer
+  }
+}
+

 void Server::defaultCtcpHandler(CtcpType ctcptype, QString prefix, QString cmd, QString target, QString param) {
 void Server::defaultCtcpHandler(CtcpType ctcptype, QString prefix, QString cmd, QString target, QString param) {

-  emit displayMsg(Message::Error, "", QString("Unknown CTCP: ") + cmd + (" ") + param, prefix);
+  emit displayMsg(Message::Error, "", tr("Received unknown CTCP %1 by %2").arg(cmd).arg(prefix));

 }
 
 
 }
 
 

diff --git a/core/server.h b/core/server.h
index 9664151..d4fbfd2 100644 (file)
--- a/core/server.h
+++ b/core/server.h
@@ -111,6 +111,7 @@ class Server : public QThread {
     void handleUserSay(QString, QString);
     void handleUserTopic(QString, QString);
     void handleUserVoice(QString, QString);
     void handleUserSay(QString, QString);
     void handleUserTopic(QString, QString);
     void handleUserVoice(QString, QString);

+    void handleUserMe(QString, QString);

 
     /* void handleServer(QString, QStringList); */
     void handleServerJoin(QString, QStringList);
 
     /* void handleServer(QString, QStringList); */
     void handleServerJoin(QString, QStringList);


@@ -134,6 +135,8 @@ class Server : public QThread {
     void handleServer433(QString, QStringList);   // ERR_NICKNAMEINUSE
 
     void handleCtcpAction(CtcpType, QString, QString, QString);
     void handleServer433(QString, QStringList);   // ERR_NICKNAMEINUSE
 
     void handleCtcpAction(CtcpType, QString, QString, QString);

+    void handleCtcpPing(CtcpType, QString, QString, QString);
+    void handleCtcpVersion(CtcpType, QString, QString, QString);

 
     void defaultServerHandler(QString cmd, QString prefix, QStringList params);
     void defaultUserHandler(QString buf, QString cmd, QString msg);
 
     void defaultServerHandler(QString cmd, QString prefix, QStringList params);
     void defaultUserHandler(QString buf, QString cmd, QString msg);


@@ -155,11 +158,18 @@ class Server : public QThread {
     void handleServerMsg(QString rawMsg);
     void handleUserInput(QString buffer, QString usrMsg);
 
     void handleServerMsg(QString rawMsg);
     void handleUserInput(QString buffer, QString usrMsg);
 

+    // CTCP Stuff
+    QString XDELIM;

     QHash<QString, QString> ctcpMDequoteHash;
     QHash<QString, QString> ctcpMDequoteHash;

+    QHash<QString, QString> ctcpXDelimDequoteHash;    

     QString ctcpDequote(QString);
     QString ctcpXdelimDequote(QString);
     QStringList parseCtcp(CtcpType, QString, QString, QString);    
 
     QString ctcpDequote(QString);
     QString ctcpXdelimDequote(QString);
     QStringList parseCtcp(CtcpType, QString, QString, QString);    
 

+    QString ctcpPack(QString ctcpTag, QString message);
+    void ctcpQuery(QString bufname, QString ctcpTag, QString message);
+    void ctcpReply(QString bufname, QString ctcpTag, QString message);
+    

     QString updateNickFromMask(QString mask);
 
     class ParseError : public Exception {
     QString updateNickFromMask(QString mask);
 
     class ParseError : public Exception {