X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=network%2Fserver.h;h=03e33aab8b336da27c65a6b3f478abca06f15e56;hp=48bce3ed955287b282f95a3dd35f589055958af7;hb=11ee1cf78677b51d8fea2749e8501216a831dfd7;hpb=3b9bdf4f134a8c4399fef776911434aa2b76f934 diff --git a/network/server.h b/network/server.h index 48bce3ed..03e33aab 100644 --- a/network/server.h +++ b/network/server.h @@ -86,15 +86,28 @@ class Server : public QThread { /* Message Handlers */ - /* void handleUser(QString, Buffer *) */ - void handleUserJoin(QString, Buffer *); - void handleUserQuote(QString, Buffer *); - void handleUserSay(QString, Buffer *); - + /* void handleUser(QString, QString); */ + void handleUserAway(QString, QString); + void handleUserDeop(QString, QString); + void handleUserDevoice(QString, QString); + void handleUserInvite(QString, QString); + void handleUserJoin(QString, QString); + void handleUserKick(QString, QString); + void handleUserList(QString, QString); + void handleUserMode(QString, QString); + void handleUserMsg(QString, QString); + void handleUserNick(QString, QString); + void handleUserOp(QString, QString); + void handleUserPart(QString, QString); + void handleUserQuit(QString, QString); + void handleUserQuote(QString, QString); + void handleUserSay(QString, QString); + void handleUserVoice(QString, QString); /* void handleServer(QString, QStringList); */ void handleServerJoin(QString, QStringList); void handleServerKick(QString, QStringList); + void handleServerMode(QString, QStringList); void handleServerNick(QString, QStringList); void handleServerNotice(QString, QStringList); void handleServerPart(QString, QStringList); @@ -103,27 +116,29 @@ class Server : public QThread { void handleServerQuit(QString, QStringList); void handleServer001(QString, QStringList); // RPL_WELCOME + void handleServer005(QString, QStringList); // RPL_ISUPPORT void handleServer331(QString, QStringList); // RPL_NOTOPIC void handleServer332(QString, QStringList); // RPL_TOPIC void handleServer333(QString, QStringList); // Topic set by... void handleServer353(QString, QStringList); // RPL_NAMREPLY void defaultServerHandler(QString cmd, QString prefix, QStringList params); - void defaultUserHandler(QString cmd, QString msg, Buffer *buf); + void defaultUserHandler(QString buf, QString cmd, QString msg); private: QString network; QTcpSocket socket; - QHash buffers; + //QHash buffers; QString currentNick; QString currentServer; VarMap networkSettings; VarMap identity; VarMap nicks; // stores all known nicks for the server + VarMap serverSupports; // stores results from RPL_ISUPPORT void handleServerMsg(QString rawMsg); - void handleUserMsg(QString buffer, QString usrMsg); + void handleUserInput(QString buffer, QString usrMsg); QString updateNickFromMask(QString mask);