rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make CI happy

This commit is contained in:
Nicolas Werner 2021-03-17 22:13:12 +01:00
parent 21562eed75
commit 1408b1a97d
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/notifications/ManagerMac.cpp
View File

@ -16,8 +16,8 @@
#include <variant> #include <variant>
QString static QString
NotificationsManager::formatNotification(const mtx::responses::Notification &notification) formatNotification(const mtx::responses::Notification &notification)
{ {
return utils::stripReplyFallbacks(notification.event, {}, {}).quoted_body; return utils::stripReplyFallbacks(notification.event, {}, {}).quoted_body;
} }

30
src/notifications/ManagerWin.cpp
View File

@ -60,11 +60,23 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
&notification.event) != nullptr; &notification.event) != nullptr;
const auto isReply = utils::isReply(notification.event); 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 = const auto line1 =
(room_name == sender) ? sender : QString("%1 - %2").arg(sender).arg(room_name); (room_name == sender) ? sender : QString("%1 - %2").arg(sender).arg(room_name);
const auto line2 = (isEncrypted ? (isReply ? tr("%1 replied with an encrypted message") const auto line2 = (isEncrypted ? (isReply ? tr("%1 replied with an encrypted message")
: tr("%1 sent an encrypted message")) : tr("%1 sent an encrypted message"))
: formatNotification(notification)); : formatNotification());
auto iconPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + auto iconPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) +
room_name + "-room-avatar.png"; room_name + "-room-avatar.png";
@ -100,19 +112,3 @@ void NotificationsManager::notificationClosed(uint, uint) {}
void void
NotificationsManager::removeNotification(const QString &, const QString &) 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);
}