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

user details dialog fixes

Browse Source
This commit is contained in:
Tobias Fella
2024-06-28 15:52:26 +02:00
parent e918db2cc1
commit 08df0ebbea
6 changed files with 79 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/roommanager.cpp
View File

@@ -146,8 +146,10 @@ void RoomManager::resolveResource(const QString &idOrUri, const QString &action)
if ((uri.type() == Uri::RoomAlias || uri.type() == Uri::RoomId) && action != "no_join"_ls) {
Q_EMIT askJoinRoom(uri.primaryId());
}
} else { // Invalid cases should have been eliminated earlier
Q_ASSERT(result == Quotient::UriResolved);
} else {
if (result != Quotient::UriResolved) {
return;
}
if (uri.type() == Uri::RoomAlias || uri.type() == Uri::RoomId) {
connect(
@@ -255,9 +257,9 @@ void RoomManager::openRoomForActiveConnection()
UriResolveResult RoomManager::visitUser(User *user, const QString &action)
{
if (action == "mention"_ls || action.isEmpty()) {
if (action == "mention"_ls || action == "qr"_ls || action.isEmpty()) {
user->load();
Q_EMIT showUserDetail(user);
Q_EMIT showUserDetail(user, action == "qr"_ls ? nullptr : currentRoom());
} else if (action == "_interactive"_ls) {
user->requestDirectChat();
} else if (action == "chat"_ls) {