diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index a355a5b2..a7d5bf64 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -659,6 +659,25 @@ ChatPage::trySync()
}
void
+ChatPage::knockRoom(const QString &room)
+{
+ const auto room_id = room.toStdString();
+ if (QMessageBox::Yes !=
+ QMessageBox::question(
+ nullptr, tr("Confirm knock"), tr("Do you really want to ask to join %1?").arg(room)))
+ return;
+
+ http::client()->knock_room(
+ room_id, {}, [this, room_id](const mtx::responses::RoomId &, mtx::http::RequestErr err) {
+ if (err) {
+ emit showNotification(tr("Failed to knock room: %1")
+ .arg(QString::fromStdString(err->matrix_error.error)));
+ return;
+ }
+ });
+}
+
+void
ChatPage::joinRoom(const QString &room)
{
const auto room_id = room.toStdString();
@@ -686,8 +705,6 @@ ChatPage::joinRoomVia(const std::string &room_id,
return;
}
- emit tr("You joined the room");
-
// We remove any invites with the same room_id.
try {
cache::removeInvite(room_id);
diff --git a/src/ChatPage.h b/src/ChatPage.h
index f43a008d..cfa6f275 100644
--- a/src/ChatPage.h
+++ b/src/ChatPage.h
@@ -84,6 +84,7 @@ public slots:
void leaveRoom(const QString &room_id);
void createRoom(const mtx::requests::CreateRoom &req);
void joinRoom(const QString &room);
+ void knockRoom(const QString &room);
void joinRoomVia(const std::string &room_id,
const std::vector<std::string> &via,
bool promptForConfirmation = true);
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index f7c4fc1e..4116729d 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -670,6 +670,8 @@ InputBar::command(const QString &command, QString args)
reaction(eventId, args.trimmed());
} else if (command == QLatin1String("join")) {
ChatPage::instance()->joinRoom(args);
+ } else if (command == QLatin1String("knock")) {
+ ChatPage::instance()->knockRoom(args);
} else if (command == QLatin1String("part") || command == QLatin1String("leave")) {
ChatPage::instance()->timelineManager()->openLeaveRoomDialog(room->roomId());
} else if (command == QLatin1String("invite")) {
|
