From 43f1b82d3356322c3cf126d991424d47228446da Mon Sep 17 00:00:00 2001 From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Date: Mon, 16 Jan 2023 19:52:25 +0100 Subject: [PATCH 1/2] Add `dependabot.yml` config (#292) --- .github/dependabot.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..c179434 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,20 @@ +version: 2 +updates: + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" + ignore: + # Major updates for react-admin have breaking changes + - dependency-name: "react-admin" + update-types: ["version-update:semver-major"] + + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "weekly" + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From bd6b6eef8549b8e699dca504b0925991d86de036 Mon Sep 17 00:00:00 2001 From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Date: Mon, 16 Jan 2023 19:53:17 +0100 Subject: [PATCH 2/2] Use delete room API v2 (delete room in background) (#211) Co-authored-by: Michael Albert <37796947+awesome-michael@users.noreply.github.com> --- README.md | 2 +- src/synapse/dataProvider.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4322072..5fdecbd 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This project is built using [react-admin](https://marmelab.com/react-admin/). ### Supported Synapse -It needs at least [Synapse](https://github.com/matrix-org/synapse) v1.46.0 for all functions to work as expected! +It needs at least [Synapse](https://github.com/matrix-org/synapse) v1.48.0 for all functions to work as expected! You get your server version with the request `/_synapse/admin/v1/server_version`. See also [Synapse version API](https://matrix-org.github.io/synapse/develop/admin_api/version_api.html). diff --git a/src/synapse/dataProvider.js b/src/synapse/dataProvider.js index 31015ee..3165f01 100644 --- a/src/synapse/dataProvider.js +++ b/src/synapse/dataProvider.js @@ -69,7 +69,7 @@ const resourceMap = { return json.total_rooms; }, delete: params => ({ - endpoint: `/_synapse/admin/v1/rooms/${params.id}`, + endpoint: `/_synapse/admin/v2/rooms/${params.id}`, body: { block: false }, }), },