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

Show a room preview in the join confirmation dialog

Browse source 
Requires MSC3266

Fixes #1129
This commit is contained in:
Nicolas Werner 2022-08-05 21:44:40 +02:00
parent 213a28eee3
commit 9d8d6b4bca
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
13 changed files with 355 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/ChatPage.cpp
View file

@ -22,6 +22,7 @@
#include "Utils.h"
#include "encryption/DeviceVerificationFlow.h"
#include "encryption/Olm.h"
#include "ui/RoomSummary.h"
#include "ui/Theme.h"
#include "ui/UserProfile.h"
#include "voip/CallManager.h"
@ -130,7 +131,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QObject *parent)
connect(this,
&ChatPage::internalKnock,
this,
qOverload<const QString &, const std::vector<std::string> &, QString, bool>(
qOverload<const QString &, const std::vector<std::string> &, QString, bool, bool>(
&ChatPage::knockRoom),
Qt::QueuedConnection);
connect(this, &ChatPage::leftRoom, this, &ChatPage::removeRoom);
@ -697,23 +698,26 @@ void
ChatPage::knockRoom(const QString &room,
const std::vector<std::string> &via,
QString reason,
bool failedJoin)
bool failedJoin,
bool promptForConfirmation)
{
const auto room_id = room.toStdString();
bool confirmed = false;
reason = QInputDialog::getText(
nullptr,
tr("Knock on room"),
// clang-format off
if (promptForConfirmation) {
reason = QInputDialog::getText(
nullptr,
tr("Knock on room"),
// clang-format off
failedJoin
? tr("You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?\nYou may optionally provide a reason for others to accept your knock:").arg(room)
: tr("Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:").arg(room),
// clang-format on
QLineEdit::Normal,
reason,
&confirmed);
if (!confirmed) {
return;
// clang-format on
QLineEdit::Normal,
reason,
&confirmed);
if (!confirmed) {
return;
}
}
http::client()->knock_room(
@ -742,13 +746,12 @@ ChatPage::joinRoomVia(const std::string &room_id,
bool promptForConfirmation,
const QString &reason)
{
if (promptForConfirmation &&
QMessageBox::Yes !=
QMessageBox::question(
nullptr,
tr("Confirm join"),
tr("Do you really want to join %1?").arg(QString::fromStdString(room_id))))
if (promptForConfirmation) {
auto prompt = new RoomSummary(room_id, via, reason);
QQmlEngine::setObjectOwnership(prompt, QQmlEngine::JavaScriptOwnership);
emit showRoomJoinPrompt(prompt);
return;
}
http::client()->join_room(
room_id,
@ -756,7 +759,7 @@ ChatPage::joinRoomVia(const std::string &room_id,
[this, room_id, reason, via](const mtx::responses::RoomId &, mtx::http::RequestErr err) {
if (err) {
if (err->matrix_error.errcode == mtx::errors::ErrorCode::M_FORBIDDEN)
emit internalKnock(QString::fromStdString(room_id), via, reason, true);
emit internalKnock(QString::fromStdString(room_id), via, reason, true, true);
else
emit showNotification(tr("Failed to join room: %1")
.arg(QString::fromStdString(err->matrix_error.error)));