#include <QMetaMethod>
-#include "networkconnection.h"
+#include "util.h"
+#include "logger.h"
BasicHandler::BasicHandler(NetworkConnection *parent)
: QObject(parent),
_networkConnection(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, QString, QString, QString, Message::Flags)),
+ networkConnection(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, 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 &)),
+ networkConnection(), SLOT(putCmd(QString, const QList<QByteArray> &, const QByteArray &)));
connect(this, SIGNAL(putRawLine(const QByteArray &)),
networkConnection(), SLOT(putRawLine(const QByteArray &)));
// ====================
// 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, QString text, 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);
}