ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

const auto a few things

Browse Source
This commit is contained in:
Tobias Fella
2026-01-21 12:18:58 +01:00
committed by Tobias Fella
parent cfe5182a65
commit 98a277ac63
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/notificationsmanager.cpp
View File

@@ -82,8 +82,7 @@ void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> co
if (!m_initialTimestamp.contains(connectionId)) { if (!m_initialTimestamp.contains(connectionId)) {
m_initialTimestamp[connectionId] = notification["ts"_L1].toVariant().toLongLong(); m_initialTimestamp[connectionId] = notification["ts"_L1].toVariant().toLongLong();
} else { } else {
qint64 timestamp = notification["ts"_L1].toVariant().toLongLong(); if (const auto timestamp = notification["ts"_L1].toVariant().toLongLong(); timestamp > m_initialTimestamp[connectionId]) {
if (timestamp > m_initialTimestamp[connectionId]) {
m_initialTimestamp[connectionId] = timestamp; m_initialTimestamp[connectionId] = timestamp;
} }
} }
@@ -166,7 +165,7 @@ bool NotificationsManager::shouldPostNotification(QPointer<NeoChatConnection> co
return false; return false;
} }
auto room = connection->room(notification["room_id"_L1].toString()); const auto room = connection->room(notification["room_id"_L1].toString());
if (room == nullptr) { if (room == nullptr) {
return false; return false;
} }
@@ -175,14 +174,14 @@ bool NotificationsManager::shouldPostNotification(QPointer<NeoChatConnection> co
// should not be shown. // should not be shown.
// This is setup so that if the application is inactive the notification will // This is setup so that if the application is inactive the notification will
// always be posted, even if the room is the current room. // always be posted, even if the room is the current room.
bool isCurrentRoom = RoomManager::instance().currentRoom() && room->id() == RoomManager::instance().currentRoom()->id(); if (RoomManager::instance().currentRoom() && room->id() == RoomManager::instance().currentRoom()->id()
if (isCurrentRoom && QGuiApplication::applicationState() == Qt::ApplicationActive) { && QGuiApplication::applicationState() == Qt::ApplicationActive) {
return false; return false;
} }
// If the notification timestamp is earlier than the initial timestamp assume // If the notification timestamp is earlier than the initial timestamp assume
// the notification is old and shouldn't be posted. // the notification is old and shouldn't be posted.
qint64 timestamp = notification["ts"_L1].toDouble(); const auto timestamp = notification["ts"_L1].toDouble();
if (timestamp < m_initialTimestamp[connection->user()->id()]) { if (timestamp < m_initialTimestamp[connection->user()->id()]) {
return false; return false;
} }
@@ -302,11 +301,11 @@ void NotificationsManager::doPostInviteNotification(QPointer<NeoChatRoom> room)
avatar_image = room->avatar(128); avatar_image = room->avatar(128);
} }
KNotification *notification = new KNotification(u"invite"_s); const auto notification = new KNotification(u"invite"_s);
notification->setText(i18n("%1 invited you to a room", sender.htmlSafeDisplayName())); notification->setText(i18n("%1 invited you to a room", sender.htmlSafeDisplayName()));
notification->setTitle(room->displayName()); notification->setTitle(room->displayName());
notification->setPixmap(createNotificationImage(avatar_image, nullptr)); notification->setPixmap(createNotificationImage(avatar_image, nullptr));
auto defaultAction = notification->addDefaultAction(i18n("Open this invitation in NeoChat")); const auto defaultAction = notification->addDefaultAction(i18n("Open this invitation in NeoChat"));
connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() { connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() {
if (!room) { if (!room) {
return; return;
@@ -367,11 +366,9 @@ void NotificationsManager::postPushNotification(const QByteArray &message)
{ {
const auto json = QJsonDocument::fromJson(message).object(); const auto json = QJsonDocument::fromJson(message).object();
const auto type = json["notification"_L1]["type"_L1].toString();
// the only two types of push notifications we support right now // the only two types of push notifications we support right now
if (type == u"m.room.message"_s || type == u"m.room.encrypted"_s) { if (const auto type = json["notification"_L1]["type"_L1].toString(); type == u"m.room.message"_s || type == u"m.room.encrypted"_s) {
auto notification = new KNotification("message"_L1); const auto notification = new KNotification("message"_L1);
const auto sender = json["notification"_L1]["sender_display_name"_L1].toString(); const auto sender = json["notification"_L1]["sender_display_name"_L1].toString();
const auto roomName = json["notification"_L1]["room_name"_L1].toString(); const auto roomName = json["notification"_L1]["room_name"_L1].toString();
@@ -391,13 +388,13 @@ void NotificationsManager::postPushNotification(const QByteArray &message)
} }
#ifdef HAVE_KIO #ifdef HAVE_KIO
auto openAction = notification->addAction(i18n("Open NeoChat")); const auto openAction = notification->addAction(i18n("Open NeoChat"));
connect(openAction, &KNotificationAction::activated, notification, [=]() { connect(openAction, &KNotificationAction::activated, notification, [=]() {
QString properId = roomId; QString properId = roomId;
properId = properId.replace(u"#"_s, QString()); properId = properId.replace(u"#"_s, QString());
properId = properId.replace(u"!"_s, QString()); properId = properId.replace(u"!"_s, QString());
auto *job = new KIO::ApplicationLauncherJob(KService::serviceByDesktopName(u"org.kde.neochat"_s)); const auto job = new KIO::ApplicationLauncherJob(KService::serviceByDesktopName(u"org.kde.neochat"_s));
job->setUrls({QUrl::fromUserInput(u"matrix:r/%1"_s.arg(properId))}); job->setUrls({QUrl::fromUserInput(u"matrix:r/%1"_s.arg(properId))});
job->start(); job->start();
}); });
@@ -428,12 +425,12 @@ QPixmap NotificationsManager::createNotificationImage(const QImage &icon, NeoCha
painter.setBrush(Qt::white); painter.setBrush(Qt::white);
painter.drawRoundedRect(imageRect, imageRect.width(), imageRect.height()); painter.drawRoundedRect(imageRect, imageRect.width(), imageRect.height());
QBrush brush(icon.scaledToHeight(biggestDimension)); const QBrush brush(icon.scaledToHeight(biggestDimension));
painter.setBrush(brush); painter.setBrush(brush);
painter.drawRoundedRect(imageRect, imageRect.width(), imageRect.height()); painter.drawRoundedRect(imageRect, imageRect.width(), imageRect.height());
if (room != nullptr) { if (room != nullptr) {
const QImage roomAvatar = room->avatar(imageRect.width(), imageRect.height()); const auto roomAvatar = room->avatar(imageRect.width(), imageRect.height());
if (!roomAvatar.isNull() && icon != roomAvatar) { if (!roomAvatar.isNull() && icon != roomAvatar) {
const QRect lowerQuarter{imageRect.center(), imageRect.size() / 2}; const QRect lowerQuarter{imageRect.center(), imageRect.size() / 2};