***************************************************************************/
#include "ctcphandler.h"
+#include "global.h"
#include "util.h"
#include "message.h"
return dequotedMessage;
}
-QStringList CtcpHandler::parse(CtcpType ctcptype, QString prefix, QString target, QString message) {
- QStringList messages;
+void CtcpHandler::parse(Message::Type messageType, QString prefix, QString target, QString message) {
QString ctcp;
//lowlevel message dequote
QString dequotedMessage = dequote(message);
-
+
+ CtcpType ctcptype = (messageType == Message::Notice)
+ ? CtcpReply
+ : CtcpQuery;
+
// extract tagged / extended data
while(dequotedMessage.contains(XDELIM)) {
- if(dequotedMessage.indexOf(XDELIM) > 0)
- messages << dequotedMessage.section(XDELIM,0,0);
+ if(dequotedMessage.indexOf(XDELIM) > 0)
+ emit displayMsg(messageType, target, dequotedMessage.section(XDELIM,0,0), prefix);
+ // messages << dequotedMessage.section(XDELIM,0,0), prefix);
ctcp = XdelimDequote(dequotedMessage.section(XDELIM,1,1));
dequotedMessage = dequotedMessage.section(XDELIM,2,2);
handle(ctcpcmd, Q_ARG(CtcpType, ctcptype), Q_ARG(QString, prefix), Q_ARG(QString, target), Q_ARG(QString, ctcpparam));
}
- if(!dequotedMessage.isEmpty()) {
- messages << dequotedMessage;
- }
- return messages;
+
+ if(!dequotedMessage.isEmpty())
+ emit displayMsg(messageType, target, dequotedMessage, prefix);
+
}
QString CtcpHandler::pack(QString ctcpTag, QString message) {
Q_UNUSED(target)
if(ctcptype == CtcpQuery) {
// FIXME use real Info about quassel :)
- reply(nickFromMask(prefix), "VERSION", QString("Quassel IRC (Pre-Release) - http://www.quassel-irc.org"));
+ reply(nickFromMask(prefix), "VERSION", QString("Quassel IRC (v%1 build >= %2) -- http://www.quassel-irc.org")
+ .arg(Global::quasselVersion).arg(Global::quasselBuild));
emit displayMsg(Message::Server, "", tr("Received CTCP VERSION request by %1").arg(prefix));
} else {
// display Version answer