thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix unjoinable invites on mobile as well as unclickable previews

Browse source
This commit is contained in:
Nicolas Werner 2021-11-03 22:35:54 +01:00
parent 912a8c43b2
commit 1a163f49e2
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
4 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/timeline/RoomlistModel.cpp
View file

@ -609,6 +609,12 @@ RoomlistModel::setCurrentRoom(QString roomid)
(currentRoomPreview_ && currentRoomPreview_->roomid() == roomid))
return;
if (roomid.isEmpty()) {
currentRoom_ = nullptr;
currentRoomPreview_ = {};
emit currentRoomChanged();
}
nhlog::ui()->debug("Trying to switch to: {}", roomid.toStdString());
if (models.contains(roomid)) {
currentRoom_ = models.value(roomid);
@ -635,10 +641,24 @@ RoomlistModel::setCurrentRoom(QString roomid)
p.roomTopic_ = QString::fromStdString(i->topic);
p.roomAvatarUrl_ = QString::fromStdString(i->avatar_url);
currentRoomPreview_ = std::move(p);
nhlog::ui()->debug("Switched to (preview): {}",
currentRoomPreview_->roomid_.toStdString());
} else {
p.roomid_ = roomid;
currentRoomPreview_ = p;
nhlog::ui()->debug("Switched to (empty): {}",
currentRoomPreview_->roomid_.toStdString());
}
emit currentRoomChanged();
nhlog::ui()->debug("Switched to: {}", roomid.toStdString());
} else {
currentRoom_ = nullptr;
RoomPreview p;
p.roomid_ = roomid;
currentRoomPreview_ = std::move(p);
emit currentRoomChanged();
nhlog::ui()->debug("Switched to (empty): {}", roomid.toStdString());
}
}