Merging branches/0.2/@r857 with trunk

[quassel.git] / src / common / ircuser.cpp

diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index e8ccc37..22df0c9 100644 (file)
--- a/src/common/ircuser.cpp
+++ b/src/common/ircuser.cpp
@@ -28,8 +28,7 @@
 #include <QTextCodec>
 #include <QDebug>
 
-IrcUser::IrcUser(const QString &hostmask, Network *network)
-  : SyncableObject(network),
+IrcUser::IrcUser(const QString &hostmask, Network *network) : SyncableObject(network),
     _initialized(false),
     _nick(nickFromMask(hostmask)),
     _user(userFromMask(hostmask)),
@@ -38,8 +37,10 @@ IrcUser::IrcUser(const QString &hostmask, Network *network)
     _awayMessage(),
     _away(false),
     _server(),
-    _idleTime(QDateTime::currentDateTime()),
+    // _idleTime(QDateTime::currentDateTime()),
     _ircOperator(),
+    _lastAwayMessage(0),
+    _whoisServiceReply(),
     _network(network),
     _codecForEncoding(0),
     _codecForDecoding(0)
@@ -48,57 +49,22 @@ IrcUser::IrcUser(const QString &hostmask, Network *network)
 }
 
 IrcUser::~IrcUser() {
-  //qDebug() << nick() << "destroyed.";
 }
 
 // ====================
 //  PUBLIC:
 // ====================
 
-QString IrcUser::user() const {
-  return _user;
-}
-
-QString IrcUser::host() const {
-  return _host;
-}
-
-QString IrcUser::nick() const {
-  return _nick;
-}
-
-QString IrcUser::realName() const {
-  return _realName;
-}
-
 QString IrcUser::hostmask() const {
   return QString("%1!%2@%3").arg(nick()).arg(user()).arg(host());
 }
 
