chatterino2
Code Issues

Merge pull request #979 from hemirt/whispers

Browse Source 
do not disable whispers on clears and timeouts
This commit is contained in:
pajlada
2019-04-16 15:06:42 +02:00
committed by GitHub
parent d846b723c7 d6c5dd6d6c
commit 97faec15e0
7 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Channel.cpp
+5 -3
View File
@@ -154,8 +154,9 @@ void Channel::addOrReplaceTimeout(MessagePtr message)
for (int i = 0; i < snapshotLength; i++)
{
auto &s = snapshot[i];
if (s->flags.hasNone({MessageFlag::Timeout, MessageFlag::Untimeout}) &&
s->loginName == message->timeoutUser)
if (s->loginName == message->timeoutUser &&
s->flags.hasNone({MessageFlag::Timeout, MessageFlag::Untimeout,
MessageFlag::Whisper}))
{
// FOURTF: disabled for now
// PAJLADA: Shitty solution described in Message.hpp
@@ -179,7 +180,8 @@ void Channel::disableAllMessages()
for (int i = 0; i < snapshotLength; i++)
{
auto &message = snapshot[i];
if (message->flags.hasAny({MessageFlag::System, MessageFlag::Timeout}))
if (message->flags.hasAny({MessageFlag::System, MessageFlag::Timeout,
MessageFlag::Whisper}))
{
continue;
}