ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename type because of conflict

Browse Source
This commit is contained in:
Tobias Fella
2021-09-24 12:42:05 +02:00
parent b3d9861d3d
commit d28279313d
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/roomlistmodel.cpp
View File

@@ -342,26 +342,26 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
}
if (role == CategoryRole) {
if (room->joinState() == JoinState::Invite) {
return RoomType::Invited;
return NeoChatRoomType::Invited;
}
if (room->isFavourite()) {
return RoomType::Favorite;
return NeoChatRoomType::Favorite;
}
if (room->isLowPriority()) {
return RoomType::Deprioritized;
return NeoChatRoomType::Deprioritized;
}
if (room->isDirectChat()) {
return RoomType::Direct;
return NeoChatRoomType::Direct;
}
const RoomCreateEvent *creationEvent = room->creation();
QJsonObject contentJson = creationEvent->contentJson();
QJsonObject::const_iterator typeIter = contentJson.find("type");
if (typeIter != contentJson.end()) {
if (typeIter.value().toString() == "m.space") {
return RoomType::Space;
return NeoChatRoomType::Space;
}
}
return RoomType::Normal;
return NeoChatRoomType::Normal;
}
if (role == UnreadCountRole) {
return room->unreadCount();