-bool IrcUser::isAway() const {
-  return _away;
-}
-
-QString IrcUser::awayMessage() const {
-  return _awayMessage;
-}
-
-QString IrcUser::server() const {
-  return _server;
-}
-
-QDateTime IrcUser::idleTime() const {
+QDateTime IrcUser::idleTime() {
+  if(QDateTime::currentDateTime().toTime_t() - _idleTimeSet.toTime_t() > 1200)
+    _idleTime = QDateTime();
   return _idleTime;
 }
 
-QString IrcUser::ircOperator() const {
-  return _ircOperator;
-}
-
-QString IrcUser::userModes() const {
-  return _userModes;
-}
-
 QStringList IrcUser::channels() const {
   QStringList chanList;
   IrcChannel *channel;
@@ -108,13 +74,6 @@ QStringList IrcUser::channels() const {
   return chanList;
 }
 
-Network* IrcUser::network() const {
-  return _network;
-}
-
-QTextCodec *IrcUser::codecForEncoding() const {
-  return _codecForEncoding;
-}
 
 void IrcUser::setCodecForEncoding(const QString &name) {
   setCodecForEncoding(QTextCodec::codecForName(name.toAscii()));
@@ -124,10 +83,6 @@ void IrcUser::setCodecForEncoding(QTextCodec *codec) {
   _codecForEncoding = codec;
 }
 
-QTextCodec *IrcUser::codecForDecoding() const {
-  return _codecForDecoding;
-}
-
 void IrcUser::setCodecForDecoding(const QString &name) {
   setCodecForDecoding(QTextCodec::codecForName(name.toAscii()));
 }
@@ -141,7 +96,7 @@ QString IrcUser::decodeString(const QByteArray &text) const {
   return ::decodeString(text, codecForDecoding());
 }
 
-QByteArray IrcUser::encodeString(const QString string) const {
+QByteArray IrcUser::encodeString(const QString &string) const {
   if(codecForEncoding()) {
     return codecForEncoding()->fromUnicode(string);
   }
@@ -182,10 +137,18 @@ void IrcUser::setAwayMessage(const QString &awayMessage) {
 void IrcUser::setIdleTime(const QDateTime &idleTime) {
   if(idleTime.isValid() && _idleTime != idleTime) {
     _idleTime = idleTime;
+    _idleTimeSet = QDateTime::currentDateTime();
     emit idleTimeSet(idleTime);
   }
 }
 
+void IrcUser::setLoginTime(const QDateTime &loginTime) {
+  if(loginTime.isValid() && _loginTime != loginTime) {
+    _loginTime = loginTime;
+    emit loginTimeSet(loginTime);
+  }
+}
+
 void IrcUser::setServer(const QString &server) {
   if(!server.isEmpty() && _server != server) {
     _server = server;
@@ -200,6 +163,13 @@ void IrcUser::setIrcOperator(const QString &ircOperator) {
   }
 }
 
+void IrcUser::setLastAwayMessage(const int &lastAwayMessage) {
+  if(lastAwayMessage > _lastAwayMessage) {
+    _lastAwayMessage = lastAwayMessage;
+    emit lastAwayMessageSet(lastAwayMessage);
+  }
+}
+
 void IrcUser::setHost(const QString &host) {
   if(!host.isEmpty() && _host != host) {
     _host = host;
@@ -215,15 +185,24 @@ void IrcUser::setNick(const QString &nick) {
   }
 }
 
-void IrcUser::updateObjectName() {
-  QString newName = QString::number(network()->networkId().toInt()) + "/" + _nick;
-  QString oldName = objectName();
-  if(oldName != newName) {
-    setObjectName(newName);
-    emit renameObject(oldName, newName);
+void IrcUser::setWhoisServiceReply(const QString &whoisServiceReply) {
+  if(!whoisServiceReply.isEmpty() && whoisServiceReply != _whoisServiceReply) {
+    _whoisServiceReply = whoisServiceReply;
+    emit whoisServiceReplySet(whoisServiceReply);
   }
 }
 
+void IrcUser::setSuserHost(const QString &suserHost) {
+  if(!suserHost.isEmpty() && suserHost != _suserHost) {
+    _suserHost = suserHost;
+    emit suserHostSet(suserHost);
+  }
+}
+
+void IrcUser::updateObjectName() {
+  renameObject(QString::number(network()->networkId().toInt()) + "/" + _nick);
+}
+
 void IrcUser::updateHostmask(const QString &mask) {
   if(mask == hostmask())
     return;
@@ -238,9 +217,8 @@ void IrcUser::joinChannel(IrcChannel *channel) {
   Q_ASSERT(channel);
   if(!_channels.contains(channel)) {
     _channels.insert(channel);
-    channel->join(this);
+    channel->joinIrcUsers(this);
     connect(channel, SIGNAL(destroyed()), this, SLOT(channelDestroyed()));
-    emit channelJoined(channel->name());
   }
 }
 
@@ -254,6 +232,8 @@ void IrcUser::partChannel(IrcChannel *channel) {
     disconnect(channel, 0, this, 0);
     channel->part(this);
     emit channelParted(channel->name());
+    if(_channels.isEmpty() && !network()->isMe(this))
+      deleteLater();
   }
 }
 
@@ -269,10 +249,10 @@ void IrcUser::partChannel(const QString &channelname) {
 void IrcUser::channelDestroyed() {
   // private slot!
   IrcChannel *channel = static_cast<IrcChannel*>(sender());
-  Q_ASSERT(channel);
   if(_channels.contains(channel)) {
     _channels.remove(channel);
-    disconnect(channel, 0, this, 0);
+    if(_channels.isEmpty())
+      deleteLater();
   }
 }
 
@@ -281,23 +261,24 @@ void IrcUser::setUserModes(const QString &modes) {
   emit userModesSet(modes);
 }
 
-void IrcUser::addUserMode(const QString &mode) {
-  if(!_userModes.contains(mode)) {
-    _userModes += mode;
-    emit userModeAdded(mode);
-  }
-}
+void IrcUser::addUserModes(const QString &modes) {
+  if(modes.isEmpty())
+    return;
 
-void IrcUser::removeUserMode(const QString &mode) {
-  if(_userModes.contains(mode)) {
-    _userModes.remove(mode);
-    emit userModeRemoved(mode);
+  for(int i = 0; i < modes.count(); i++) {
+    if(!_userModes.contains(modes[i]))
+      _userModes += modes[i];
   }
+
+  emit userModesAdded(modes);
 }
 
-void IrcUser::initSetChannels(const QStringList channels) {
-  foreach(QString channel, channels) {
-    joinChannel(channel);
+void IrcUser::removeUserModes(const QString &modes) {
+  if(modes.isEmpty())
+    return;
+
+  for(int i = 0; i < modes.count(); i++) {
+    _userModes.remove(modes[i]);
   }
+  emit userModesRemoved(modes);
 }
-