Remove redundant alias function

This commit is contained in:
Nicolas Werner 2022-06-16 01:49:51 +02:00
parent b150aea8b9
commit 28acea55e2
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
6 changed files with 37 additions and 58 deletions

View file

@ -23,17 +23,19 @@ RoomsModel::RoomsModel(bool showOnlyRoomWithAliases, QObject *parent)
}
for (const auto &r : rooms_) {
auto roomAliasesList = cache::client()->getRoomAliases(r);
auto roomAliasesList =
cache::client()->getStateEvent<mtx::events::state::CanonicalAlias>(r);
if (showOnlyRoomWithAliases_) {
if (roomAliasesList && !roomAliasesList->alias.empty()) {
if (roomAliasesList && !roomAliasesList->content.alias.empty()) {
roomids.push_back(QString::fromStdString(r));
roomAliases.push_back(QString::fromStdString(roomAliasesList->alias));
roomAliases.push_back(QString::fromStdString(roomAliasesList->content.alias));
}
} else {
roomids.push_back(QString::fromStdString(r));
roomAliases.push_back(roomAliasesList ? QString::fromStdString(roomAliasesList->alias)
: QLatin1String(""));
roomAliases.push_back(roomAliasesList
? QString::fromStdString(roomAliasesList->content.alias)
: QLatin1String(""));
}
}
}