Skip to content
Snippets Groups Projects
Commit c3efab43 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Cleanup some random dbus stuff

parent 686ebfdb
No related branches found
No related tags found
No related merge requests found
Pipeline #3000 passed
...@@ -75,6 +75,6 @@ operator<<(QDBusArgument &arg, const QVersionNumber &v); ...@@ -75,6 +75,6 @@ operator<<(QDBusArgument &arg, const QVersionNumber &v);
const QDBusArgument & const QDBusArgument &
operator>>(const QDBusArgument &arg, QVersionNumber &v); operator>>(const QDBusArgument &arg, QVersionNumber &v);
#define NHEKO_DBUS_SERVICE_NAME "io.github.Nheko-Reborn.nheko" #define NHEKO_DBUS_SERVICE_NAME "im.nheko.Nheko"
#endif // NHEKODBUSAPI_H #endif // NHEKODBUSAPI_H
...@@ -26,11 +26,8 @@ NhekoDBusBackend::getRooms(const QDBusMessage &message) ...@@ -26,11 +26,8 @@ NhekoDBusBackend::getRooms(const QDBusMessage &message)
new QVector<nheko::dbus::RoomInfoItem>}; new QVector<nheko::dbus::RoomInfoItem>};
for (const auto &room : roomListModel) { for (const auto &room : roomListModel) {
MainWindow::instance()->imageProvider()->download( auto addRoom =
room->roomAvatarUrl().remove("mxc://"), [room, roomListModelSize = roomListModel.size(), message, model](const QImage &image) {
{96, 96},
[message, room, model, roomListModel](
const QString &, const QSize &, const QImage &image, const QString &) {
const auto aliases = cache::client()->getRoomAliases(room->roomId().toStdString()); const auto aliases = cache::client()->getRoomAliases(room->roomId().toStdString());
QString alias; QString alias;
if (aliases.has_value()) { if (aliases.has_value()) {
...@@ -44,15 +41,26 @@ NhekoDBusBackend::getRooms(const QDBusMessage &message) ...@@ -44,15 +41,26 @@ NhekoDBusBackend::getRooms(const QDBusMessage &message)
model->push_back(nheko::dbus::RoomInfoItem{ model->push_back(nheko::dbus::RoomInfoItem{
room->roomId(), room->roomName(), alias, image, room->notificationCount()}); room->roomId(), room->roomName(), alias, image, room->notificationCount()});
if (model->length() == roomListModel.size()) { if (model->length() == roomListModelSize) {
auto reply = message.createReply(); auto reply = message.createReply();
nhlog::ui()->debug("Sending {} rooms over D-Bus...", model->size()); nhlog::ui()->debug("Sending {} rooms over D-Bus...", model->size());
reply << QVariant::fromValue(*model); reply << QVariant::fromValue(*model);
QDBusConnection::sessionBus().send(reply); QDBusConnection::sessionBus().send(reply);
nhlog::ui()->debug("Rooms successfully sent to D-Bus."); nhlog::ui()->debug("Rooms successfully sent to D-Bus.");
} }
}, };
true);
auto avatarUrl = room->roomAvatarUrl();
if (avatarUrl.isEmpty())
addRoom(QImage());
else
MainWindow::instance()->imageProvider()->download(
avatarUrl.remove("mxc://"),
{96, 96},
[addRoom](const QString &, const QSize &, const QImage &image, const QString &) {
addRoom(image);
},
true);
} }
return {}; return {};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment