changed the behavior of RPL_AWAY server messages:

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

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 0841c7a..cb4c153 100644 (file)
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -35,6 +35,7 @@
 IrcServerHandler::IrcServerHandler(NetworkConnection *parent)
   : BasicHandler(parent),
     networkConnection(parent) {
+      _whois = false;
 }
 
 IrcServerHandler::~IrcServerHandler() {
@@ -398,59 +399,111 @@ WHO-Message:
 
 WHOWAS-Message:
    Replies 314 and 369 are responses to a WHOWAS message.
+
 */
 
 
 /*   RPL_AWAY - "<nick> :<away message>" */
 void IrcServerHandler::handle301(QString prefix, QList<QByteArray> params) {
-  IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
-  ircuser->setAwayMessage(serverDecode(params.last()));
-  ircuser->setAway(true);
-  emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
+  Q_UNUSED(prefix);
+  QString nickName = serverDecode(params[0]);
+  QString awayMessage = serverDecode(params.last());
+
+  IrcUser *ircuser = network()->ircUser(nickName);
+  if(ircuser) {
+    ircuser->setAwayMessage(awayMessage);
+    ircuser->setAway(true);
+  }
+
+  if(_whois) {
+    emit displayMsg(Message::Server, "", tr("[Whois] %1 is away: \"%2\"").arg(nickName).arg(awayMessage));
+  } else {
+    int now = QDateTime::currentDateTime().toTime_t();
+    int silenceTime = 60;
+    if(ircuser && ircuser->lastAwayMessage() + silenceTime < now) {
+      emit displayMsg(Message::Server, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage));
+    }
+    ircuser->setLastAwayMessage(now);
+  }
 }
 
 /*  RPL_WHOISUSER - "<nick> <user> <host> * :<real name>" */
 void IrcServerHandler::handle311(QString prefix, QList<QByteArray> params) {
+  Q_UNUSED(prefix)
+  _whois = true;
   IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
-  ircuser->setUser(serverDecode(params[1]));
-  ircuser->setHost(serverDecode(params[2]));
-  ircuser->setRealName(serverDecode(params.last()));
-  emit displayMsg(Message::Server, "", tr("[Whois] %1 %2 %3 (%4)")
-      .arg(ircuser->nick(), ircuser->user(), ircuser->host(), ircuser->realName()));
+  if(ircuser) {
+    ircuser->setUser(serverDecode(params[1]));
+    ircuser->setHost(serverDecode(params[2]));
+    ircuser->setRealName(serverDecode(params.last()));
+  }
+  emit displayMsg(Message::Server, "", tr("[Whois] %1")
+      .arg(serverDecode(params).join(" ")));
 }
  
 /*  RPL_WHOISSERVER -  "<nick> <server> :<server info>" */
 void IrcServerHandler::handle312(QString prefix, QList<QByteArray> params) {
-  emit displayMsg(Message::Server, "", tr("[Whois/Whowas] %1").arg(serverDecode(params).join(" ")));
+  Q_UNUSED(prefix)
+  IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
+  if(ircuser) {
+    ircuser->setServer(serverDecode(params[1]));
+  }
+  if(_whois) {
+    emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
+  } else {
+    emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" ")));
+  }
 }
 
 /*  RPL_WHOISOPERATOR - "<nick> :is an IRC operator" */
 void IrcServerHandler::handle313(QString prefix, QList<QByteArray> params) {
+  Q_UNUSED(prefix)
+  IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
+  if(ircuser) {
+    ircuser->setIrcOperator(params.last());
+  }
   emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
 }
 
 /*  RPL_WHOWASUSER - "<nick> <user> <host> * :<real name>" */
 void IrcServerHandler::handle314(QString prefix, QList<QByteArray> params) {
+  Q_UNUSED(prefix)
   emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" ")));
 }
 
 /*  RPL_ENDOFWHO: "<name> :End of WHO list" */
 void IrcServerHandler::handle315(QString prefix, QList<QByteArray> params) {
+  Q_UNUSED(prefix)
   emit displayMsg(Message::Server, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
 }
 
-/*  RPL_WHOISIDLE - "<nick> <integer> :seconds idle" */
+/*  RPL_WHOISIDLE - "<nick> <integer> :seconds idle" 
+   (real life: "<nick> <integer> <integer> :seconds idle, signon time) */
+   //TODO: parse real life message
 void IrcServerHandler::handle317(QString prefix, QList<QByteArray> params) {
-  emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
+  Q_UNUSED(prefix)
+  IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
+  if(ircuser) {
+    QDateTime now = QDateTime::currentDateTime();
+    int idleSecs = serverDecode(params[1]).toInt();
+    idleSecs *= -1;
+    ircuser->setIdleTime(now.addSecs(idleSecs));
+    emit displayMsg(Message::Server, "", tr("[Whois] %1 is idling for %2 seconds").arg(ircuser->nick()).arg(ircuser->idleTime().secsTo(now)));
+  } else {
+    emit displayMsg(Message::Server, "", tr("[Whois] idle message: %1").arg(serverDecode(params).join(" ")));
+  }
 }
 
 /*  RPL_ENDOFWHOIS - "<nick> :End of WHOIS list" */
 void IrcServerHandler::handle318(QString prefix, QList<QByteArray> params) {
+  Q_UNUSED(prefix)
+  _whois = false;
   emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
 }
 
 /*  RPL_WHOISCHANNELS - "<nick> :*( ( "@" / "+" ) <channel> " " )" */
 void IrcServerHandler::handle319(QString prefix, QList<QByteArray> params) {
+  Q_UNUSED(prefix)
   emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
 }
 
@@ -482,6 +535,7 @@ void IrcServerHandler::handle333(QString prefix, QList<QByteArray> params) {
 /*  RPL_WHOREPLY: "<channel> <user> <host> <server> <nick> 
               ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] :<hopcount> <real name>" */
 void IrcServerHandler::handle352(QString prefix, QList<QByteArray> params) {
+  Q_UNUSED(prefix)
   QString channel = serverDecode(params[0]);
   IrcUser *ircuser = network()->ircUser(serverDecode(params[4]));
   ircuser->setUser(serverDecode(params[1]));
@@ -489,10 +543,7 @@ void IrcServerHandler::handle352(QString prefix, QList<QByteArray> params) {
 
   bool away = serverDecode(params[5]).startsWith("G") ? true : false;
   ircuser->setAway(away);
-
-  // TODO: !!
-  QString server = serverDecode(params[3]); 
-  int hopCount =  serverDecode(params.last()).section(" ", 0, 0).toInt(); 
+  ircuser->setServer(serverDecode(params[3])); 
   ircuser->setRealName(serverDecode(params.last()).section(" ", 1));
 
   emit displayMsg(Message::Server, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
@@ -522,6 +573,7 @@ void IrcServerHandler::handle353(QString prefix, QList<QByteArray> params) {
 
 /*  RPL_ENDOFWHOWAS - "<nick> :End of WHOWAS" */
 void IrcServerHandler::handle369(QString prefix, QList<QByteArray> params) {
+  Q_UNUSED(prefix)
   emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" ")));
 }