From 1408b1a97d37a732ec06916489a60cd9e4d9f6dd Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 17 Mar 2021 22:13:12 +0100
Subject: [PATCH] Make CI happy

---
 src/notifications/ManagerMac.cpp |  4 ++--
 src/notifications/ManagerWin.cpp | 30 +++++++++++++-----------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/notifications/ManagerMac.cpp b/src/notifications/ManagerMac.cpp
index be56585c..8e36985c 100644
--- a/src/notifications/ManagerMac.cpp
+++ b/src/notifications/ManagerMac.cpp
@@ -16,8 +16,8 @@
 
 #include <variant>
 
-QString
-NotificationsManager::formatNotification(const mtx::responses::Notification &notification)
+static QString
+formatNotification(const mtx::responses::Notification &notification)
 {
         return utils::stripReplyFallbacks(notification.event, {}, {}).quoted_body;
 }
diff --git a/src/notifications/ManagerWin.cpp b/src/notifications/ManagerWin.cpp
index d37bff67..fe7830a7 100644
--- a/src/notifications/ManagerWin.cpp
+++ b/src/notifications/ManagerWin.cpp
@@ -60,11 +60,23 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
             &notification.event) != nullptr;
         const auto isReply = utils::isReply(notification.event);
 
+        auto formatNotification = [this, notification, sender] {
+                const auto template_ = getMessageTemplate(notification);
+                if (std::holds_alternative<
+                      mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>>(
+                      notification.event)) {
+                        return template_;
+                }
+
+                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(notification));
+                                        : formatNotification());
 
         auto iconPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) +
                         room_name + "-room-avatar.png";
@@ -100,19 +112,3 @@ void NotificationsManager::notificationClosed(uint, uint) {}
 void
 NotificationsManager::removeNotification(const QString &, const QString &)
 {}
-
-QString
-NotificationsManager::formatNotification(const mtx::responses::Notification &notification)
-{
-        const auto sender =
-          cache::displayName(QString::fromStdString(notification.room_id),
-                             QString::fromStdString(mtx::accessors::sender(notification.event)));
-
-        const auto template_ = getMessageTemplate(notification);
-        if (std::holds_alternative<mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>>(
-              notification.event)) {
-                return template_;
-        }
-
-        return template_.arg(utils::stripReplyFallbacks(notification.event, {}, {}).quoted_body);
-}