diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 70fd32fd..6b8c1e10 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -116,34 +116,6 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
connect(this, &ChatPage::loggedOut, this, &ChatPage::logout);
- // TODO: once this signal is moved, reenable this
- // connect(view_manager_, &TimelineViewManager::inviteUsers, this, [this](QStringList
- // users) {
- // const auto room_id = currentRoom().toStdString();
-
- // for (int ii = 0; ii < users.size(); ++ii) {
- // QTimer::singleShot(ii * 500, this, [this, room_id, ii, users]() {
- // const auto user = users.at(ii);
-
- // http::client()->invite_user(
- // room_id,
- // user.toStdString(),
- // [this, user](const mtx::responses::RoomInvite &,
- // mtx::http::RequestErr err) {
- // if (err) {
- // emit showNotification(
- // tr("Failed to invite user:
- // %1").arg(user));
- // return;
- // }
-
- // emit showNotification(tr("Invited user:
- // %1").arg(user));
- // });
- // });
- // }
- // });
-
connect(
view_manager_,
&TimelineViewManager::inviteUsers,
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 516a499b..7ce0e98a 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1074,7 +1074,7 @@ TimelineModel::openRoomSettings(QString room_id)
{
RoomSettings *settings = new RoomSettings(room_id == QString() ? roomId() : room_id, this);
connect(this, &TimelineModel::roomAvatarUrlChanged, settings, &RoomSettings::avatarChanged);
- openRoomSettingsDialog(settings);
+ emit openRoomSettingsDialog(settings);
}
void
@@ -1082,9 +1082,9 @@ TimelineModel::openInviteUsers(QString roomId)
{
InviteesModel *model = new InviteesModel{this};
connect(model, &InviteesModel::accept, this, [this, model, roomId]() {
- manager_->inviteUsers(roomId == QString() ? room_id_ : roomId, model->mxids());
+ emit manager_->inviteUsers(roomId == QString() ? room_id_ : roomId, model->mxids());
});
- openInviteUsersDialog(model);
+ emit openInviteUsersDialog(model);
}
void
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 8daa2124..64493e5b 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -430,14 +430,6 @@ TimelineViewManager::openImageOverlayInternal(QString eventId, QImage img)
});
}
-// void
-// TimelineViewManager::openInviteUsersDialog()
-//{
-// TODO: move this somewhere where it will actually work (probably Rooms)
-// MainWindow::instance()->openInviteUsersDialog(
-// [this](const QStringList &invitees) { emit inviteUsers(invitees); });
-//}
-
void
TimelineViewManager::openLeaveRoomDialog(QString roomid) const
{
|
