chatterino2
Code Issues

fix: use serverReceivedTime over parseTime for stacking (#5824)

Browse Source
This commit is contained in:
nerix
2025-01-19 13:37:58 +01:00
committed by GitHub
parent f85543381f
commit c1959259ce
19 changed files with 776 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Channel.cpp
+2 -2
View File
@@ -123,7 +123,7 @@ void Channel::addSystemMessage(const QString &contents)
this->addMessage(msg, MessageContext::Original);
}
void Channel::addOrReplaceTimeout(MessagePtr message, QTime now)
void Channel::addOrReplaceTimeout(MessagePtr message, const QDateTime &now)
{
addOrReplaceChannelTimeout(
this->getMessageSnapshot(), std::move(message), now,
@@ -139,7 +139,7 @@ void Channel::addOrReplaceTimeout(MessagePtr message, QTime now)
// WindowManager::instance().repaintVisibleChatWidgets(this);
}
void Channel::addOrReplaceClearChat(MessagePtr message, QTime now)
void Channel::addOrReplaceClearChat(MessagePtr message, const QDateTime &now)
{
addOrReplaceChannelClear(
this->getMessageSnapshot(), std::move(message), now,
src/common/Channel.hpp
+2 -2
View File
@@ -91,8 +91,8 @@ public:
/// Inserts the given messages in order by Message::serverReceivedTime.
void fillInMissingMessages(const std::vector<MessagePtr> &messages);
void addOrReplaceTimeout(MessagePtr message, QTime now) final;
void addOrReplaceClearChat(MessagePtr message, QTime now) final;
void addOrReplaceTimeout(MessagePtr message, const QDateTime &now) final;
void addOrReplaceClearChat(MessagePtr message, const QDateTime &now) final;
void disableAllMessages() final;
void replaceMessage(const MessagePtr &message,
const MessagePtr &replacement);
src/messages/MessageBuilder.cpp
+9 -7
View File
@@ -634,7 +634,7 @@ MessagePtrMut MessageBuilder::makeSubgiftMessage(const QString &text,
MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &timeoutUser,
const QString &sourceUser,
const QString &systemMessageText, int times,
const QTime &time)
const QDateTime &time)
: MessageBuilder()
{
QString usernameText = systemMessageText.split(" ").at(0);
@@ -643,7 +643,7 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &timeoutUser,
usernameText == "You" || timeoutUser == usernameText;
QString messageText;
this->emplace<TimestampElement>(time);
this->emplace<TimestampElement>(time.time());
this->emplaceSystemTextAndUpdate(usernameText, messageText)
->setLink(
{Link::UserInfo, timeoutUserIsFirst ? timeoutUser : sourceUser});
@@ -670,17 +670,18 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &timeoutUser,
this->message().messageText = messageText;
this->message().searchText = messageText;
this->message().serverReceivedTime = time;
}
MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username,
const QString &durationInSeconds,
bool multipleTimes, const QTime &time)
bool multipleTimes, const QDateTime &time)
: MessageBuilder()
{
QString fullText;
QString text;
this->emplace<TimestampElement>(time);
this->emplace<TimestampElement>(time.time());
this->emplaceSystemTextAndUpdate(username, fullText)
->setLink({Link::UserInfo, username});
@@ -718,6 +719,7 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username,
this->emplaceSystemTextAndUpdate(text, fullText);
this->message().messageText = fullText;
this->message().searchText = fullText;
this->message().serverReceivedTime = time;
}
MessageBuilder::MessageBuilder(const BanAction &action, uint32_t count)
@@ -1987,14 +1989,14 @@ MessagePtr MessageBuilder::makeLowTrustUpdateMessage(
return builder.release();
}
MessagePtrMut MessageBuilder::makeClearChatMessage(QTime now,
MessagePtrMut MessageBuilder::makeClearChatMessage(const QDateTime &now,
const QString &actor,
uint32_t count)
{
MessageBuilder builder;
builder.emplace<TimestampElement>(now);
builder.emplace<TimestampElement>(now.time());
builder->count = count;
builder->parseTime = now;
builder->serverReceivedTime = now;
builder.message().flags.set(MessageFlag::System,
MessageFlag::DoNotTriggerNotification,
MessageFlag::ClearChat);
src/messages/MessageBuilder.hpp
+4 -3
View File
@@ -108,10 +108,10 @@ public:
const QTime &time = QTime::currentTime());
MessageBuilder(TimeoutMessageTag, const QString &timeoutUser,
const QString &sourceUser, const QString &systemMessageText,
int times, const QTime &time = QTime::currentTime());
int times, const QDateTime &time);
MessageBuilder(TimeoutMessageTag, const QString &username,
const QString &durationInSeconds, bool multipleTimes,
const QTime &time = QTime::currentTime());
const QDateTime &time);
MessageBuilder(const BanAction &action, uint32_t count = 1);
MessageBuilder(const UnbanAction &action);
MessageBuilder(const WarnAction &action);
@@ -261,7 +261,8 @@ public:
/// "Chat has been cleared by a moderator." or "{actor} cleared the chat."
/// @param actor The user who cleared the chat (empty if unknown)
/// @param count How many times this message has been received already
static MessagePtrMut makeClearChatMessage(QTime now, const QString &actor,
static MessagePtrMut makeClearChatMessage(const QDateTime &now,
const QString &actor,
uint32_t count = 1);
private:
src/messages/MessageSink.hpp
+3 -3
View File
@@ -8,7 +8,7 @@
#include <optional>
class QStringView;
class QTime;
class QDateTime;
namespace chatterino {
@@ -46,12 +46,12 @@ public:
/// Adds a timeout message or merges it into an existing one
virtual void addOrReplaceTimeout(MessagePtr clearchatMessage,
QTime now) = 0;
const QDateTime &now) = 0;
/// Adds a clear chat message (for the entire chat) or merges it into an
/// existing one
virtual void addOrReplaceClearChat(MessagePtr clearchatMessage,
QTime now) = 0;
const QDateTime &now) = 0;
/// Flags all messages as `Disabled`
virtual void disableAllMessages() = 0;
src/providers/twitch/IrcMessageHandler.cpp
+4 -4
View File
@@ -198,7 +198,7 @@ std::optional<ClearChatMessage> parseClearChatMessage(
{
return ClearChatMessage{
.message = MessageBuilder::makeClearChatMessage(
calculateMessageTime(message).time(), {}),
calculateMessageTime(message), {}),
.disableAllMessages = true,
};
}
@@ -214,7 +214,7 @@ std::optional<ClearChatMessage> parseClearChatMessage(
auto timeoutMsg =
MessageBuilder(timeoutMessage, username, durationInSeconds, false,
calculateMessageTime(message).time())
calculateMessageTime(message))
.release();
return ClearChatMessage{.message = timeoutMsg, .disableAllMessages = false};
@@ -319,7 +319,7 @@ void IrcMessageHandler::parseMessageInto(Communi::IrcMessage *message,
return;
}
auto &clearChat = *cc;
auto time = calculateMessageTime(message).time();
auto time = calculateMessageTime(message);
if (clearChat.disableAllMessages)
{
sink.addOrReplaceClearChat(std::move(clearChat.message), time);
@@ -462,7 +462,7 @@ void IrcMessageHandler::handleClearChatMessage(Communi::IrcMessage *message)
return;
}
auto time = calculateMessageTime(message).time();
auto time = calculateMessageTime(message);
// chat has been cleared by a moderator
if (clearChat.disableAllMessages)
{
src/providers/twitch/TwitchIrcServer.cpp
+3 -2
View File
@@ -248,7 +248,7 @@ void TwitchIrcServer::initialize()
}
postToThread([chan, actor{action.source.login}] {
auto now = QTime::currentTime();
auto now = QDateTime::currentDateTime();
chan->addOrReplaceClearChat(
MessageBuilder::makeClearChatMessage(now, actor), now);
});
@@ -314,7 +314,8 @@ void TwitchIrcServer::initialize()
postToThread([chan, action] {
MessageBuilder msg(action);
msg->flags.set(MessageFlag::PubSub);
chan->addOrReplaceTimeout(msg.release(), QTime::currentTime());
chan->addOrReplaceTimeout(msg.release(),
QDateTime::currentDateTime());
});
});
src/util/ChannelHelpers.hpp
+9 -8
View File
@@ -16,7 +16,7 @@ namespace chatterino {
/// @param disableUserMessages If set, disables all message by the timed out user.
template <typename Buf, typename Replace, typename Add>
void addOrReplaceChannelTimeout(const Buf &buffer, MessagePtr message,
QTime now, Replace replaceMessage,
const QDateTime &now, Replace replaceMessage,
Add addMessage, bool disableUserMessages)
{
// NOTE: This function uses the messages PARSE time to figure out whether they should be replaced
@@ -30,7 +30,7 @@ void addOrReplaceChannelTimeout(const Buf &buffer, MessagePtr message,
bool shouldAddMessage = true;
QTime minimumTime = now.addSecs(-5);
QDateTime minimumTime = now.addSecs(-5);
auto timeoutStackStyle = static_cast<TimeoutStackStyle>(
getSettings()->timeoutStackStyle.getValue());
@@ -39,7 +39,7 @@ void addOrReplaceChannelTimeout(const Buf &buffer, MessagePtr message,
{
const MessagePtr &s = buffer[i];
if (s->parseTime < minimumTime)
if (s->serverReceivedTime < minimumTime)
{
break;
}
@@ -82,7 +82,7 @@ void addOrReplaceChannelTimeout(const Buf &buffer, MessagePtr message,
MessageBuilder replacement(timeoutMessage, message->timeoutUser,
message->loginName, message->searchText,
count);
count, message->serverReceivedTime);
replacement->timeoutUser = message->timeoutUser;
replacement->count = count;
@@ -126,7 +126,8 @@ void addOrReplaceChannelTimeout(const Buf &buffer, MessagePtr message,
/// - adds the `message`.
template <typename Buffer, typename Replace, typename Add>
void addOrReplaceChannelClear(const Buffer &buffer, MessagePtr message,
QTime now, Replace replaceMessage, Add addMessage)
const QDateTime &now, Replace replaceMessage,
Add addMessage)
{
// NOTE: This function uses the messages PARSE time to figure out whether they should be replaced
// This works as expected for incoming messages, but not for historic messages.
@@ -135,7 +136,7 @@ void addOrReplaceChannelClear(const Buffer &buffer, MessagePtr message,
auto snapshotLength = static_cast<qsizetype>(buffer.size());
auto end = std::max<qsizetype>(0, snapshotLength - 20);
bool shouldAddMessage = true;
QTime minimumTime = now.addSecs(-5);
QDateTime minimumTime = now.addSecs(-5);
auto timeoutStackStyle = static_cast<TimeoutStackStyle>(
getSettings()->timeoutStackStyle.getValue());
@@ -149,7 +150,7 @@ void addOrReplaceChannelClear(const Buffer &buffer, MessagePtr message,
{
const MessagePtr &s = buffer[i];
if (s->parseTime < minimumTime)
if (s->serverReceivedTime < minimumTime)
{
break;
}
@@ -180,7 +181,7 @@ void addOrReplaceChannelClear(const Buffer &buffer, MessagePtr message,
uint32_t count = s->count + 1;
auto replacement = MessageBuilder::makeClearChatMessage(
message->parseTime, message->timeoutUser, count);
message->serverReceivedTime, message->timeoutUser, count);
replacement->flags = message->flags;
replaceMessage(i, s, replacement);
src/util/VectorMessageSink.cpp
+2 -2
View File
@@ -24,7 +24,7 @@ void VectorMessageSink::addMessage(MessagePtr message, MessageContext ctx,
}
void VectorMessageSink::addOrReplaceTimeout(MessagePtr clearchatMessage,
QTime now)
const QDateTime &now)
{
addOrReplaceChannelTimeout(
this->messages_, std::move(clearchatMessage), now,
@@ -39,7 +39,7 @@ void VectorMessageSink::addOrReplaceTimeout(MessagePtr clearchatMessage,
}
void VectorMessageSink::addOrReplaceClearChat(MessagePtr clearchatMessage,
QTime now)
const QDateTime &now)
{
addOrReplaceChannelClear(
this->messages_, std::move(clearchatMessage), now,
src/util/VectorMessageSink.hpp
+4 -2
View File
@@ -14,8 +14,10 @@ public:
void addMessage(
MessagePtr message, MessageContext ctx,
std::optional<MessageFlags> overridingFlags = std::nullopt) override;
void addOrReplaceTimeout(MessagePtr clearchatMessage, QTime now) override;
void addOrReplaceClearChat(MessagePtr clearchatMessage, QTime now) override;
void addOrReplaceTimeout(MessagePtr clearchatMessage,
const QDateTime &now) override;
void addOrReplaceClearChat(MessagePtr clearchatMessage,
const QDateTime &now) override;
void disableAllMessages() override;