diff --git a/src/dbus/NhekoDBusBackend.cpp b/src/dbus/NhekoDBusBackend.cpp
index 4d611122..56fdfe8d 100644
--- a/src/dbus/NhekoDBusBackend.cpp
+++ b/src/dbus/NhekoDBusBackend.cpp
@@ -32,67 +32,50 @@ struct RoomReplyState
}
QVector<nheko::dbus::RoomInfoItem>
-NhekoDBusBackend::rooms(const QDBusMessage &message)
+NhekoDBusBackend::rooms() const
{
- message.setDelayedReply(true);
nhlog::ui()->debug("Rooms requested over D-Bus.");
const auto roomListModel = m_parent->models;
+ QVector<nheko::dbus::RoomInfoItem> model;
- auto state = QSharedPointer<RoomReplyState>::create();
-
- std::vector<std::string> roomids;
- roomids.reserve(roomids.size());
for (const auto &room : roomListModel) {
- roomids.push_back(room->roomId().toStdString());
+ const auto aliases = cache::client()->getStateEvent<mtx::events::state::CanonicalAlias>(
+ 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->plainRoomName(),
+ room->roomAvatarUrl(),
+ room->notificationCount()});
}
- state->roominfos = cache::getRoomInfo(roomids);
- for (const auto &room : roomListModel) {
- auto addRoom = [room, roomListModelSize = roomListModel.size(), message, state](
- const QImage &image) {
- const auto aliases = cache::client()->getStateEvent<mtx::events::state::CanonicalAlias>(
- 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());
- }
-
- std::lock_guard<std::mutex> childLock(state->m);
- state->model.push_back(nheko::dbus::RoomInfoItem{
- room->roomId(),
- alias,
- QString::fromStdString(state->roominfos[room->roomId()].name),
- image,
- room->notificationCount()});
-
- if (state->model.size() == roomListModelSize) {
- nhlog::ui()->debug("Sending {} rooms over D-Bus...", state->model.size());
- auto reply = message.createReply();
- reply << QVariant::fromValue(state->model);
- QDBusConnection::sessionBus().send(reply);
- nhlog::ui()->debug("Rooms successfully sent to D-Bus.");
- } else {
- // nhlog::ui()->debug("DBUS: {}/{}", state->model.size(), roomListModelSize);
- }
- };
-
- if (state->roominfos[room->roomId()].avatar_url.empty())
- addRoom(QImage());
- else
- MainWindow::instance()->imageProvider()->download(
- QString::fromStdString(state->roominfos[room->roomId()].avatar_url).remove("mxc://"),
- {96, 96},
- [addRoom](const QString &, const QSize &, const QImage &image, const QString &) {
- addRoom(image);
- },
- true);
- }
+ nhlog::ui()->debug("Sending {} rooms over D-Bus...", model.size());
+ return model;
+}
+QImage
+NhekoDBusBackend::image(const QString &uri, const QDBusMessage &message) const
+{
+ message.setDelayedReply(true);
+ nhlog::ui()->debug("Rooms requested over D-Bus.");
+ MainWindow::instance()->imageProvider()->download(
+ QString(uri).remove("mxc://"),
+ {96, 96},
+ [message](const QString &, const QSize &, const QImage &image, const QString &) {
+ auto reply = message.createReply();
+ reply << QVariant::fromValue(image);
+ QDBusConnection::sessionBus().send(reply);
+ },
+ true);
return {};
}
|
