From 5aff3e43098f1e730afe0202c737a93e90346c9b Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Mon, 7 May 2018 12:00:49 +0300 Subject: Don't send notification for the room that is currently open --- src/ChatPage.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/ChatPage.cc') diff --git a/src/ChatPage.cc b/src/ChatPage.cc index b4691fdd..1f5fa995 100644 --- a/src/ChatPage.cc +++ b/src/ChatPage.cc @@ -868,15 +868,18 @@ ChatPage::sendDesktopNotifications(const mtx::responses::Notifications &res) if (!cache_->isNotificationSent(event_id)) { const auto room_id = QString::fromStdString(item.room_id); const auto user_id = utils::event_sender(item.event); - const auto body = utils::event_body(item.event); // We should only sent one notification per event. cache_->markSentNotification(event_id); + // Don't send a notification when the current room is opened. + if (isRoomActive(room_id)) + continue; + NotificationsManager::postNotification( QString::fromStdString(cache_->singleRoomInfo(item.room_id).name), Cache::displayName(room_id, user_id), - body); + utils::event_body(item.event)); } } catch (const lmdb::error &e) { qWarning() << e.what(); -- cgit 1.5.1