d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-26 04:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Loren Burkholder 2021-06-11 20:46:57 -04:00
parent f0c88fc474
commit a176de5f11
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/qml/InviteDialog.qml
View file

@ -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()
}

6
src/timeline/TimelineModel.cpp
View file

@ -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);
}

2
src/timeline/TimelineModel.h
View file

@ -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;