chatterino2
Code Issues

Add extra context to messages that are added to channels, allowing the logging controller to take more responsibility in what messages to log (#5499)

Browse Source 
Co-auhtored-by: James Upjohn <jupjohn@jammeh.co.nz>
This commit is contained in:
pajlada
2024-07-13 13:15:11 +02:00
committed by GitHub
parent 49de421bd8
commit 973b7a3bdd
26 changed files with 163 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/dialogs/ReplyThreadPopup.cpp
+16 -13
View File
@@ -244,7 +244,8 @@ void ReplyThreadPopup::addMessagesFromThread()
std::optional<MessageFlags>(this->thread_->root()->flags);
rootOverrideFlags->set(MessageFlag::DoNotLog);
this->virtualChannel_->addMessage(this->thread_->root(), rootOverrideFlags);
this->virtualChannel_->addMessage(
this->thread_->root(), MessageContext::Repost, rootOverrideFlags);
for (const auto &msgRef : this->thread_->replies())
{
if (auto msg = msgRef.lock())
@@ -252,24 +253,26 @@ void ReplyThreadPopup::addMessagesFromThread()
auto overrideFlags = std::optional<MessageFlags>(msg->flags);
overrideFlags->set(MessageFlag::DoNotLog);
this->virtualChannel_->addMessage(msg, overrideFlags);
this->virtualChannel_->addMessage(msg, MessageContext::Repost,
overrideFlags);
}
}
this->messageConnection_ =
std::make_unique<pajlada::Signals::ScopedConnection>(
sourceChannel->messageAppended.connect([this](MessagePtr &message,
auto) {
if (message->replyThread == this->thread_)
{
auto overrideFlags =
std::optional<MessageFlags>(message->flags);
overrideFlags->set(MessageFlag::DoNotLog);
sourceChannel->messageAppended.connect(
[this](MessagePtr &message, auto) {
if (message->replyThread == this->thread_)
{
auto overrideFlags =
std::optional<MessageFlags>(message->flags);
overrideFlags->set(MessageFlag::DoNotLog);
// same reply thread, add message
this->virtualChannel_->addMessage(message, overrideFlags);
}
}));
// same reply thread, add message
this->virtualChannel_->addMessage(
message, MessageContext::Repost, overrideFlags);
}
}));
}
void ReplyThreadPopup::updateInputUI()