#include "core.h"
#include "coresession.h"
+#include "ircchannel.h"
#include "ircuser.h"
#include "network.h"
#include "identity.h"
_ctcpHandler(new CtcpHandler(this)),
_previousState(state)
{
- connect(network, SIGNAL(currentServerSet(const QString &)), this, SLOT(networkInitialized()));
+ connect(network, SIGNAL(currentServerSet(const QString &)), this, SLOT(networkInitialized(const QString &)));
connect(&socket, SIGNAL(connected()), this, SLOT(socketConnected()));
connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
return network()->networkName();
}
+Identity *NetworkConnection::identity() const {
+ return coreSession()->identity(network()->identity());
+}
+
Network *NetworkConnection::network() const {
return _network;
}
}
QString NetworkConnection::serverDecode(const QByteArray &string) const {
- return network()->decodeString(string);
+ return network()->decodeServerString(string);
}
-QString NetworkConnection::bufferDecode(const QString &bufferName, const QByteArray &string) const {
- Q_UNUSED(bufferName);
- // TODO: Implement buffer-specific encodings
+QString NetworkConnection::channelDecode(const QString &bufferName, const QByteArray &string) const {
+ if(!bufferName.isEmpty()) {
+ IrcChannel *channel = network()->ircChannel(bufferName);
+ if(channel) return channel->decodeString(string);
+ }
return network()->decodeString(string);
}
}
QByteArray NetworkConnection::serverEncode(const QString &string) const {
- return network()->encodeString(string);
+ return network()->encodeServerString(string);
}
-QByteArray NetworkConnection::bufferEncode(const QString &bufferName, const QString &string) const {
- Q_UNUSED(bufferName);
- // TODO: Implement buffer-specific encodings
+QByteArray NetworkConnection::channelEncode(const QString &bufferName, const QString &string) const {
+ if(!bufferName.isEmpty()) {
+ IrcChannel *channel = network()->ircChannel(bufferName);
+ if(channel) return channel->encodeString(string);
+ }
return network()->encodeString(string);
}
socket.connectToHost(host, port);
}
-void NetworkConnection::networkInitialized() {
+void NetworkConnection::networkInitialized(const QString ¤tServer) {
+ if(currentServer.isEmpty()) return;
+
sendPerform();
// rejoin channels we've been in
QStringList chans = _previousState.toStringList();
if(chans.count() > 0) {
qDebug() << "autojoining" << chans;
- QString list = chans.join(",");
- putCmd("join", QStringList(list)); // FIXME check for 512 byte limit!
+ QVariantList list;
+ foreach(QString chan, chans) list << serverEncode(chan);
+ putCmd("JOIN", list); // FIXME check for 512 byte limit!
}
// delete _previousState, we won't need it again
_previousState = QVariant();
}
void NetworkConnection::sendPerform() {
- // TODO: reimplement perform List!
- //// send performlist
- //QStringList performList = networkSettings["Perform"].toString().split( "\n" );
- //int count = performList.count();
- //for(int a = 0; a < count; a++) {
- // if(!performList[a].isEmpty() ) {
- // userInput(network, "", performList[a]);
- // }
- //}
-
+ BufferInfo statusBuf = Core::bufferInfo(coreSession()->user(), network()->networkId(), BufferInfo::StatusBuffer);
+ // do auto identify
+ if(network()->useAutoIdentify() && !network()->autoIdentifyService().isEmpty() && !network()->autoIdentifyPassword().isEmpty()) {
+ userInputHandler()->handleMsg(statusBuf, QString("%1 IDENTIFY %2").arg(network()->autoIdentifyService(), network()->autoIdentifyPassword()));
+ }
+ // send perform list
+ foreach(QString line, network()->perform()) {
+ if(!line.isEmpty()) userInput(statusBuf, line);
+ }
}
QVariant NetworkConnection::state() const {
}
void NetworkConnection::disconnectFromIrc() {
- socket.disconnectFromHost();
+ if(socket.state() < QAbstractSocket::ConnectedState) {
+ setConnectionState(Network::Disconnected);
+ socketDisconnected();
+ } else socket.disconnectFromHost();
}
void NetworkConnection::socketHasData() {
disconnectFromIrc();
return;
}
- putRawLine(QString("NICK :%1").arg(identity->nicks()[0])); // FIXME: try more nicks if error occurs
- putRawLine(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName()));
+ putRawLine(serverEncode(QString("NICK :%1").arg(identity->nicks()[0]))); // FIXME: try more nicks if error occurs
+ putRawLine(serverEncode(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName())));
}
void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState socketState) {
userInputHandler()->handleUserInput(buf, msg);
}
-void NetworkConnection::putRawLine(QString s) {
+void NetworkConnection::putRawLine(QByteArray s) {
s += "\r\n";
- socket.write(s.toAscii());
+ socket.write(s);
}
-void NetworkConnection::putCmd(QString cmd, QStringList params, QString prefix) {
- QString msg;
+void NetworkConnection::putCmd(const QString &cmd, const QVariantList ¶ms, const QByteArray &prefix) {
+ QByteArray msg;
if(!prefix.isEmpty())
msg += ":" + prefix + " ";
- msg += cmd.toUpper();
-
+ msg += cmd.toUpper().toAscii();
+
for(int i = 0; i < params.size() - 1; i++) {
- msg += " " + params[i];
+ msg += " " + params[i].toByteArray();
}
if(!params.isEmpty())
- msg += " :" + params.last();
+ msg += " :" + params.last().toByteArray();
putRawLine(msg);
}