From a176de5f11f11bb3dad6cb8ea71a3b5edd6f27f4 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Fri, 11 Jun 2021 20:46:57 -0400
Subject: [PATCH] Make sure to use the default room id if none is specified
---
resources/qml/InviteDialog.qml | 3 ++-
src/timeline/TimelineModel.cpp | 6 +++---
src/timeline/TimelineModel.h | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/resources/qml/InviteDialog.qml b/resources/qml/InviteDialog.qml
index d5cc4c6d0..278f772ff 100644
--- a/resources/qml/InviteDialog.qml
+++ b/resources/qml/InviteDialog.qml
@@ -43,10 +43,11 @@ ApplicationWindow {
RowLayout {
spacing: 10
- TextField {
+ MatrixTextField {
id: inviteeEntry
placeholderText: qsTr("@joe:matrix.org", "Example user id. The name 'joe' can be localized however you want.")
+ backgroundColor: colors.window
Layout.fillWidth: true
onAccepted: if (text !== "") addInvite()
}
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 2127801cf..ebbca6f41 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1077,11 +1077,11 @@ TimelineModel::openRoomSettings(QString room_id)
}
void
-TimelineModel::openInviteUsers(QString room_id)
+TimelineModel::openInviteUsers(QString roomId)
{
InviteesModel *model = new InviteesModel{this};
- connect(model, &InviteesModel::accept, this, [this, model, room_id]() {
- manager_->inviteUsers(room_id, model->mxids());
+ connect(model, &InviteesModel::accept, this, [this, model, roomId]() {
+ manager_->inviteUsers(roomId == QString() ? room_id_ : roomId, model->mxids());
});
openInviteUsersDialog(model);
}
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index e5189e61b..b51443089 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -240,7 +240,7 @@ public:
Q_INVOKABLE void openUserProfile(QString userid);
Q_INVOKABLE void openRoomMembers();
Q_INVOKABLE void openRoomSettings(QString room_id = QString());
- Q_INVOKABLE void openInviteUsers(QString room_id = QString());
+ Q_INVOKABLE void openInviteUsers(QString roomId = QString());
Q_INVOKABLE void editAction(QString id);
Q_INVOKABLE void replyAction(QString id);
Q_INVOKABLE void readReceiptsAction(QString id) const;
--
GitLab