/***************************************************************************
- * 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 *
#include <QMetaMethod>
-#include "networkconnection.h"
+#include "util.h"
+#include "logger.h"
-BasicHandler::BasicHandler(NetworkConnection *parent)
+BasicHandler::BasicHandler(CoreNetwork *parent)
: QObject(parent),
defaultHandler(-1),
- _networkConnection(parent),
+ _network(parent),
initDone(false)
{
- connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)),
- networkConnection(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
+ connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)),
+ network(), SLOT(displayMsg(Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)));
- connect(this, SIGNAL(putCmd(QString, const QVariantList &, const QByteArray &)),
- networkConnection(), SLOT(putCmd(QString, const QVariantList &, const QByteArray &)));
+ connect(this, SIGNAL(putCmd(QString, const QList<QByteArray> &, const QByteArray &)),
+ network(), SLOT(putCmd(QString, const QList<QByteArray> &, const QByteArray &)));
connect(this, SIGNAL(putRawLine(const QByteArray &)),
- networkConnection(), SLOT(putRawLine(const QByteArray &)));
+ network(), SLOT(putRawLine(const QByteArray &)));
}
QStringList BasicHandler::providesHandlers() {
}
QString BasicHandler::serverDecode(const QByteArray &string) {
- return networkConnection()->serverDecode(string);
+ return network()->serverDecode(string);
}
QStringList BasicHandler::serverDecode(const QList<QByteArray> &stringlist) {
QStringList list;
- foreach(QByteArray s, stringlist) list << networkConnection()->serverDecode(s);
+ foreach(QByteArray s, stringlist) list << network()->serverDecode(s);
return list;
}
-QString BasicHandler::bufferDecode(const QString &bufferName, const QByteArray &string) {
- return networkConnection()->bufferDecode(bufferName, string);
+QString BasicHandler::channelDecode(const QString &bufferName, const QByteArray &string) {
+ return network()->channelDecode(bufferName, string);
}
-QStringList BasicHandler::bufferDecode(const QString &bufferName, const QList<QByteArray> &stringlist) {
+QStringList BasicHandler::channelDecode(const QString &bufferName, const QList<QByteArray> &stringlist) {
QStringList list;
- foreach(QByteArray s, stringlist) list << networkConnection()->bufferDecode(bufferName, s);
+ foreach(QByteArray s, stringlist) list << network()->channelDecode(bufferName, s);
return list;
}
QString BasicHandler::userDecode(const QString &userNick, const QByteArray &string) {
- return networkConnection()->userDecode(userNick, string);
+ return network()->userDecode(userNick, string);
}
QStringList BasicHandler::userDecode(const QString &userNick, const QList<QByteArray> &stringlist) {
QStringList list;
- foreach(QByteArray s, stringlist) list << networkConnection()->userDecode(userNick, s);
+ foreach(QByteArray s, stringlist) list << network()->userDecode(userNick, s);
return list;
}
/*** ***/
QByteArray BasicHandler::serverEncode(const QString &string) {
- return networkConnection()->serverEncode(string);
+ return network()->serverEncode(string);
}
QList<QByteArray> BasicHandler::serverEncode(const QStringList &stringlist) {
QList<QByteArray> list;
- foreach(QString s, stringlist) list << networkConnection()->serverEncode(s);
+ foreach(QString s, stringlist) list << network()->serverEncode(s);
return list;
}
-QByteArray BasicHandler::bufferEncode(const QString &bufferName, const QString &string) {
- return networkConnection()->bufferEncode(bufferName, string);
+QByteArray BasicHandler::channelEncode(const QString &bufferName, const QString &string) {
+ return network()->channelEncode(bufferName, string);
}
-QList<QByteArray> BasicHandler::bufferEncode(const QString &bufferName, const QStringList &stringlist) {
+QList<QByteArray> BasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist) {
QList<QByteArray> list;
- foreach(QString s, stringlist) list << networkConnection()->bufferEncode(bufferName, s);
+ foreach(QString s, stringlist) list << network()->channelEncode(bufferName, s);
return list;
}
QByteArray BasicHandler::userEncode(const QString &userNick, const QString &string) {
- return networkConnection()->userEncode(userNick, string);
+ return network()->userEncode(userNick, string);
}
QList<QByteArray> BasicHandler::userEncode(const QString &userNick, const QStringList &stringlist) {
QList<QByteArray> list;
- foreach(QString s, stringlist) list << networkConnection()->userEncode(userNick, s);
+ foreach(QString s, stringlist) list << network()->userEncode(userNick, s);
return list;
}
// ====================
// protected:
// ====================
-
-Network *BasicHandler::network() const {
- return networkConnection()->network();
-}
-
-NetworkConnection *BasicHandler::networkConnection() const {
- return _networkConnection;
-}
-
BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const {
if(target.isEmpty())
return BufferInfo::StatusBuffer;
}
void BasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix) {
- QVariantList list;
+ QList<QByteArray> list;
list << param;
emit putCmd(cmd, list, prefix);
}
-void BasicHandler::putCmd(const QString &cmd, const QList<QByteArray> ¶ms, const QByteArray &prefix) {
- QVariantList list;
- foreach(QByteArray param, params) list << param;
- emit putCmd(cmd, list, prefix);
+void BasicHandler::displayMsg(Message::Type msgType, QString target, const QString &text, const QString &sender, Message::Flags flags) {
+ if(!target.isEmpty() && network()->prefixes().contains(target[0]))
+ target = target.mid(1);
+
+ IrcChannel *channel = network()->ircChannel(target);
+ if(!channel && (target.startsWith('$') || target.startsWith('#')))
+ target = nickFromMask(sender);
+
+ emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
}