X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.cpp;h=3fd0ad5e75f405e08afd6a833636b264a1994297;hp=eb63dd57da467f2cd6fbeda8081d2b683ca3f863;hb=a38400e87c5f729e083796af394643657fbc9df5;hpb=56607f81246f04db3a0e71c9a8757d7f75d6cfcf diff --git a/src/common/ircchannel.cpp b/src/common/ircchannel.cpp index eb63dd57..3fd0ad5e 100644 --- a/src/common/ircchannel.cpp +++ b/src/common/ircchannel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,8 +21,6 @@ #include "ircchannel.h" #include "network.h" -//#include "nicktreemodel.h" -#include "signalproxy.h" #include "ircuser.h" #include "util.h" @@ -32,8 +30,9 @@ #include - -IrcChannel::IrcChannel(const QString &channelname, Network *network) : SyncableObject(network), +INIT_SYNCABLE_OBJECT(IrcChannel) +IrcChannel::IrcChannel(const QString &channelname, Network *network) + : SyncableObject(network), _initialized(false), _name(channelname), _topic(QString()), @@ -117,12 +116,13 @@ QByteArray IrcChannel::encodeString(const QString &string) const { // ==================== void IrcChannel::setTopic(const QString &topic) { _topic = topic; + SYNC(ARG(topic)) emit topicSet(topic); } void IrcChannel::setPassword(const QString &password) { _password = password; - emit passwordSet(password); + SYNC(ARG(password)) } void IrcChannel::joinIrcUsers(const QList &users, const QStringList &modes) { @@ -141,14 +141,16 @@ void IrcChannel::joinIrcUsers(const QList &users, const QStringList & IrcUser *ircuser; for(int i = 0; i < users.count(); i++) { ircuser = users[i]; - if(!ircuser || _userModes.contains(ircuser)) + if(!ircuser || _userModes.contains(ircuser)) { + addUserMode(ircuser, modes[i]); continue; + } _userModes[ircuser] = modes[i]; ircuser->joinChannel(this); - //qDebug() << "JOIN" << name() << ircuser->nick() << ircUsers().count(); connect(ircuser, SIGNAL(nickSet(QString)), this, SLOT(ircUserNickSet(QString))); - connect(ircuser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); + + // connect(ircuser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); // if you wonder why there is no counterpart to ircUserJoined: // the joines are propagted by the ircuser. the signal ircUserJoined is only for convenience @@ -159,9 +161,9 @@ void IrcChannel::joinIrcUsers(const QList &users, const QStringList & if(newNicks.isEmpty()) return; - + + SYNC_OTHER(joinIrcUsers, ARG(newNicks), ARG(newModes)); emit ircUsersJoined(newUsers); - emit ircUsersJoined(newNicks, newModes); } void IrcChannel::joinIrcUsers(const QStringList &nicks, const QStringList &modes) { @@ -171,7 +173,7 @@ void IrcChannel::joinIrcUsers(const QStringList &nicks, const QStringList &modes joinIrcUsers(users, modes); } -void IrcChannel::joinIrcUsers(IrcUser *ircuser) { +void IrcChannel::joinIrcUser(IrcUser *ircuser) { QList users; users << ircuser; QStringList modes; @@ -179,21 +181,27 @@ void IrcChannel::joinIrcUsers(IrcUser *ircuser) { joinIrcUsers(users, modes); } -void IrcChannel::joinIrcUsers(const QString &nick) { - joinIrcUsers(network->newIrcUser(nick)); -} - void IrcChannel::part(IrcUser *ircuser) { if(isKnownUser(ircuser)) { _userModes.remove(ircuser); ircuser->partChannel(this); - //qDebug() << "PART" << name() << ircuser->nick() << ircUsers().count(); // if you wonder why there is no counterpart to ircUserParted: // the joines are propagted by the ircuser. the signal ircUserParted is only for convenience disconnect(ircuser, 0, this, 0); emit ircUserParted(ircuser); - if(network->isMe(ircuser)) - deleteLater(); + + if(network->isMe(ircuser) || _userModes.isEmpty()) { + // in either case we're no longer in the channel + // -> clean up the channel and destroy it + QList users = _userModes.keys(); + _userModes.clear(); + foreach(IrcUser *user, users) { + disconnect(user, 0, this, 0); + user->partChannel(this); + } + emit parted(); + network->removeIrcChannel(this); + } } } @@ -205,7 +213,8 @@ void IrcChannel::part(const QString &nick) { void IrcChannel::setUserModes(IrcUser *ircuser, const QString &modes) { if(isKnownUser(ircuser)) { _userModes[ircuser] = modes; - emit userModesSet(ircuser->nick(), modes); + QString nick = ircuser->nick(); + SYNC_OTHER(setUserModes, ARG(nick), ARG(modes)) emit ircUserModesSet(ircuser, modes); } } @@ -221,7 +230,8 @@ void IrcChannel::addUserMode(IrcUser *ircuser, const QString &mode) { if(!_userModes[ircuser].contains(mode)) { _userModes[ircuser] += mode; - emit userModeAdded(ircuser->nick(), mode); + QString nick = ircuser->nick(); + SYNC_OTHER(addUserMode, ARG(nick), ARG(mode)) emit ircUserModeAdded(ircuser, mode); } @@ -238,10 +248,10 @@ void IrcChannel::removeUserMode(IrcUser *ircuser, const QString &mode) { if(_userModes[ircuser].contains(mode)) { _userModes[ircuser].remove(mode); - emit userModeRemoved(ircuser->nick(), mode); + QString nick = ircuser->nick(); + SYNC_OTHER(removeUserMode, ARG(nick), ARG(mode)); emit ircUserModeRemoved(ircuser, mode); } - } void IrcChannel::removeUserMode(const QString &nick, const QString &mode) { @@ -260,11 +270,82 @@ QVariantMap IrcChannel::initUserModes() const { } void IrcChannel::initSetUserModes(const QVariantMap &usermodes) { - QMapIterator iter(usermodes); - while(iter.hasNext()) { - iter.next(); - setUserModes(iter.key(), iter.value().toString()); + QList users; + QStringList modes; + QVariantMap::const_iterator iter = usermodes.constBegin(); + while(iter != usermodes.constEnd()) { + users << network->newIrcUser(iter.key()); + modes << iter.value().toString(); + iter++; + } + joinIrcUsers(users, modes); +} + +QVariantMap IrcChannel::initChanModes() const { + QVariantMap channelModes; + + QVariantMap A_modes; + QHash::const_iterator A_iter = _A_channelModes.constBegin(); + while(A_iter != _A_channelModes.constEnd()) { + A_modes[A_iter.key()] = A_iter.value(); + A_iter++; + } + channelModes["A"] = A_modes; + + QVariantMap B_modes; + QHash::const_iterator B_iter = _B_channelModes.constBegin(); + while(B_iter != _B_channelModes.constEnd()) { + B_modes[B_iter.key()] = B_iter.value(); + B_iter++; } + channelModes["B"] = B_modes; + + QVariantMap C_modes; + QHash::const_iterator C_iter = _C_channelModes.constBegin(); + while(C_iter != _C_channelModes.constEnd()) { + C_modes[C_iter.key()] = C_iter.value(); + C_iter++; + } + channelModes["C"] = C_modes; + + QString D_modes; + QSet::const_iterator D_iter = _D_channelModes.constBegin(); + while(D_iter != _D_channelModes.constEnd()) { + D_modes += *D_iter; + D_iter++; + } + channelModes["D"] = D_modes; + + return channelModes; +} + +void IrcChannel::initSetChanModes(const QVariantMap &channelModes) { + QVariantMap::const_iterator iter = channelModes["A"].toMap().constBegin(); + QVariantMap::const_iterator iterEnd = channelModes["A"].toMap().constEnd(); + while(iter != iterEnd) { + _A_channelModes[iter.key()[0]] = iter.value().toStringList(); + iter++; + } + + iter = channelModes["B"].toMap().constBegin(); + iterEnd = channelModes["B"].toMap().constEnd(); + while(iter != iterEnd) { + _B_channelModes[iter.key()[0]] = iter.value().toString(); + iter++; + } + + iter = channelModes["C"].toMap().constBegin(); + iterEnd = channelModes["C"].toMap().constEnd(); + while(iter != iterEnd) { + _C_channelModes[iter.key()[0]] = iter.value().toString(); + iter++; + } + + QString D_modes = channelModes["D"].toString(); + for(int i = 0; i < D_modes.count(); i++) { + _D_channelModes << D_modes[i]; + } + } void IrcChannel::ircUserDestroyed() { @@ -281,3 +362,182 @@ void IrcChannel::ircUserNickSet(QString nick) { emit ircUserNickSet(ircUser, nick); } +/******************************************************************************* + * + * 3.3 CHANMODES + * + * o CHANMODES=A,B,C,D + * + * The CHANMODES token specifies the modes that may be set on a channel. + * These modes are split into four categories, as follows: + * + * o Type A: Modes that add or remove an address to or from a list. + * These modes always take a parameter when sent by the server to a + * client; when sent by a client, they may be specified without a + * parameter, which requests the server to display the current + * contents of the corresponding list on the channel to the client. + * o Type B: Modes that change a setting on the channel. These modes + * always take a parameter. + * o Type C: Modes that change a setting on the channel. These modes + * take a parameter only when set; the parameter is absent when the + * mode is removed both in the client's and server's MODE command. + * o Type D: Modes that change a setting on the channel. These modes + * never take a parameter. + * + * If the server sends any additional types after these 4, the client + * MUST ignore them; this is intended to allow future extension of this + * token. + * + * The IRC server MUST NOT list modes in CHANMODES which are also + * present in the PREFIX parameter; however, for completeness, modes + * described in PREFIX may be treated as type B modes. + * + ******************************************************************************/ + + +/******************************************************************************* + * Short Version: + * A --> add/remove from List + * B --> set value or remove + * C --> set value or remove + * D --> on/off + * + * B and C behave very similar... we store the data in different datastructes + * for future compatibility + ******************************************************************************/ + +// NOTE: the behavior of addChannelMode and removeChannelMode depends on the type of mode +// see list above for chanmode types +void IrcChannel::addChannelMode(const QChar &mode, const QString &value) { + Network::ChannelModeType modeType = network->channelModeType(mode); + + switch(modeType) { + case Network::NOT_A_CHANMODE: + return; + case Network::A_CHANMODE: + if(!_A_channelModes.contains(mode)) + _A_channelModes[mode] = QStringList(value); + else if(!_A_channelModes[mode].contains(value)) + _A_channelModes[mode] << value; + break; + + case Network::B_CHANMODE: + _B_channelModes[mode] = value; + break; + + case Network::C_CHANMODE: + _C_channelModes[mode] = value; + break; + + case Network::D_CHANMODE: + _D_channelModes << mode; + break; + } + SYNC(ARG(mode), ARG(value)) +} + +void IrcChannel::removeChannelMode(const QChar &mode, const QString &value) { + Network::ChannelModeType modeType = network->channelModeType(mode); + + switch(modeType) { + case Network::NOT_A_CHANMODE: + return; + case Network::A_CHANMODE: + if(_A_channelModes.contains(mode)) + _A_channelModes[mode].removeAll(value); + break; + + case Network::B_CHANMODE: + _B_channelModes.remove(mode); + break; + + case Network::C_CHANMODE: + _C_channelModes.remove(mode); + break; + + case Network::D_CHANMODE: + _D_channelModes.remove(mode); + break; + } + SYNC(ARG(mode), ARG(value)) +} + +bool IrcChannel::hasMode(const QChar &mode) const { + Network::ChannelModeType modeType = network->channelModeType(mode); + + switch(modeType) { + case Network::NOT_A_CHANMODE: + return false; + case Network::A_CHANMODE: + return _A_channelModes.contains(mode); + case Network::B_CHANMODE: + return _B_channelModes.contains(mode); + case Network::C_CHANMODE: + return _C_channelModes.contains(mode); + case Network::D_CHANMODE: + return _D_channelModes.contains(mode); + default: + return false; + } +} + +QString IrcChannel::modeValue(const QChar &mode) const { + Network::ChannelModeType modeType = network->channelModeType(mode); + + switch(modeType) { + case Network::B_CHANMODE: + if(_B_channelModes.contains(mode)) + return _B_channelModes[mode]; + else + return QString(); + case Network::C_CHANMODE: + if(_C_channelModes.contains(mode)) + return _C_channelModes[mode]; + else + return QString(); + default: + return QString(); + } + +} + +QStringList IrcChannel::modeValueList(const QChar &mode) const { + Network::ChannelModeType modeType = network->channelModeType(mode); + + switch(modeType) { + case Network::A_CHANMODE: + if(_A_channelModes.contains(mode)) + return _A_channelModes[mode]; + default: + return QStringList(); + } +} + +QString IrcChannel::channelModeString() const { + QStringList params; + QString modeString; + + QSet::const_iterator D_iter = _D_channelModes.constBegin(); + while(D_iter != _D_channelModes.constEnd()) { + modeString += *D_iter; + D_iter++; + } + + QHash::const_iterator BC_iter = _C_channelModes.constBegin(); + while(BC_iter != _C_channelModes.constEnd()) { + modeString += BC_iter.key(); + params << BC_iter.value(); + BC_iter++; + } + + BC_iter = _B_channelModes.constBegin(); + while(BC_iter != _B_channelModes.constEnd()) { + modeString += BC_iter.key(); + params << BC_iter.value(); + BC_iter++; + } + if(modeString.isEmpty()) + return modeString; + else + return QString("+%1 %2").arg(modeString).arg(params.join(" ")); +}