thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update macOS notifications to use UserNotifications framework

Browse source
This commit is contained in:
Joseph Donofry 2021-11-01 20:48:51 -04:00
parent 417cc07172
commit 912df2920e
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
4 changed files with 60 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/notifications/ManagerMac.cpp
View file

@ -33,6 +33,9 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
cache::displayName(QString::fromStdString(notification.room_id),
QString::fromStdString(mtx::accessors::sender(notification.event)));
const auto room_id = QString::fromStdString(notification.room_id);
const auto event_id = QString::fromStdString(mtx::accessors::event_id(notification.event));
const auto isEncrypted = std::get_if<mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>>(
&notification.event) != nullptr;
const auto isReply = utils::isReply(notification.event);
@ -41,7 +44,7 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
const QString messageInfo = (isReply ? tr("%1 replied with an encrypted message")
: tr("%1 sent an encrypted message"))
.arg(sender);
objCxxPostNotification(room_name, messageInfo, "", QImage());
objCxxPostNotification(room_name, room_id, event_id, messageInfo, "", "");
} else {
const QString messageInfo =
(isReply ? tr("%1 replied to a message") : tr("%1 sent a message")).arg(sender);
@ -49,12 +52,17 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
MxcImageProvider::download(
QString::fromStdString(mtx::accessors::url(notification.event)).remove("mxc://"),
QSize(200, 80),
[this, notification, room_name, messageInfo](QString, QSize, QImage image, QString) {
objCxxPostNotification(
room_name, messageInfo, formatNotification(notification), image);
[this, notification, room_name, room_id, event_id, messageInfo](
QString, QSize, QImage, QString imgPath) {
objCxxPostNotification(room_name,
room_id,
event_id,
messageInfo,
formatNotification(notification),
imgPath);
});
else
objCxxPostNotification(
room_name, messageInfo, formatNotification(notification), QImage());
room_name, room_id, event_id, messageInfo, formatNotification(notification), "");
}
}