d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-26 04:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't send notification for the room that is currently open

Browse source
This commit is contained in:
Konstantinos Sideris 2018-05-07 12:00:49 +03:00
parent 506cf68072
commit 5aff3e4309
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/ChatPage.h
View file

@ -117,6 +117,12 @@ private slots:
private: private:
static ChatPage *instance_; static ChatPage *instance_;
//! Check if the given room is currently open.
bool isRoomActive(const QString &room_id)
{
return isActiveWindow() && currentRoom() == room_id;
}
using UserID = QString; using UserID = QString;
using Membership = mtx::events::StateEvent<mtx::events::state::Member>; using Membership = mtx::events::StateEvent<mtx::events::state::Member>;
using Memberships = std::map<std::string, Membership>; using Memberships = std::map<std::string, Membership>;

7
src/ChatPage.cc
View file

@ -868,15 +868,18 @@ ChatPage::sendDesktopNotifications(const mtx::responses::Notifications &res)
if (!cache_->isNotificationSent(event_id)) { if (!cache_->isNotificationSent(event_id)) {
const auto room_id = QString::fromStdString(item.room_id); const auto room_id = QString::fromStdString(item.room_id);
const auto user_id = utils::event_sender(item.event); 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. // We should only sent one notification per event.
cache_->markSentNotification(event_id); cache_->markSentNotification(event_id);
// Don't send a notification when the current room is opened.
if (isRoomActive(room_id))
continue;
NotificationsManager::postNotification( NotificationsManager::postNotification(
QString::fromStdString(cache_->singleRoomInfo(item.room_id).name), QString::fromStdString(cache_->singleRoomInfo(item.room_id).name),
Cache::displayName(room_id, user_id), Cache::displayName(room_id, user_id),
body); utils::event_body(item.event));
} }
} catch (const lmdb::error &e) { } catch (const lmdb::error &e) {
qWarning() << e.what(); qWarning() << e.what();