Allow addMessage to override message flags

This commit is contained in:
Rasmus Karlsson
2018-10-05 21:33:01 +00:00
parent ad949dc1f6
commit c6bca8e97b
4 changed files with 32 additions and 12 deletions
+10 -4
View File
@@ -400,10 +400,16 @@ void ChannelView::setChannel(ChannelPtr newChannel)
this->clearMessages();
// on new message
this->channelConnections_.push_back(
newChannel->messageAppended.connect([this](MessagePtr &message) {
this->channelConnections_.push_back(newChannel->messageAppended.connect(
[this](MessagePtr &message,
boost::optional<MessageFlags> overridingFlags) {
MessageLayoutPtr deleted;
auto *messageFlags = &message->flags;
if (overridingFlags) {
messageFlags = overridingFlags.get_ptr();
}
auto messageRef = new MessageLayout(message);
if (this->lastMessageHasAlternateBackground_) {
@@ -427,8 +433,8 @@ void ChannelView::setChannel(ChannelPtr newChannel)
// }
}
if (!message->flags.has(MessageFlag::DoNotTriggerNotification)) {
if (message->flags.has(MessageFlag::Highlighted)) {
if (!messageFlags->has(MessageFlag::DoNotTriggerNotification)) {
if (messageFlags->has(MessageFlag::Highlighted)) {
this->tabHighlightRequested.invoke(
HighlightState::Highlighted);
} else {