Skip to content
Snippets Groups Projects
Commit a176de5f authored by Loren Burkholder's avatar Loren Burkholder
Browse files

Make sure to use the default room id if none is specified

parent f0c88fc4
No related branches found
No related tags found
Loading
......@@ -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()
}
......
......@@ -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);
}
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment