rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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 { RowLayout {
spacing: 10 spacing: 10
TextField { MatrixTextField {
id: inviteeEntry id: inviteeEntry
placeholderText: qsTr("@joe:matrix.org", "Example user id. The name 'joe' can be localized however you want.") placeholderText: qsTr("@joe:matrix.org", "Example user id. The name 'joe' can be localized however you want.")
backgroundColor: colors.window
Layout.fillWidth: true Layout.fillWidth: true
onAccepted: if (text !== "") addInvite() onAccepted: if (text !== "") addInvite()
} }

6
src/timeline/TimelineModel.cpp
View File

@ -1077,11 +1077,11 @@ TimelineModel::openRoomSettings(QString room_id)
} }
void void
TimelineModel::openInviteUsers(QString room_id) TimelineModel::openInviteUsers(QString roomId)
{ {
InviteesModel *model = new InviteesModel{this}; InviteesModel *model = new InviteesModel{this};
connect(model, &InviteesModel::accept, this, [this, model, room_id]() { connect(model, &InviteesModel::accept, this, [this, model, roomId]() {
manager_->inviteUsers(room_id, model->mxids()); manager_->inviteUsers(roomId == QString() ? room_id_ : roomId, model->mxids());
}); });
openInviteUsersDialog(model); openInviteUsersDialog(model);
} }

2
src/timeline/TimelineModel.h
View File

@ -240,7 +240,7 @@ public:
Q_INVOKABLE void openUserProfile(QString userid); Q_INVOKABLE void openUserProfile(QString userid);
Q_INVOKABLE void openRoomMembers(); Q_INVOKABLE void openRoomMembers();
Q_INVOKABLE void openRoomSettings(QString room_id = QString()); 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 editAction(QString id);
Q_INVOKABLE void replyAction(QString id); Q_INVOKABLE void replyAction(QString id);
Q_INVOKABLE void readReceiptsAction(QString id) const; Q_INVOKABLE void readReceiptsAction(QString id) const;