projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented SSL support for client <-> core connection.
[quassel.git]
/
src
/
common
/
ircuser.cpp
diff --git
a/src/common/ircuser.cpp
b/src/common/ircuser.cpp
index
64f5d32
..
e911d33
100644
(file)
--- a/
src/common/ircuser.cpp
+++ b/
src/common/ircuser.cpp
@@
-28,8
+28,7
@@
#include <QTextCodec>
#include <QDebug>
#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)),
_initialized(false),
_nick(nickFromMask(hostmask)),
_user(userFromMask(hostmask)),
@@
-38,7
+37,7
@@
IrcUser::IrcUser(const QString &hostmask, Network *network)
_awayMessage(),
_away(false),
_server(),
_awayMessage(),
_away(false),
_server(),
- _idleTime(QDateTime::currentDateTime()),
+
//
_idleTime(QDateTime::currentDateTime()),
_ircOperator(),
_lastAwayMessage(0),
_network(network),
_ircOperator(),
_lastAwayMessage(0),
_network(network),
@@
-87,10
+86,16
@@
QString IrcUser::server() const {
return _server;
}
return _server;
}
-QDateTime IrcUser::idleTime() const {
+QDateTime IrcUser::idleTime() {
+ if(QDateTime::currentDateTime().toTime_t() - _idleTimeSet.toTime_t() > 1200)
+ _idleTime = QDateTime();
return _idleTime;
}
return _idleTime;
}
+QDateTime IrcUser::loginTime() const {
+ return _loginTime;
+}
+
QString IrcUser::ircOperator() const {
return _ircOperator;
}
QString IrcUser::ircOperator() const {
return _ircOperator;
}
@@
-145,7
+150,7
@@
QString IrcUser::decodeString(const QByteArray &text) const {
return ::decodeString(text, codecForDecoding());
}
return ::decodeString(text, codecForDecoding());
}
-QByteArray IrcUser::encodeString(const QString string) const {
+QByteArray IrcUser::encodeString(const QString
&
string) const {
if(codecForEncoding()) {
return codecForEncoding()->fromUnicode(string);
}
if(codecForEncoding()) {
return codecForEncoding()->fromUnicode(string);
}
@@
-186,10
+191,18
@@
void IrcUser::setAwayMessage(const QString &awayMessage) {
void IrcUser::setIdleTime(const QDateTime &idleTime) {
if(idleTime.isValid() && _idleTime != idleTime) {
_idleTime = idleTime;
void IrcUser::setIdleTime(const QDateTime &idleTime) {
if(idleTime.isValid() && _idleTime != idleTime) {
_idleTime = idleTime;
+ _idleTimeSet = QDateTime::currentDateTime();
emit idleTimeSet(idleTime);
}
}
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;
void IrcUser::setServer(const QString &server) {
if(!server.isEmpty() && _server != server) {
_server = server;
@@
-227,12
+240,7
@@
void IrcUser::setNick(const QString &nick) {
}
void IrcUser::updateObjectName() {
}
void IrcUser::updateObjectName() {
- QString newName = QString::number(network()->networkId().toInt()) + "/" + _nick;
- QString oldName = objectName();
- if(oldName != newName) {
- setObjectName(newName);
- emit renameObject(oldName, newName);
- }
+ renameObject(QString::number(network()->networkId().toInt()) + "/" + _nick);
}
void IrcUser::updateHostmask(const QString &mask) {
}
void IrcUser::updateHostmask(const QString &mask) {
@@
-249,9
+257,8
@@
void IrcUser::joinChannel(IrcChannel *channel) {
Q_ASSERT(channel);
if(!_channels.contains(channel)) {
_channels.insert(channel);
Q_ASSERT(channel);
if(!_channels.contains(channel)) {
_channels.insert(channel);
- channel->join(this);
+ channel->join
IrcUsers
(this);
connect(channel, SIGNAL(destroyed()), this, SLOT(channelDestroyed()));
connect(channel, SIGNAL(destroyed()), this, SLOT(channelDestroyed()));
- emit channelJoined(channel->name());
}
}
}
}
@@
-265,6
+272,8
@@
void IrcUser::partChannel(IrcChannel *channel) {
disconnect(channel, 0, this, 0);
channel->part(this);
emit channelParted(channel->name());
disconnect(channel, 0, this, 0);
channel->part(this);
emit channelParted(channel->name());
+ if(_channels.isEmpty() && network()->isMe(this))
+ deleteLater();
}
}
}
}
@@
-280,10
+289,10
@@
void IrcUser::partChannel(const QString &channelname) {
void IrcUser::channelDestroyed() {
// private slot!
IrcChannel *channel = static_cast<IrcChannel*>(sender());
void IrcUser::channelDestroyed() {
// private slot!
IrcChannel *channel = static_cast<IrcChannel*>(sender());
- Q_ASSERT(channel);
if(_channels.contains(channel)) {
_channels.remove(channel);
if(_channels.contains(channel)) {
_channels.remove(channel);
- disconnect(channel, 0, this, 0);
+ if(_channels.isEmpty())
+ deleteLater();
}
}
}
}
@@
-292,23
+301,24
@@
void IrcUser::setUserModes(const QString &modes) {
emit userModesSet(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);
}
}
-