diff --git a/src/notifications/ManagerWin.cpp b/src/notifications/ManagerWin.cpp index 91483492..5d269a8b 100644 --- a/src/notifications/ManagerWin.cpp +++ b/src/notifications/ManagerWin.cpp @@ -51,15 +51,8 @@ NotificationsManager::postNotification(const mtx::responses::Notification ¬if const QImage &icon) { const auto room_name = QString::fromStdString(cache::singleRoomInfo(notification.room_id).name); - const auto sender = - cache::displayName(QString::fromStdString(notification.room_id), - QString::fromStdString(mtx::accessors::sender(notification.event))); - const auto isEncrypted = std::get_if>( - ¬ification.event) != nullptr; - const auto isReply = utils::isReply(notification.event); - - auto formatNotification = [this, notification, sender] { + auto formatNotification = [this, notification] { const auto template_ = getMessageTemplate(notification); if (std::holds_alternative>( notification.event)) { @@ -69,18 +62,12 @@ NotificationsManager::postNotification(const mtx::responses::Notification ¬if return template_.arg(utils::stripReplyFallbacks(notification.event, {}, {}).quoted_body); }; - const auto line1 = - (room_name == sender) ? sender : QString("%1 - %2").arg(sender).arg(room_name); - const auto line2 = (isEncrypted ? (isReply ? tr("%1 replied with an encrypted message") - : tr("%1 sent an encrypted message")) - : formatNotification()); - auto iconPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + room_name + "-room-avatar.png"; if (!icon.save(iconPath)) iconPath.clear(); - systemPostNotification(line1, line2, iconPath); + systemPostNotification(room_name, formatNotification(), iconPath); } void