return isTopic? cipher->decryptTopic(message) : cipher->decrypt(message);
#else
+ Q_UNUSED(network);
+ Q_UNUSED(bufferName);
+ Q_UNUSED(isTopic);
return message;
#endif
}
msg = decrypt(net, target, msg);
- events << new IrcEventRawMessage(EventManager::IrcEventRawPrivmsg, net, prefix, target, msg);
+ events << new IrcEventRawMessage(EventManager::IrcEventRawPrivmsg, net, msg, prefix, target, e->timestamp());
}
}
break;
CoreIrcChannel *chan = static_cast<CoreIrcChannel *>(net->ircChannel(channelname)); // we only have CoreIrcChannels in the core, so this cast is safe
if(chan && !chan->receivedWelcomeMsg()) {
chan->setReceivedWelcomeMsg();
- events << new MessageEvent(Message::Notice, net, decMsg, channelname, prefix);
+ events << new MessageEvent(Message::Notice, net, decMsg, prefix, channelname, Message::None, e->timestamp());
continue;
}
}
if(!net->isChannelName(target))
target = nickFromMask(prefix);
}
- events << new IrcEventRawMessage(EventManager::IrcEventRawNotice, net, prefix, target, msg);
+ events << new IrcEventRawMessage(EventManager::IrcEventRawNotice, net, params[1], prefix, target, e->timestamp());
}
}
break;
break;
case EventManager::IrcEventTopic:
- if(params.count() >= 2) {
+ if(params.count() >= 1) {
QString channel = net->serverDecode(params.at(0));
decParams << channel;
- decParams << net->channelDecode(channel, decrypt(net, channel, params.at(1), true));
+ decParams << (params.count() >= 2? net->channelDecode(channel, decrypt(net, channel, params.at(1), true)) : QString());
}
break;
else
event = new IrcEvent(type, net, prefix);
event->setParams(decParams);
+ event->setTimestamp(e->timestamp());
events << event;
}