/***************************************************************************
- * Copyright (C) 2005-2019 by the Quassel Project *
+ * Copyright (C) 2005-2022 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "coresession.h"
#include "ctcpevent.h"
+#include "irctags.h"
#include "messageevent.h"
EventStringifier::EventStringifier(CoreSession* parent)
connect(this, &EventStringifier::newMessageEvent, coreSession()->eventManager(), &EventManager::postEvent);
}
-void EventStringifier::displayMsg(
- NetworkEvent* event, Message::Type msgType, const QString& msg, const QString& sender, const QString& target, Message::Flags msgFlags)
+void EventStringifier::displayMsg(NetworkEvent* event,
+ Message::Type msgType,
+ QString msg,
+ QString sender,
+ QString target,
+ Message::Flags msgFlags)
{
if (event->flags().testFlag(EventManager::Silent))
return;
- MessageEvent* msgEvent = createMessageEvent(event, msgType, msg, sender, target, msgFlags);
+ MessageEvent* msgEvent = createMessageEvent(event, msgType, std::move(msg), std::move(sender), std::move(target), msgFlags);
// sendMessageEvent(msgEvent);
emit newMessageEvent(msgEvent);
}
-MessageEvent* EventStringifier::createMessageEvent(
- NetworkEvent* event, Message::Type msgType, const QString& msg, const QString& sender, const QString& target, Message::Flags msgFlags)
+MessageEvent* EventStringifier::createMessageEvent(NetworkEvent* event,
+ Message::Type msgType,
+ QString msg,
+ QString sender,
+ QString target,
+ Message::Flags msgFlags)
{
- MessageEvent* msgEvent = new MessageEvent(msgType, event->network(), msg, sender, target, msgFlags);
- msgEvent->setTimestamp(event->timestamp());
+ MessageEvent* msgEvent = new MessageEvent(msgType, event->network(), std::move(msg), std::move(sender), std::move(target), msgFlags, event->timestamp());
return msgEvent;
}
<< "params, got: " << e->params();
}
else {
- QString name = coreSession()->eventManager()->enumName(e->type());
+ QString name = EventManager::enumName(e->type());
qWarning() << qPrintable(name) << "requires" << minParams << "params, got:" << e->params();
}
e->stop();
void EventStringifier::processIrcEventInvite(IrcEvent* e)
{
- displayMsg(e, Message::Invite, tr("%1 invited you to channel %2").arg(e->nick(), e->params().at(1)));
+ if (!checkParamCount(e, 2))
+ return;
+
+ // TODO: provide a nicer UI for invite notifications
+ QString target = e->params().at(0);
+ QString channel = e->params().at(1);
+ if (e->network()->isMyNick(target)) {
+ displayMsg(e, Message::Invite, tr("%1 invited you to channel %2").arg(e->nick(), channel));
+ }
+ else {
+ displayMsg(e, Message::Invite, tr("%1 invited %2 to channel %3").arg(e->nick(), target, channel));
+ }
}
void EventStringifier::processIrcEventJoin(IrcEvent* e)
}
// Announce to all channels the IrcUser is in
- foreach (const QString& channel, ircuser->channels()) {
+ for (const QString& channel : ircuser->channels()) {
displayMsg(e, Message::Nick, newnick, sender, channel, msgFlags);
}
}
}
// Announce to all channels the IrcUser is in
- foreach (const QString& channel, ircuser->channels()) {
+ for (const QString& channel : ircuser->channels()) {
displayMsg(e, Message::Quit, e->params().count() ? e->params().first() : QString(), e->prefix(), channel, msgFlags);
}
}
{
int idleSecs = e->params()[1].toInt();
- if (e->params().count() > 3) { // if we have more then 3 params we have the above mentioned "real life" situation
- // Time in IRC protocol is defined as seconds. Convert from seconds instead.
- // See https://doc.qt.io/qt-5/qdatetime.html#fromSecsSinceEpoch
+ if (e->params().count() > 3) {
+ // if we have more then 3 params we have the above mentioned "real life" situation
+ // Time in IRC protocol is defined as seconds. Convert from seconds instead.
+ // See https://doc.qt.io/qt-5/qdatetime.html#fromSecsSinceEpoch
#if QT_VERSION >= 0x050800
QDateTime loginTime = QDateTime::fromSecsSinceEpoch(e->params()[2].toLongLong()).toUTC();
#else
QStringList op;
QStringList voice;
QStringList user;
- foreach (QString channel, e->params().last().split(" ")) {
+ for (QString channel : e->params().last().split(" ")) {
if (channel.startsWith("@"))
op.append(channel.remove(0, 1));
else if (channel.startsWith("+"))
if (e->type() != EventManager::CtcpEvent)
return;
- if (e->testFlag(EventManager::Self)) {
+ // Only stringify outgoing CTCP messages this way
+ if (e->testFlag(EventManager::Self) &&
+ // Only stringify CTCP queries this way
+ e->ctcpType() == CtcpEvent::CtcpType::Query &&
+ // Always handle ACTIONs as if they were sent from network, to properly handle echo-message
+ e->ctcpCmd() != "ACTION") {
displayMsg(e,
Message::Action,
tr("sending CTCP-%1 request to %2").arg(e->ctcpCmd(), e->target()),
//: Optional "unknown" in "Received unknown CTCP-FOO request by bar"
unknown = tr("unknown") + ' ';
displayMsg(e, Message::Server, tr("Received %1CTCP-%2 request by %3").arg(unknown, e->ctcpCmd(), e->prefix()));
- return;
+ } else {
+ // Ignore echo messages for our own answers
+ if (!e->testFlag(EventManager::Self)) {
+ displayMsg(e, Message::Server,
+ tr("Received CTCP-%1 answer from %2: %3").arg(e->ctcpCmd(), nickFromMask(e->prefix()),e->param()));
+ }
}
- displayMsg(e, Message::Server, tr("Received CTCP-%1 answer from %2: %3").arg(e->ctcpCmd(), nickFromMask(e->prefix()), e->param()));
}
void EventStringifier::handleCtcpAction(CtcpEvent* e)
{
- displayMsg(e, Message::Action, e->param(), e->prefix(), e->target());
+ Message::Flag msgFlags = Message::Flag::None;
+ if (e->testFlag(EventManager::Self)) {
+ // Mark the message as Self
+ msgFlags = Message::Self;
+ }
+
+ displayMsg(e, Message::Action, e->param(), e->prefix(), e->target(), msgFlags);
}
void EventStringifier::handleCtcpPing(CtcpEvent* e)
projects / quassel.git / blobdiff