From 28acea55e2efd76dd85bba4f343a668c3015db3b Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Thu, 16 Jun 2022 01:49:51 +0200 Subject: Remove redundant alias function --- src/dbus/NhekoDBusBackend.cpp | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'src/dbus/NhekoDBusBackend.cpp') diff --git a/src/dbus/NhekoDBusBackend.cpp b/src/dbus/NhekoDBusBackend.cpp index f0ed9df1..836475ee 100644 --- a/src/dbus/NhekoDBusBackend.cpp +++ b/src/dbus/NhekoDBusBackend.cpp @@ -26,29 +26,30 @@ NhekoDBusBackend::rooms(const QDBusMessage &message) new QVector}; for (const auto &room : roomListModel) { - auto addRoom = - [room, roomListModelSize = roomListModel.size(), message, model](const QImage &image) { - const auto aliases = cache::client()->getRoomAliases(room->roomId().toStdString()); - QString alias; - if (aliases.has_value()) { - const auto &val = aliases.value(); - if (!val.alias.empty()) - alias = QString::fromStdString(val.alias); - else if (val.alt_aliases.size() > 0) - alias = QString::fromStdString(val.alt_aliases.front()); - } + auto addRoom = [room, roomListModelSize = roomListModel.size(), message, model]( + const QImage &image) { + const auto aliases = cache::client()->getStateEvent( + room->roomId().toStdString()); + QString alias; + if (aliases.has_value()) { + const auto &val = aliases.value().content; + if (!val.alias.empty()) + alias = QString::fromStdString(val.alias); + else if (val.alt_aliases.size() > 0) + alias = QString::fromStdString(val.alt_aliases.front()); + } - model->push_back(nheko::dbus::RoomInfoItem{ - room->roomId(), alias, room->roomName(), image, room->notificationCount()}); + model->push_back(nheko::dbus::RoomInfoItem{ + room->roomId(), alias, room->roomName(), image, room->notificationCount()}); - if (model->length() == roomListModelSize) { - auto reply = message.createReply(); - nhlog::ui()->debug("Sending {} rooms over D-Bus...", model->size()); - reply << QVariant::fromValue(*model); - QDBusConnection::sessionBus().send(reply); - nhlog::ui()->debug("Rooms successfully sent to D-Bus."); - } - }; + if (model->length() == roomListModelSize) { + auto reply = message.createReply(); + nhlog::ui()->debug("Sending {} rooms over D-Bus...", model->size()); + reply << QVariant::fromValue(*model); + QDBusConnection::sessionBus().send(reply); + nhlog::ui()->debug("Rooms successfully sent to D-Bus."); + } + }; auto avatarUrl = room->roomAvatarUrl(); if (avatarUrl.isEmpty()) -- cgit 1.5.1