pull/115/head
Nicolas Werner 5 years ago
parent 32375518de
commit 4612266a67
  1. 2
      CMakeLists.txt
  2. 90
      src/dialogs/RoomSettings.cpp
  3. 2
      src/dialogs/RoomSettings.h

@ -334,7 +334,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare( FetchContent_Declare(
MatrixClient MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG 5404286b79e8c4e5dbaf69cba42c4054fb91ee18 GIT_TAG c914f8bd042bf8c2d0ee499c0d89e010e8ba9180
) )
FetchContent_MakeAvailable(MatrixClient) FetchContent_MakeAvailable(MatrixClient)
else() else()

@ -211,11 +211,91 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
roomVersionLayout->addWidget(roomVersionLabel, 0, Qt::AlignBottom | Qt::AlignRight); roomVersionLayout->addWidget(roomVersionLabel, 0, Qt::AlignBottom | Qt::AlignRight);
auto notifLabel = new QLabel(tr("Notifications"), this); auto notifLabel = new QLabel(tr("Notifications"), this);
auto notifCombo = new QComboBox(this); notifCombo = new QComboBox(this);
notifCombo->setDisabled(true); notifCombo->addItem(tr(
notifCombo->addItem(tr("Muted")); "Muted")); //{"conditions":[{"kind":"event_match","key":"room_id","pattern":"!jxlRxnrZCsjpjDubDX:matrix.org"}],"actions":["dont_notify"]}
notifCombo->addItem(tr("Mentions only")); notifCombo->addItem(tr("Mentions only")); // {"actions":["dont_notify"]}
notifCombo->addItem(tr("All messages")); notifCombo->addItem(tr("All messages")); // delete rule
connect(this, &RoomSettings::notifChanged, notifCombo, &QComboBox::setCurrentIndex);
http::client()->get_pushrules(
"global",
"override",
room_id_.toStdString(),
[this](const mtx::pushrules::PushRule &rule, mtx::http::RequestErr &err) {
if (err) {
if (err->status_code == boost::beast::http::status::not_found)
emit notifChanged(2); // all messages
return;
}
if (rule.actions.size() == 1 &&
std::holds_alternative<mtx::pushrules::actions::dont_notify>(
rule.actions[0])) {
if (rule.conditions.empty())
emit notifChanged(1); // mentions only
else
emit notifChanged(0); // muted
}
});
connect(notifCombo, QOverload<int>::of(&QComboBox::activated), [this](int index) {
std::string room_id = room_id_.toStdString();
if (index == 0) {
// mute room
// delete old rule first, then add new rule
mtx::pushrules::PushRule rule;
rule.actions = {mtx::pushrules::actions::dont_notify{}};
mtx::pushrules::PushCondition condition;
condition.kind = "event_match";
condition.key = "room_id";
condition.pattern = room_id;
rule.conditions = {condition};
http::client()->put_pushrules(
"global",
"override",
room_id,
rule,
[room_id](mtx::http::RequestErr &err) {
if (err)
nhlog::net()->error(
"failed to set pushrule for room {}: {} {}",
room_id,
static_cast<int>(err->status_code),
err->matrix_error.error);
});
} else if (index == 1) {
// mentions only
// delete old rule first, then add new rule
mtx::pushrules::PushRule rule;
rule.actions = {mtx::pushrules::actions::dont_notify{}};
http::client()->put_pushrules(
"global",
"override",
room_id,
rule,
[room_id](mtx::http::RequestErr &err) {
if (err)
nhlog::net()->error(
"failed to set pushrule for room {}: {} {}",
room_id,
static_cast<int>(err->status_code),
err->matrix_error.error);
});
} else {
// all messages
http::client()->delete_pushrules(
"global", "override", room_id, [room_id](mtx::http::RequestErr &err) {
if (err)
nhlog::net()->error(
"failed to delete pushrule for room {}: {} {}",
room_id,
static_cast<int>(err->status_code),
err->matrix_error.error);
});
}
});
auto notifOptionLayout_ = new QHBoxLayout; auto notifOptionLayout_ = new QHBoxLayout;
notifOptionLayout_->setMargin(0); notifOptionLayout_->setMargin(0);

@ -119,6 +119,7 @@ signals:
void enableEncryptionError(const QString &msg); void enableEncryptionError(const QString &msg);
void showErrorMessage(const QString &msg); void showErrorMessage(const QString &msg);
void accessRulesUpdated(); void accessRulesUpdated();
void notifChanged(int index);
protected: protected:
void showEvent(QShowEvent *event) override; void showEvent(QShowEvent *event) override;
@ -163,6 +164,7 @@ private:
QLabel *errorLabel_ = nullptr; QLabel *errorLabel_ = nullptr;
LoadingIndicator *spinner_ = nullptr; LoadingIndicator *spinner_ = nullptr;
QComboBox *notifCombo = nullptr;
QComboBox *accessCombo = nullptr; QComboBox *accessCombo = nullptr;
Toggle *encryptionToggle_ = nullptr; Toggle *encryptionToggle_ = nullptr;
Toggle *keyRequestsToggle_ = nullptr; Toggle *keyRequestsToggle_ = nullptr;

Loading…
Cancel
Save