ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show notifications if application is active and same room is active

Browse Source
This commit is contained in:
Akseli Lahtinen
2022-06-04 04:19:19 +03:00
committed by Tobias Fella
parent 8700611235
commit b834510be0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/roomlistmodel.cpp
View File

@@ -20,6 +20,7 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <KLocalizedString> #include <KLocalizedString>
#include <QGuiApplication>
#include <utility> #include <utility>
#include "csapi/notifications.h" #include "csapi/notifications.h"
@@ -225,7 +226,9 @@ void RoomListModel::handleNotifications()
} }
oldNotifications += notification["event"].toObject()["event_id"].toString(); oldNotifications += notification["event"].toObject()["event_id"].toString();
auto room = m_connection->room(notification["room_id"].toString()); auto room = m_connection->room(notification["room_id"].toString());
if (room) {
// If room exists, room is NOT active OR the application is NOT active, show notification
if (room && !(room->id() == RoomManager::instance().currentRoom()->id() && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
// The room might have been deleted (for example rejected invitation). // The room might have been deleted (for example rejected invitation).
auto sender = room->user(notification["event"].toObject()["sender"].toString()); auto sender = room->user(notification["event"].toObject()["sender"].toString());