diff --git a/src/RoomsModel.cpp b/src/RoomsModel.cpp
index 656a0deb..8c05b7bb 100644
--- a/src/RoomsModel.cpp
+++ b/src/RoomsModel.cpp
@@ -14,71 +14,67 @@ RoomsModel::RoomsModel(bool showOnlyRoomWithAliases, QObject *parent)
: QAbstractListModel(parent)
, showOnlyRoomWithAliases_(showOnlyRoomWithAliases)
{
- std::vector<std::string> rooms_ = cache::joinedRooms();
- roomInfos = cache::getRoomInfo(rooms_);
- if (!showOnlyRoomWithAliases_) {
- roomids.reserve(rooms_.size());
- roomAliases.reserve(rooms_.size());
- }
+ std::vector<std::string> rooms_ = cache::joinedRooms();
+ roomInfos = cache::getRoomInfo(rooms_);
+ if (!showOnlyRoomWithAliases_) {
+ roomids.reserve(rooms_.size());
+ roomAliases.reserve(rooms_.size());
+ }
- for (const auto &r : rooms_) {
- auto roomAliasesList = cache::client()->getRoomAliases(r);
+ for (const auto &r : rooms_) {
+ auto roomAliasesList = cache::client()->getRoomAliases(r);
- if (showOnlyRoomWithAliases_) {
- if (roomAliasesList && !roomAliasesList->alias.empty()) {
- roomids.push_back(QString::fromStdString(r));
- roomAliases.push_back(
- QString::fromStdString(roomAliasesList->alias));
- }
- } else {
- roomids.push_back(QString::fromStdString(r));
- roomAliases.push_back(
- roomAliasesList ? QString::fromStdString(roomAliasesList->alias) : "");
- }
+ if (showOnlyRoomWithAliases_) {
+ if (roomAliasesList && !roomAliasesList->alias.empty()) {
+ roomids.push_back(QString::fromStdString(r));
+ roomAliases.push_back(QString::fromStdString(roomAliasesList->alias));
+ }
+ } else {
+ roomids.push_back(QString::fromStdString(r));
+ roomAliases.push_back(roomAliasesList ? QString::fromStdString(roomAliasesList->alias)
+ : "");
}
+ }
}
QHash<int, QByteArray>
RoomsModel::roleNames() const
{
- return {{CompletionModel::CompletionRole, "completionRole"},
- {CompletionModel::SearchRole, "searchRole"},
- {CompletionModel::SearchRole2, "searchRole2"},
- {Roles::RoomAlias, "roomAlias"},
- {Roles::AvatarUrl, "avatarUrl"},
- {Roles::RoomID, "roomid"},
- {Roles::RoomName, "roomName"}};
+ return {{CompletionModel::CompletionRole, "completionRole"},
+ {CompletionModel::SearchRole, "searchRole"},
+ {CompletionModel::SearchRole2, "searchRole2"},
+ {Roles::RoomAlias, "roomAlias"},
+ {Roles::AvatarUrl, "avatarUrl"},
+ {Roles::RoomID, "roomid"},
+ {Roles::RoomName, "roomName"}};
}
QVariant
RoomsModel::data(const QModelIndex &index, int role) const
{
- if (hasIndex(index.row(), index.column(), index.parent())) {
- switch (role) {
- case CompletionModel::CompletionRole: {
- if (UserSettings::instance()->markdown()) {
- QString percentEncoding =
- QUrl::toPercentEncoding(roomAliases[index.row()]);
- return QString("[%1](https://matrix.to/#/%2)")
- .arg(roomAliases[index.row()], percentEncoding);
- } else {
- return roomAliases[index.row()];
- }
- }
- case CompletionModel::SearchRole:
- case Qt::DisplayRole:
- case Roles::RoomAlias:
- return roomAliases[index.row()].toHtmlEscaped();
- case CompletionModel::SearchRole2:
- case Roles::RoomName:
- return QString::fromStdString(roomInfos.at(roomids[index.row()]).name)
- .toHtmlEscaped();
- case Roles::AvatarUrl:
- return QString::fromStdString(
- roomInfos.at(roomids[index.row()]).avatar_url);
- case Roles::RoomID:
- return roomids[index.row()].toHtmlEscaped();
- }
+ if (hasIndex(index.row(), index.column(), index.parent())) {
+ switch (role) {
+ case CompletionModel::CompletionRole: {
+ if (UserSettings::instance()->markdown()) {
+ QString percentEncoding = QUrl::toPercentEncoding(roomAliases[index.row()]);
+ return QString("[%1](https://matrix.to/#/%2)")
+ .arg(roomAliases[index.row()], percentEncoding);
+ } else {
+ return roomAliases[index.row()];
+ }
+ }
+ case CompletionModel::SearchRole:
+ case Qt::DisplayRole:
+ case Roles::RoomAlias:
+ return roomAliases[index.row()].toHtmlEscaped();
+ case CompletionModel::SearchRole2:
+ case Roles::RoomName:
+ return QString::fromStdString(roomInfos.at(roomids[index.row()]).name).toHtmlEscaped();
+ case Roles::AvatarUrl:
+ return QString::fromStdString(roomInfos.at(roomids[index.row()]).avatar_url);
+ case Roles::RoomID:
+ return roomids[index.row()].toHtmlEscaped();
}
- return {};
+ }
+ return {};
}
|
