upd workflow2

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 7.1.1 to 7.1.2.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v7.1.2/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 7.1.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.dockerignore

@@ -0,0 +1 @@
+/testdata

.gitea/workflows/build.yml

@@ -0,0 +1,33 @@
+name: Build Application
+on:
+  push:
+    tags:
+      - 'v*.*'
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: large
+    steps:
+
+      # Шаг 1: Checkout кода
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Шаг 2: Логин в Docker Registry (Gitea)
+      - name: Login to Gitea Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.GIT_INSTANCE }} # Замените на адрес вашего Gitea
+          username: ${{ secrets.GIT_USERNAME }}
+          password: ${{ secrets.GIT_TOKEN }}
+
+      # Шаг 3: Сборка и пуш Docker образа
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./
+          push: true
+          tags: |
+            ${{ vars.GIT_INSTANCE }}/${{ secrets.GIT_USERNAME }}/${{ vars.REPOSITORY }}:latest
+            ${{ vars.GIT_INSTANCE }}/${{ secrets.GIT_USERNAME }}/${{ vars.REPOSITORY }}:${{ github.sha }}

.github/FUNDING.yml

@@ -1 +0,0 @@
-liberapay: etkecc

.github/dependabot.yml

@@ -1,19 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 30
-
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 30
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 30

.github/workflows/workflow.yml

@@ -1,115 +0,0 @@
-name: CI
-on:
-  push:
-    branches: [ "main" ]
-    tags: [ "v*" ]
-env:
-  bunny_version: v0.1.0
-  base_path: ./
-permissions:
-  checks: write
-  contents: write
-  packages: write
-  pull-requests: read
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-          cache: yarn
-      - name: Install dependencies
-        run: yarn install --immutable --network-timeout=300000
-      - name: Build
-        run: yarn build --base=${{ env.base_path }}
-      - uses: actions/upload-artifact@v4
-        with:
-          path: dist/
-          name: dist
-          if-no-files-found: error
-          retention-days: 1
-          compression-level: 0
-          overwrite: true
-          include-hidden-files: true
-
-  docker:
-    name: Docker
-    needs: build
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
-        with:
-          name: dist
-          path: dist/
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to ghcr.io
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/${{ github.repository }}
-            registry.etke.cc/${{ github.repository }}
-          tags: |
-            type=raw,value=latest,enable=${{ github.ref_name == 'main' }}
-            type=semver,pattern={{raw}}
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  cdn:
-    name: CDN
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
-        with:
-          name: dist
-          path: dist/
-      - name: Upload
-        run: |
-          wget -O bunny-upload.tar.gz https://github.com/etkecc/bunny-upload/releases/download/${{ env.bunny_version }}/bunny-upload_Linux_x86_64.tar.gz
-          tar -xzf bunny-upload.tar.gz
-          echo "${{ secrets.BUNNY_CONFIG }}" > bunny-config.yaml
-          ./bunny-upload -c bunny-config.yaml
-
-  github-release:
-    name: Github Release
-    needs: build
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
-        with:
-          name: dist
-          path: dist/
-      - name: Prepare release
-        run: |
-          mv dist synapse-admin
-          tar chvzf synapse-admin.tar.gz synapse-admin
-      - uses: softprops/action-gh-release@v2
-        with:
-          files: synapse-admin.tar.gz
-          generate_release_notes: true
-          make_latest: "true"
-          draft: false
-          prerelease: false

Dockerfile

@@ -1,5 +1,11 @@
+FROM node:lts AS builder
+ARG BASE_PATH=./
+WORKDIR /src
+COPY . /src
+RUN yarn config set enableTelemetry 0 && \
+    yarn install --immutable --network-timeout=300000 && \
+    yarn build --base=$BASE_PATH
+
 FROM ghcr.io/static-web-server/static-web-server:2
-
 ENV SERVER_ROOT=/app
-
-COPY ./dist /app
+COPY --from=builder /src/dist /app

Dockerfile.old

@@ -0,0 +1,5 @@
+FROM ghcr.io/static-web-server/static-web-server:2
+
+ENV SERVER_ROOT=/app
+
+COPY ./dist /app

README.md

@@ -27,6 +27,7 @@
 * [Configuration](#configuration)
   * [Prefilling login form](#prefilling-login-form)
   * [Restricting available homeserver](#restricting-available-homeserver)
+  * [Configuring CORS credentials](#configuring-cors-credentials)
   * [Protecting appservice managed users](#protecting-appservice-managed-users)
   * [Adding custom menu items](#adding-custom-menu-items)
 * [Usage](#usage)
@@ -54,7 +55,7 @@ The full list is described below in the [Changes](#changes) section.
 * As a core/default component on [etke.cc](https://etke.cc/?utm_source=github&utm_medium=readme&utm_campaign=synapse-admin)
 * As a standalone app on [admin.etke.cc](https://admin.etke.cc)
 * As a prebuilt distribution on [GitHub Releases](https://github.com/etkecc/synapse-admin/releases)
-* As a Docker container on [GitHub Container Registry](https://github.com/etkecc/synapse-admin/pkgs/container/synapse-admin)
+* As a Docker container on [Docker Hub](https://hub.docker.com/r/etkecc/synapse-admin) and [GitHub Container Registry](https://github.com/etkecc/synapse-admin/pkgs/container/synapse-admin)
 * As a component in [Matrix-Docker-Ansible-Deploy Playbook](https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/master/docs/configuring-playbook-synapse-admin.md)
 
 ### Changes
@@ -108,8 +109,15 @@ The following changes are already implemented:
 * 📞 [Support E.164-based Matrix IDs (MSC4009)](https://github.com/etkecc/synapse-admin/pull/214)
 * 🛑 [Add support for Account Suspension (MSC3823)](https://github.com/etkecc/synapse-admin/pull/195)
 * 🗑️ [Add "Purge Remote Media" button](https://github.com/etkecc/synapse-admin/pull/237)
-* [Respect base url (`BASE_PATH` / `vite build --base`) when loading `config.json`](https://github.com/etkecc/synapse-admin/pull/274)
-* [Add Users' Account Data tab](https://github.com/etkecc/synapse-admin/pull/276)
+* 📁 [Respect base url (`BASE_PATH` / `vite build --base`) when loading `config.json`](https://github.com/etkecc/synapse-admin/pull/274)
+* 🗂️ [Add Users' Account Data tab](https://github.com/etkecc/synapse-admin/pull/276)
+* 🧾 [Make bulk registration CSV import more user-friendly](https://github.com/etkecc/synapse-admin/pull/411)
+* 🌐 [Configurable CORS Credentials](https://github.com/etkecc/synapse-admin/pull/456)
+* 🧪 [Do not check homeserver URL during typing in the login form](https://github.com/etkecc/synapse-admin/pull/585)
+* 🔧 [Improve user account status toggles](https://github.com/etkecc/synapse-admin/pull/608)
+* 🛡️ [Validate that password is entered upon reactivation of account](https://github.com/etkecc/synapse-admin/pull/609)
+* 🌏 [Add Japanese localization](https://github.com/etkecc/synapse-admin/pull/631)
+* 🗣️ [Correctly set document language based on the selected locale](https://github.com/etkecc/synapse-admin/issues/723)
 
 #### exclusive for [etke.cc](https://etke.cc) customers
 
@@ -118,6 +126,9 @@ The following list contains such features - they are only available for [etke.cc
 
 * 📊 [Server Status indicator and page](https://github.com/etkecc/synapse-admin/pull/182)
 * 📬 [Server Notifications indicator and page](https://github.com/etkecc/synapse-admin/pull/240)
+* 🛠️ [Server Commands panel](https://github.com/etkecc/synapse-admin/pull/365)
+* 🚀 [Server Actions page](https://github.com/etkecc/synapse-admin/pull/457)
+* 💳 [Billing page](https://github.com/etkecc/synapse-admin/pull/691)
 
 ### Development
 
@@ -178,6 +189,12 @@ You can restrict the homeserver(s), so that the user can no longer define it him
 
 [Documentation](./docs/restrict-hs.md)
 
+### Configuring CORS credentials
+
+You can configure the CORS credentials mode for the Synapse Admin instance.
+
+[Documentation](./docs/cors-credentials.md)
+
 ### Protecting appservice managed users
 
 To avoid accidental adjustments of appservice-managed users (e.g., puppets created by a bridge) and breaking the bridge,
@@ -261,6 +278,7 @@ You have three options:
       hostname: synapse-admin
       build:
         context: https://github.com/etkecc/synapse-admin.git
+        dockerfile: Dockerfile.build
         args:
           - BUILDKIT_CONTEXT_KEEP_GIT_DIR=1
         #   - NODE_OPTIONS="--max_old_space_size=1024"
@@ -289,7 +307,7 @@ Example for Traefik:
 ```yml
 services:
   traefik:
-    image: traefik:mimolette
+    image: traefik:v3
     restart: unless-stopped
     ports:
       - 80:80
@@ -302,11 +320,12 @@ services:
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.synapse-admin.rule=Host(`example.com`)&&PathPrefix(`/admin`)"
-      - "traefik.http.routers.synapse-admin.middlewares=admin,admin_path"
-      - "traefik.http.middlewares.admin.redirectregex.regex=^(.*)/admin/?"
-      - "traefik.http.middlewares.admin.redirectregex.replacement=$${1}/admin/"
-      - "traefik.http.middlewares.admin_path.stripprefix.prefixes=/admin"
+      - "traefik.http.routers.admin.rule=Host(`example.com`) && PathPrefix(`/admin`)"
+      - "traefik.http.services.admin.loadbalancer.server.port=80"
+      - "traefik.http.middlewares.admin-slashless-redirect.redirectregex.regex=(/admin)$$"
+      - "traefik.http.middlewares.admin-slashless-redirect.redirectregex.replacement=$${1}/"
+      - "traefik.http.middlewares.admin-strip-prefix.stripprefix.prefixes=/admin"
+      - "traefik.http.routers.admin.middlewares=admin-slashless-redirect,admin-strip-prefix"
 ```
 
 ## Development

docker-compose.yml

@@ -5,6 +5,7 @@ services:
     image: ghcr.io/etkecc/synapse-admin:latest
     # build:
     #   context: .
+    #   dockerfile: Dockerfile.build
 
     # to use the docker-compose as standalone without a local repo clone,
     # replace the context definition with this:

docs/README.md

@@ -17,6 +17,7 @@ Table of contents:
 
 Specific configuration options:
 
+* [Customizing CORS credentials](./cors-credentials.md)
 * [Restricting available homeserver](./restrict-hs.md)
 * [System / Appservice-managed Users](./system-users.md)
 * [Custom Menu Items](./custom-menu.md)
@@ -33,6 +34,10 @@ they are not available for any other Synapse Admin deployments.
 
 * [Server Status icon](../src/components/etke.cc/README.md#server-status-icon)
 * [Server Status page](../src/components/etke.cc/README.md#server-status-page)
+* [Server Actions page](../src/components/etke.cc/README.md#server-actions-page)
+* [Server Commands Panel](../src/components/etke.cc/README.md#server-commands-panel)
+* [Server Notifications icon](../src/components/etke.cc/README.md#server-notifications-icon)
+* [Server Notifications page](../src/components/etke.cc/README.md#server-notifications-page)
 
 ## Deployment
 

docs/config.md

@@ -28,6 +28,12 @@ In this case, you could provide the configuration in the `/.well-known/matrix/cl
   The homeserver URL should be the _actual_ homeserver URL, and not the delegated one.
   Example: `https://matrix.example.com` or `https://synapse.example.net`
   [More details](restrict-hs.md)
+* `corsCredentials` - configure the CORS credentials for the Synapse Admin instance.
+  It accepts the following values:
+  * `same-origin` (default): Cookies will be sent only if the request is made from the same origin as the server.
+  * `include`: Cookies will be sent regardless of the origin of the request.
+  * `omit`: Cookies will not be sent with the request.
+  [More details](cors-credentials.md)
 * `asManagedUsers` - protect system user accounts managed by appservices (such as bridges) / system (such as bots) from accidental changes.
   By defining a list of MXID regex patterns, you can protect these accounts from accidental changes.
   Example: `^@baibot:example\\.com$`, `^@slackbot:example\\.com$`, `^@slack_[a-zA-Z0-9\\-]+:example\\.com$`, `^@telegrambot:example\\.com$`, `^@telegram_[a-zA-Z0-9]+:example\\.com$`

docs/cors-credentials.md

@@ -0,0 +1,35 @@
+# CORS Credentials
+
+If you'd like to use cookie-based authentication
+(for example, [ForwardAuth with Authelia](https://github.com/Awesome-Technologies/synapse-admin/issues/655)),
+you can configure the `corsCredentials` option in the `config.json` file or in the `/.well-known/matrix/client` file.
+
+## Configuration
+
+> [Documentation on MDN](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#including_credentials)
+
+The `corsCredentials` option accepts the following values:
+
+* `same-origin` (default): Cookies will be sent only if the request is made from the same origin as the server.
+* `include`: Cookies will be sent regardless of the origin of the request.
+* `omit`: Cookies will not be sent with the request.
+
+[Configuration options](config.md)
+
+### config.json
+
+```json
+{
+  "corsCredentials": "include"
+}
+```
+
+### `/.well-known/matrix/client`
+
+```json
+{
+  "cc.etke.synapse-admin": {
+    "corsCredentials": "include"
+  }
+}
+```

docs/restrict-hs.md

@@ -9,7 +9,7 @@ You can do that for a single homeserver or multiple homeservers at once, as `res
 an array of strings.
 
 The examples below contain the configuration settings to restrict the Synapse Admin instance to work only with
-`example.com` (with Synapse runing at `matrix.example.com`) and
+`example.com` (with Synapse running at `matrix.example.com`) and
 `example.net` (with Synapse running at `synapse.example.net`) homeservers.
 Note that the homeserver URL should be the _actual_ homeserver URL, and not the delegated one.
 

jest.config.ts

@@ -2,7 +2,7 @@ import type { JestConfigWithTsJest } from "ts-jest";
 
 const config: JestConfigWithTsJest = {
   preset: "ts-jest",
-  testEnvironment: "jsdom",
+  testEnvironment: "jest-fixed-jsdom",
   collectCoverage: true,
   coveragePathIgnorePatterns: ["node_modules", "dist"],
   coverageDirectory: "<rootDir>/coverage/",
@@ -10,22 +10,23 @@ const config: JestConfigWithTsJest = {
   extensionsToTreatAsEsm: [".ts", ".tsx"],
   setupFilesAfterEnv: ["<rootDir>/src/jest.setup.ts"],
   transform: {
-    '^.+\\.tsx?$': [
-      'ts-jest',
+    "^.+\\.(js|jsx|ts|tsx)$": [
+      "ts-jest",
       {
         diagnostics: {
-          ignoreCodes: [1343]
+          ignoreCodes: [1343],
         },
         astTransformers: {
           before: [
             {
-              path: 'ts-jest-mock-import-meta',
-              options: { metaObjectReplacement: { env: { BASE_URL: "/" } } }
-            }
-          ]
-        }
-      }
-    ]
-  }
+              path: "ts-jest-mock-import-meta",
+              options: { metaObjectReplacement: { env: { BASE_URL: "/" } } },
+            },
+          ],
+        },
+      },
+    ],
+  },
+  transformIgnorePatterns: [],
 };
 export default config;

justfile

@@ -6,6 +6,9 @@ default:
 build: __install
     @yarn run build --base=./
 
+update:
+    yarn upgrade-interactive --latest
+
 # run the app in a development mode
 run:
     @yarn start --host 0.0.0.0

package.json

@@ -1,80 +1,100 @@
 {
   "name": "synapse-admin",
-  "version": "0.10.3",
-  "description": "Admin GUI for the Matrix.org server Synapse",
+  "version": "0.11.1",
+  "description": "Feature-packed and visually customizable admin GUI for Matrix Synapse servers.",
+  "keywords": [
+    "matrix",
+    "synapse",
+    "admin",
+    "homeserver",
+    "management",
+    "react",
+    "nodejs",
+    "dashboard",
+    "etkecc",
+    "docker"
+  ],
   "type": "module",
   "author": "etke.cc (originally by Awesome Technologies Innovationslabor GmbH)",
   "license": "Apache-2.0",
-  "homepage": ".",
+  "homepage": "https://github.com/etkecc/synapse-admin#readme",
   "repository": {
     "type": "git",
-    "url": "https://github.com/etkecc/synapse-admin"
+    "url": "git+https://github.com/etkecc/synapse-admin.git"
+  },
+  "bugs": {
+    "url": "https://github.com/etkecc/synapse-admin/issues"
+  },
+  "funding": {
+    "type": "individual",
+    "url": "https://liberapay.com/etkecc"
   },
   "devDependencies": {
-    "@eslint/js": "^9.17.0",
-    "@testing-library/dom": "^10.0.0",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.1.0",
-    "@testing-library/user-event": "^14.5.2",
-    "@types/jest": "^29.5.14",
-    "@types/lodash": "^4.17.14",
-    "@types/node": "^22.10.5",
-    "@types/papaparse": "^5.3.15",
-    "@types/react": "^18.3.12",
-    "@typescript-eslint/eslint-plugin": "^8.18.2",
-    "@typescript-eslint/parser": "^8.19.0",
-    "@vitejs/plugin-react": "^4.3.4",
-    "eslint": "^9.17.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-import": "^2.31.0",
+    "@eslint/js": "^9.32.0",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.6.4",
+    "@testing-library/react": "^16.3.0",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/jest": "^30.0.0",
+    "@types/lodash": "^4.17.20",
+    "@types/node": "^24.2.1",
+    "@types/papaparse": "^5.3.16",
+    "@types/react": "^19.1.10",
+    "@typescript-eslint/eslint-plugin": "^8.32.0",
+    "@typescript-eslint/parser": "^8.37.0",
+    "@vitejs/plugin-react": "^5.0.0",
+    "eslint": "^9.33.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "eslint-plugin-yaml": "^1.0.3",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
+    "jest": "^30.0.5",
+    "jest-environment-jsdom": "^30.0.5",
     "jest-fetch-mock": "^3.0.3",
-    "prettier": "^3.4.2",
-    "react-test-renderer": "^18.3.1",
-    "ts-jest": "^29.2.5",
+    "prettier": "^3.6.2",
+    "react-test-renderer": "^19.1.1",
+    "ts-jest": "^29.4.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.7.2",
-    "typescript-eslint": "^8.19.0",
-    "vite": "^6.0.7",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.39.1",
+    "vite": "^7.1.2",
     "vite-plugin-version-mark": "^0.1.4"
   },
   "dependencies": {
+    "@bicstone/ra-language-japanese": "^5.10.0",
     "@emotion/react": "^11.14.0",
-    "@emotion/styled": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
     "@haleos/ra-language-german": "^1.0.0",
     "@haxqer/ra-language-chinese": "^4.16.2",
-    "@mui/icons-material": "^6.3.1",
-    "@mui/material": "^6.3.1",
-    "@mui/utils": "^5.16.13",
-    "@tanstack/react-query": "^5.62.15",
+    "@mui/icons-material": "^7.3.1",
+    "@mui/material": "^7.3.1",
+    "@mui/utils": "^7.1.0",
+    "@tanstack/react-query": "^5.84.2",
     "history": "^5.3.0",
+    "jest-fixed-jsdom": "^0.0.9",
     "lodash": "^4.17.21",
-    "papaparse": "^5.4.1",
-    "ra-core": "^5.4.1",
-    "ra-i18n-polyglot": "^5.3.4",
-    "ra-language-english": "^5.3.4",
+    "papaparse": "^5.5.3",
+    "ra-core": "^5.4.4",
+    "ra-i18n-polyglot": "^5.4.4",
+    "ra-language-english": "^5.4.4",
     "ra-language-farsi": "^5.1.0",
-    "ra-language-french": "^5.4.3",
+    "ra-language-french": "^5.10.1",
     "ra-language-italian": "^3.13.1",
-    "ra-language-russian": "^4.14.2",
-    "react": "^18.3.1",
-    "react-admin": "^5.4.3",
-    "react-dom": "^18.3.1",
-    "react-hook-form": "^7.54.2",
-    "react-is": "^18.3.1",
-    "react-router": "^6.28.1",
-    "react-router-dom": "^6.28.1",
-    "ts-jest-mock-import-meta": "^1.2.1"
+    "ra-language-russian": "^5.4.4",
+    "react": "^19.1.1",
+    "react-admin": "^5.10.1",
+    "react-dom": "^19.1.1",
+    "react-hook-form": "^7.62.0",
+    "react-is": "^19.1.1",
+    "react-router": "^7.6.0",
+    "react-router-dom": "^7.8.0",
+    "ts-jest-mock-import-meta": "^1.3.1"
   },
   "scripts": {
     "start": "vite serve",
     "build": "vite build",
-    "lint": "ESLINT_USE_FLAT_CONFIG=false eslint --ignore-path .gitignore --ignore-pattern testdata/ --ext .ts,.tsx,.yml,.yaml .",
+    "lint": "ESLINT_USE_FLAT_CONFIG=false eslint --ignore-path .gitignore --ignore-pattern testdata/ --ext .ts,.tsx .",
     "fix": "yarn lint --fix",
     "test": "yarn jest",
     "test:watch": "yarn jest --watch"
@@ -87,15 +107,13 @@
       "import",
       "prettier",
       "unused-imports",
-      "@typescript-eslint",
-      "yaml"
+      "@typescript-eslint"
     ],
     "extends": [
       "eslint:recommended",
       "plugin:@typescript-eslint/recommended",
       "plugin:@typescript-eslint/stylistic",
-      "plugin:import/typescript",
-      "plugin:yaml/legacy"
+      "plugin:import/typescript"
     ],
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
@@ -104,6 +122,18 @@
     "root": true,
     "rules": {
       "prettier/prettier": "error",
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          "args": "all",
+          "argsIgnorePattern": "^_",
+          "caughtErrors": "all",
+          "caughtErrorsIgnorePattern": "^_",
+          "destructuredArrayIgnorePattern": "^_",
+          "varsIgnorePattern": "^_",
+          "ignoreRestSiblings": true
+        }
+      ],
       "import/no-extraneous-dependencies": [
         "error",
         {
@@ -134,8 +164,7 @@
             ]
           ]
         }
-      ],
-      "unused-imports/no-unused-imports-ts": 2
+      ]
     }
   },
   "prettier": {

src/App.test.tsx

@@ -1,12 +1,32 @@
 import { render, screen } from "@testing-library/react";
 import fetchMock from "jest-fetch-mock";
+import { BrowserRouter } from "react-router-dom";
 fetchMock.enableMocks();
 
+jest.mock("./synapse/authProvider", () => ({
+  __esModule: true,
+  default: {
+    logout: jest.fn().mockResolvedValue(undefined),
+  },
+}));
+
 import App from "./App";
 
 describe("App", () => {
+  beforeEach(() => {
+    // Reset all mocks before each test
+    fetchMock.resetMocks();
+    // Mock any fetch call to return empty JSON immediately
+    fetchMock.mockResponseOnce(JSON.stringify({}));
+  });
+
   it("renders", async () => {
-    render(<App />);
+    render(
+      <BrowserRouter>
+        <App />
+      </BrowserRouter>
+    );
+
     await screen.findAllByText("Welcome to Synapse Admin");
   });
 });

src/App.tsx

@@ -1,16 +1,23 @@
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { merge } from "lodash";
 import polyglotI18nProvider from "ra-i18n-polyglot";
-
 import { Admin, CustomRoutes, Resource, resolveBrowserLocale } from "react-admin";
-
 import { Route } from "react-router-dom";
 
 import AdminLayout from "./components/AdminLayout";
-import UserImport from "./components/UserImport";
+import BillingPage from "./components/etke.cc/BillingPage";
+import ServerActionsPage from "./components/etke.cc/ServerActionsPage";
+import ServerNotificationsPage from "./components/etke.cc/ServerNotificationsPage";
+import ServerStatusPage from "./components/etke.cc/ServerStatusPage";
+import RecurringCommandEdit from "./components/etke.cc/schedules/components/recurring/RecurringCommandEdit";
+import ScheduledCommandEdit from "./components/etke.cc/schedules/components/scheduled/ScheduledCommandEdit";
+import ScheduledCommandShow from "./components/etke.cc/schedules/components/scheduled/ScheduledCommandShow";
+import UserImport from "./components/user-import/UserImport";
 import germanMessages from "./i18n/de";
 import englishMessages from "./i18n/en";
 import frenchMessages from "./i18n/fr";
 import italianMessages from "./i18n/it";
+import japaneseMessages from "./i18n/ja";
 import russianMessages from "./i18n/ru";
 import chineseMessages from "./i18n/zh";
 import LoginPage from "./pages/LoginPage";
@@ -23,9 +30,6 @@ import userMediaStats from "./resources/user_media_statistics";
 import users from "./resources/users";
 import authProvider from "./synapse/authProvider";
 import dataProvider from "./synapse/dataProvider";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import ServerStatusPage from "./components/etke.cc/ServerStatusPage";
-import ServerNotificationsPage from "./components/etke.cc/ServerNotificationsPage";
 
 // TODO: Can we use lazy loading together with browser locale?
 const messages = {
@@ -33,6 +37,7 @@ const messages = {
   en: englishMessages,
   fr: frenchMessages,
   it: italianMessages,
+  ja: japaneseMessages,
   ru: russianMessages,
   zh: chineseMessages,
 };
@@ -44,9 +49,10 @@ const i18nProvider = polyglotI18nProvider(
     { locale: "de", name: "Deutsch" },
     { locale: "fr", name: "Français" },
     { locale: "it", name: "Italiano" },
+    { locale: "ja", name: "Japanese (日本語)" },
     { locale: "fa", name: "Persian (فارسی)" },
     { locale: "ru", name: "Russian (Русский)" },
-    { locale: "zh", name: "简体中文" },
+    { locale: "zh", name: "Chinese (简体中文)" },
   ]
 );
 
@@ -57,6 +63,7 @@ export const App = () => (
     <Admin
       disableTelemetry
       requireAuth
+      title="Synapse Admin"
       layout={AdminLayout}
       loginPage={LoginPage}
       authProvider={authProvider}
@@ -66,7 +73,14 @@ export const App = () => (
       <CustomRoutes>
         <Route path="/import_users" element={<UserImport />} />
         <Route path="/server_status" element={<ServerStatusPage />} />
+        <Route path="/server_actions" element={<ServerActionsPage />} />
+        <Route path="/server_actions/scheduled/:id/show" element={<ScheduledCommandShow />} />
+        <Route path="/server_actions/scheduled/:id" element={<ScheduledCommandEdit />} />
+        <Route path="/server_actions/scheduled/create" element={<ScheduledCommandEdit />} />
+        <Route path="/server_actions/recurring/:id" element={<RecurringCommandEdit />} />
+        <Route path="/server_actions/recurring/create" element={<RecurringCommandEdit />} />
         <Route path="/server_notifications" element={<ServerNotificationsPage />} />
+        <Route path="/billing" element={<BillingPage />} />
       </CustomRoutes>
       <Resource {...users} />
       <Resource {...rooms} />

src/components/AdminLayout.tsx

@@ -1,11 +1,29 @@
-import { CheckForApplicationUpdate, AppBar, TitlePortal, InspectorButton, Confirm, Layout, Logout, Menu, useLogout, UserMenu } from "react-admin";
-import { LoginMethod } from "../pages/LoginPage";
+import ManageHistoryIcon from "@mui/icons-material/ManageHistory";
+import PaymentIcon from "@mui/icons-material/Payment";
 import { useEffect, useState, Suspense } from "react";
-import { Icons, DefaultIcon } from "../utils/icons";
-import { MenuItem, GetConfig, ClearConfig } from "../utils/config";
+import {
+  CheckForApplicationUpdate,
+  AppBar,
+  TitlePortal,
+  InspectorButton,
+  Confirm,
+  Layout,
+  Logout,
+  Menu,
+  useLogout,
+  UserMenu,
+  useStore,
+  useLocaleState,
+} from "react-admin";
+
 import Footer from "./Footer";
-import ServerStatusBadge from "./etke.cc/ServerStatusBadge";
+import { LoginMethod } from "../pages/LoginPage";
+import { MenuItem, GetConfig, ClearConfig } from "../utils/config";
+import { Icons, DefaultIcon } from "../utils/icons";
 import { ServerNotificationsBadge } from "./etke.cc/ServerNotificationsBadge";
+import { ServerProcessResponse, ServerStatusResponse } from "../synapse/dataProvider";
+import ServerStatusBadge from "./etke.cc/ServerStatusBadge";
+import { ServerStatusStyledBadge } from "./etke.cc/ServerStatusBadge";
 
 const AdminUserMenu = () => {
   const [open, setOpen] = useState(false);
@@ -48,23 +66,68 @@ const AdminUserMenu = () => {
 };
 
 const AdminAppBar = () => {
-  return (<AppBar userMenu={<AdminUserMenu />}>
+  return (
+    <AppBar userMenu={<AdminUserMenu />}>
       <TitlePortal />
       <ServerStatusBadge />
       <ServerNotificationsBadge />
       <InspectorButton />
-  </AppBar>);
+    </AppBar>
+  );
 };
 
-const AdminMenu = (props) => {
+const AdminMenu = props => {
   const [menu, setMenu] = useState([] as MenuItem[]);
-  useEffect(() => setMenu(GetConfig().menu), []);
+  const [etkeRoutesEnabled, setEtkeRoutesEnabled] = useState(false);
+  useEffect(() => {
+    setMenu(GetConfig().menu);
+    if (GetConfig().etkeccAdmin) {
+      setEtkeRoutesEnabled(true);
+    }
+  }, []);
+  const [serverProcess, _setServerProcess] = useStore<ServerProcessResponse>("serverProcess", {
+    command: "",
+    locked_at: "",
+  });
+  const [serverStatus, _setServerStatus] = useStore<ServerStatusResponse>("serverStatus", {
+    success: false,
+    ok: false,
+    host: "",
+    results: [],
+  });
 
   return (
     <Menu {...props}>
+      {etkeRoutesEnabled && (
+        <Menu.Item
+          key="server_status"
+          to="/server_status"
+          leftIcon={
+            <ServerStatusStyledBadge
+              inSidebar={true}
+              command={serverProcess.command}
+              locked_at={serverProcess.locked_at}
+              isOkay={serverStatus.ok}
+              isLoaded={serverStatus.success}
+            />
+          }
+          primaryText="Server Status"
+        />
+      )}
+      {etkeRoutesEnabled && (
+        <Menu.Item
+          key="server_actions"
+          to="/server_actions"
+          leftIcon={<ManageHistoryIcon />}
+          primaryText="Server Actions"
+        />
+      )}
+      {etkeRoutesEnabled && <Menu.Item key="billing" to="/billing" leftIcon={<PaymentIcon />} primaryText="Billing" />}
       <Menu.ResourceItems />
-      {menu && menu.map((item, index) => {
+      {menu &&
+        menu.map((item, index) => {
           const { url, icon, label } = item;
+          /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
           const IconComponent = Icons[icon] as React.ComponentType<any> | undefined;
 
           return (
@@ -84,21 +147,33 @@ const AdminMenu = (props) => {
 };
 
 export const AdminLayout = ({ children }) => {
-  return <>
-    <Layout appBar={AdminAppBar} menu={AdminMenu} sx={{
-      ['& .RaLayout-appFrame']: {
-        minHeight: '90vh',
-        height: '90vh',
+  // Set the document language based on the selected locale
+  const [locale, _setLocale] = useLocaleState();
+  useEffect(() => {
+    document.documentElement.lang = locale;
+  }, [locale]);
+
+  return (
+    <>
+      <Layout
+        appBar={AdminAppBar}
+        menu={AdminMenu}
+        sx={{
+          ["& .RaLayout-appFrame"]: {
+            minHeight: "90vh",
+            height: "90vh",
           },
-      ['& .RaLayout-content']: {
-        marginBottom: '3rem',
+          ["& .RaLayout-content"]: {
+            marginBottom: "3rem",
           },
-    }}>
+        }}
+      >
         {children}
         <CheckForApplicationUpdate />
       </Layout>
       <Footer />
     </>
+  );
 };
 
 export default AdminLayout;

src/components/AvatarField.test.tsx

@@ -1,6 +1,7 @@
 import { render, screen, waitFor } from "@testing-library/react";
-import { RecordContextProvider } from "react-admin";
 import { act } from "react";
+import { RecordContextProvider } from "react-admin";
+
 import AvatarField from "./AvatarField";
 
 describe("AvatarField", () => {
@@ -8,7 +9,7 @@ describe("AvatarField", () => {
     // Mock fetch
     global.fetch = jest.fn(() =>
       Promise.resolve({
-        blob: () => Promise.resolve(new Blob(["mock image data"], { type: 'image/jpeg' })),
+        blob: () => Promise.resolve(new Blob(["mock image data"], { type: "image/jpeg" })),
       })
     ) as jest.Mock;
 

src/components/AvatarField.tsx

@@ -1,7 +1,8 @@
-import { get } from "lodash";
 import { Avatar, AvatarProps, Badge, Tooltip } from "@mui/material";
-import { FieldProps, useRecordContext, useTranslate } from "react-admin";
+import { get } from "lodash";
 import { useState, useEffect, useCallback } from "react";
+import { FieldProps, useRecordContext, useTranslate } from "react-admin";
+
 import { fetchAuthenticatedMedia } from "../utils/fetchMedia";
 import { isMXID, isASManaged } from "../utils/mxid";
 
@@ -96,12 +97,15 @@ const AvatarField = ({ source, ...rest }: AvatarProps & FieldProps) => {
             {letter}
           </Avatar>
         </Badge>
-      </Tooltip>);
+      </Tooltip>
+    );
   }
 
-  return (<Avatar alt={alt} classes={classes} sizes={sizes} src={src} sx={sx} variant={variant}>
+  return (
+    <Avatar alt={alt} classes={classes} sizes={sizes} src={src} sx={sx} variant={variant}>
       {letter}
-          </Avatar>);
+    </Avatar>
+  );
 };
 
 export default AvatarField;

src/components/DeleteRoomButton.tsx

@@ -1,9 +1,19 @@
+import ActionCheck from "@mui/icons-material/CheckCircle";
+import ActionDelete from "@mui/icons-material/Delete";
+import AlertError from "@mui/icons-material/ErrorOutline";
 import { Button, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle } from "@mui/material";
 import { Fragment, useState } from "react";
-import { SimpleForm, BooleanInput, useTranslate, RaRecord, useNotify, useRedirect, useDelete, NotificationType, useDeleteMany, Identifier, useUnselectAll } from "react-admin";
-import ActionDelete from "@mui/icons-material/Delete";
-import ActionCheck from "@mui/icons-material/CheckCircle";
-import AlertError from "@mui/icons-material/ErrorOutline";
+import {
+  SimpleForm,
+  BooleanInput,
+  useTranslate,
+  useNotify,
+  useRedirect,
+  NotificationType,
+  useDeleteMany,
+  Identifier,
+  useUnselectAll,
+} from "react-admin";
 
 interface DeleteRoomButtonProps {
   selectedIds: Identifier[];
@@ -13,7 +23,7 @@ interface DeleteRoomButtonProps {
 
 const resourceName = "rooms";
 
-const DeleteRoomButton: React.FC<DeleteRoomButtonProps> = (props) => {
+const DeleteRoomButton: React.FC<DeleteRoomButtonProps> = props => {
   const translate = useTranslate();
   const [open, setOpen] = useState(false);
   const [block, setBlock] = useState(false);
@@ -39,8 +49,7 @@ const DeleteRoomButton: React.FC<DeleteRoomButtonProps> = (props) => {
           unselectAll();
           redirect("/rooms");
         },
-        onError: (error) =>
-          notify("resources.rooms.action.erase.failure", { type: 'error' as NotificationType }),
+        onError: _error => notify("resources.rooms.action.erase.failure", { type: "error" as NotificationType }),
       }
     );
   };

src/components/DeleteUserButton.tsx

@@ -1,9 +1,19 @@
+import ActionCheck from "@mui/icons-material/CheckCircle";
+import ActionDelete from "@mui/icons-material/Delete";
+import AlertError from "@mui/icons-material/ErrorOutline";
 import { Button, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle } from "@mui/material";
 import { Fragment, useState } from "react";
-import { SimpleForm, BooleanInput, useTranslate, RaRecord, useNotify, useRedirect, useDelete, NotificationType, useDeleteMany, Identifier, useUnselectAll } from "react-admin";
-import ActionDelete from "@mui/icons-material/Delete";
-import ActionCheck from "@mui/icons-material/CheckCircle";
-import AlertError from "@mui/icons-material/ErrorOutline";
+import {
+  SimpleForm,
+  BooleanInput,
+  useTranslate,
+  useNotify,
+  useRedirect,
+  NotificationType,
+  useDeleteMany,
+  Identifier,
+  useUnselectAll,
+} from "react-admin";
 
 interface DeleteUserButtonProps {
   selectedIds: Identifier[];
@@ -13,7 +23,7 @@ interface DeleteUserButtonProps {
 
 const resourceName = "users";
 
-const DeleteUserButton: React.FC<DeleteUserButtonProps> = (props) => {
+const DeleteUserButton: React.FC<DeleteUserButtonProps> = props => {
   const translate = useTranslate();
   const [open, setOpen] = useState(false);
   const [deleteMedia, setDeleteMedia] = useState(false);
@@ -29,7 +39,7 @@ const DeleteUserButton: React.FC<DeleteUserButtonProps> = (props) => {
   const handleDialogOpen = () => setOpen(true);
   const handleDialogClose = () => setOpen(false);
 
-  const handleDelete = (values: {deleteMedia: boolean, redactEvents: boolean}) => {
+  const handleDelete = (values: { deleteMedia: boolean; redactEvents: boolean }) => {
     deleteMany(
       resourceName,
       { ids: recordIds, meta: values },
@@ -39,14 +49,13 @@ const DeleteUserButton: React.FC<DeleteUserButtonProps> = (props) => {
             messageArgs: {
               smart_count: recordIds.length,
             },
-            type: 'info' as NotificationType,
+            type: "info" as NotificationType,
           });
           handleDialogClose();
           unselectAll();
           redirect("/users");
         },
-        onError: (error) =>
-          notify("ra.notification.data_provider_error", { type: 'error' as NotificationType }),
+        onError: _error => notify("ra.notification.data_provider_error", { type: "error" as NotificationType }),
       }
     );
   };

src/components/DeviceRemoveButton.tsx

@@ -1,4 +1,5 @@
 import { DeleteWithConfirmButton, DeleteWithConfirmButtonProps, useRecordContext } from "react-admin";
+
 import { isASManaged } from "../utils/mxid";
 
 export const DeviceRemoveButton = (props: DeleteWithConfirmButtonProps) => {

src/components/ExperimentalFeatures.tsx

@@ -1,15 +1,20 @@
+import { Stack, Switch, Typography } from "@mui/material";
+import { useState, useEffect } from "react";
 import { useRecordContext } from "react-admin";
 import { useNotify } from "react-admin";
 import { useDataProvider } from "react-admin";
-import { useState, useEffect } from "react";
-import { Stack, Switch, Typography } from "@mui/material";
+
 import { ExperimentalFeaturesModel, SynapseDataProvider } from "../synapse/dataProvider";
 
 const experimentalFeaturesMap = {
   msc3881: "enable remotely toggling push notifications for another client",
   msc3575: "enable experimental sliding sync support",
 };
-const ExperimentalFeatureRow = (props: { featureKey: string, featureValue: boolean, updateFeature: (feature_name: string, feature_value: boolean) => void}) => {
+const ExperimentalFeatureRow = (props: {
+  featureKey: string;
+  featureValue: boolean;
+  updateFeature: (feature_name: string, feature_value: boolean) => void;
+}) => {
   const featureKey = props.featureKey;
   const featureValue = props.featureValue;
   const featureDescription = experimentalFeaturesMap[featureKey] ?? "";
@@ -20,7 +25,8 @@ const ExperimentalFeatureRow = (props: { featureKey: string, featureValue: boole
     props.updateFeature(featureKey, event.target.checked);
   };
 
-  return <Stack
+  return (
+    <Stack
       direction="row"
       spacing={2}
       alignItems="start"
@@ -34,20 +40,18 @@ const ExperimentalFeatureRow = (props: { featureKey: string, featureValue: boole
           variant="subtitle1"
           sx={{
             fontWeight: "medium",
-              color: "text.primary"
+            color: "text.primary",
           }}
         >
           {featureKey}
         </Typography>
-      <Typography
-          variant="body2"
-          color="text.secondary"
-      >
+        <Typography variant="body2" color="text.secondary">
           {featureDescription}
         </Typography>
       </Stack>
     </Stack>
-}
+  );
+};
 
 export const ExperimentalFeaturesList = () => {
   const record = useRecordContext();
@@ -62,7 +66,7 @@ export const ExperimentalFeaturesList = () => {
     const fetchFeatures = async () => {
       const features = await dataProvider.getFeatures(record.id);
       setFeatures(features);
-    }
+    };
 
     fetchFeatures();
   }, []);
@@ -70,28 +74,27 @@ export const ExperimentalFeaturesList = () => {
   const updateFeature = async (feature_name: string, feature_value: boolean) => {
     const updatedFeatures = { ...features, [feature_name]: feature_value } as ExperimentalFeaturesModel;
     setFeatures(updatedFeatures);
-    const reponse = await dataProvider.updateFeatures(record.id, updatedFeatures);
+    await dataProvider.updateFeatures(record.id, updatedFeatures);
     notify("ra.notification.updated", {
       messageArgs: { smart_count: 1 },
       type: "success",
     });
   };
 
-  return <>
-    <Stack
-      direction="column"
-      spacing={1}
-    >
-      {Object.keys(features).map((featureKey: string) =>
+  return (
+    <>
+      <Stack direction="column" spacing={1}>
+        {Object.keys(features).map((featureKey: string) => (
           <ExperimentalFeatureRow
             key={featureKey}
             featureKey={featureKey}
             featureValue={features[featureKey]}
             updateFeature={updateFeature}
           />
-      )}
+        ))}
       </Stack>
     </>
-}
+  );
+};
 
 export default ExperimentalFeaturesList;

src/components/Footer.tsx

@@ -1,6 +1,6 @@
-import { Avatar, Box, Link, Typography } from "@mui/material";
-import { useEffect, useState } from "react";
+import { Avatar, Box, Link } from "@mui/material";
 import { useTheme } from "@mui/material/styles";
+import { useEffect, useState } from "react";
 
 const Footer = () => {
   const [version, setVersion] = useState<string | null>(null);
@@ -13,35 +13,45 @@ const Footer = () => {
     }
   }, []);
 
-  return (<Box
+  return (
+    <Box
       component="footer"
       sx={{
-      position: 'fixed',
+        position: "fixed",
         zIndex: 100,
         bottom: 0,
-      width: '100%',
+        width: "100%",
         bgcolor: theme.palette.background.default,
         color: theme.palette.text.primary,
-      borderTop: '1px solid',
+        borderTop: "1px solid",
         borderColor: theme.palette.divider,
-      fontSize: '0.89rem',
-      display: 'flex',
-      flexDirection: 'row',
-      alignItems: 'center',
-      justifyContent: 'start',
+        fontSize: "0.89rem",
+        display: "flex",
+        flexDirection: "row",
+        alignItems: "center",
+        justifyContent: "start",
         p: 1,
-      gap: '10px'
-    }}>
-      <Avatar src="./images/logo.webp" sx={{ width: "1rem", height: "1rem", display: "inline-block", verticalAlign: "sub" }} />
+        gap: "10px",
+      }}
+    >
+      <Avatar
+        src="./images/logo.webp"
+        sx={{ width: "1rem", height: "1rem", display: "inline-block", verticalAlign: "sub" }}
+      />
       <Link href="https://github.com/etkecc/synapse-admin" target="_blank">
         Synapse Admin {version}
       </Link>
       by
-      <Link href="https://etke.cc/?utm_source=synapse-admin&utm_medium=footer&utm_campaign=synapse-admin" target="_blank">
+      <Link
+        href="https://etke.cc/?utm_source=synapse-admin&utm_medium=footer&utm_campaign=synapse-admin"
+        target="_blank"
+      >
         etke.cc
       </Link>
       (originally developed by Awesome Technologies Innovationslabor GmbH).
-      <Link sx={{ fontWeight: 'bold' }} href="https://matrix.to/#/#synapse-admin:etke.cc" target="_blank">#synapse-admin:etke.cc</Link>
+      <Link sx={{ fontWeight: "bold" }} href="https://matrix.to/#/#synapse-admin:etke.cc" target="_blank">
+        #synapse-admin:etke.cc
+      </Link>
     </Box>
   );
 };

src/components/LoginFormBox.tsx

@@ -1,5 +1,5 @@
-import { styled } from "@mui/material/styles";
 import { Box } from "@mui/material";
+import { styled } from "@mui/material/styles";
 
 const LoginFormBox = styled(Box)(({ theme }) => ({
   display: "flex",
@@ -8,7 +8,7 @@ const LoginFormBox = styled(Box)(({ theme }) => ({
   alignItems: "center",
   justifyContent: "flex-start",
   background: "url(./images/floating-cogs.svg)",
-    backgroundColor: theme.palette.mode === 'dark' ? theme.palette.background.default : theme.palette.background.paper,
+  backgroundColor: theme.palette.mode === "dark" ? theme.palette.background.default : theme.palette.background.paper,
   backgroundRepeat: "no-repeat",
   backgroundSize: "cover",
 
@@ -53,7 +53,6 @@ const LoginFormBox = styled(Box)(({ theme }) => ({
     marginBottom: "1rem",
     marginLeft: "0.5rem",
   },
-  }
-));
+}));
 
 export default LoginFormBox;

src/components/ServerNotices.tsx

@@ -1,8 +1,8 @@
-import { useState } from "react";
-
 import IconCancel from "@mui/icons-material/Cancel";
 import MessageIcon from "@mui/icons-material/Message";
 import { Dialog, DialogContent, DialogContentText, DialogTitle } from "@mui/material";
+import { useMutation } from "@tanstack/react-query";
+import { useState } from "react";
 import {
   Button,
   RaRecord,
@@ -20,7 +20,6 @@ import {
   useTranslate,
   useUnselectAll,
 } from "react-admin";
-import { useMutation } from "@tanstack/react-query";
 
 const ServerNoticeDialog = ({ open, onClose, onSubmit }) => {
   const translate = useTranslate();
@@ -104,7 +103,7 @@ export const ServerNoticeBulkButton = () => {
   const dataProvider = useDataProvider();
 
   const { mutate: sendNotices, isPending } = useMutation({
-    mutationFn: (data) =>
+    mutationFn: data =>
       dataProvider.createMany("servernotices", {
         ids: selectedIds,
         data: data,

src/components/UserAccountData.tsx

@@ -1,7 +1,8 @@
-import { useDataProvider, useRecordContext, useTranslate } from "react-admin";
-import { useEffect, useState } from "react";
+import ArrowDownwardIcon from "@mui/icons-material/ArrowDownward";
 import { Typography, Box, Stack, Accordion, AccordionSummary, AccordionDetails } from "@mui/material";
-import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward';
+import { useEffect, useState } from "react";
+import { useDataProvider, useRecordContext, useTranslate } from "react-admin";
+
 import { SynapseDataProvider } from "../synapse/dataProvider";
 
 const UserAccountData = () => {
@@ -25,24 +26,25 @@ const UserAccountData = () => {
   }, []);
 
   if (Object.keys(globalAccountData).length === 0 && Object.keys(roomsAccountData).length === 0) {
-    return <Typography variant="body2">{translate('ra.navigation.no_results', {
-      resource: 'Account Data',
-      _: 'No results found.',
-    })}</Typography>;
+    return (
+      <Typography variant="body2">
+        {translate("ra.navigation.no_results", {
+          name: "Account Data",
+          _: "No results found.",
+        })}
+      </Typography>
+    );
   }
 
-  return <>
-    <Stack
-      direction="column"
-      spacing={2}
-      width="100%"
-    >
-      <Typography variant="h6">{translate('resources.users.account_data.title')}</Typography>
-      <Typography variant="body1">
+  return (
+    <>
+      <Stack direction="column" spacing={2} width="100%">
+        <Typography variant="h6">{translate("resources.users.account_data.title")}</Typography>
+        <Typography variant="body1" component="div">
           <Box>
             <Accordion>
               <AccordionSummary expandIcon={<ArrowDownwardIcon />}>
-              <Typography variant="h6">{translate('resources.users.account_data.global')}</Typography>
+                <Typography variant="h6">{translate("resources.users.account_data.global")}</Typography>
               </AccordionSummary>
               <AccordionDetails>
                 <Box sx={{ whiteSpace: "pre-wrap" }}>{JSON.stringify(globalAccountData, null, 4)}</Box>
@@ -50,7 +52,7 @@ const UserAccountData = () => {
             </Accordion>
             <Accordion>
               <AccordionSummary expandIcon={<ArrowDownwardIcon />}>
-              <Typography variant="h6">{translate('resources.users.account_data.rooms')}</Typography>
+                <Typography variant="h6">{translate("resources.users.account_data.rooms")}</Typography>
               </AccordionSummary>
               <AccordionDetails>
                 <Box sx={{ whiteSpace: "pre-wrap" }}>{JSON.stringify(roomsAccountData, null, 4)}</Box>
@@ -60,6 +62,7 @@ const UserAccountData = () => {
         </Typography>
       </Stack>
     </>
-}
+  );
+};
 
 export default UserAccountData;

src/components/UserImport.tsx

@@ -1,575 +0,0 @@
-import { parse as parseCsv, unparse as unparseCsv, ParseResult } from "papaparse";
-import { ChangeEvent, useState } from "react";
-
-import {
-  Button,
-  Card,
-  CardActions,
-  CardContent,
-  CardHeader,
-  Checkbox,
-  Container,
-  FormControlLabel,
-  NativeSelect,
-} from "@mui/material";
-import { DataProvider, useTranslate } from "ra-core";
-import { useDataProvider, useNotify, RaRecord, Title } from "react-admin";
-
-import { generateRandomMXID, returnMXID } from "../utils/mxid";
-import { generateRandomPassword } from "../utils/password";
-
-const LOGGING = true;
-
-const expectedFields = ["id", "displayname"].sort();
-
-function TranslatableOption({ value, text }) {
-  const translate = useTranslate();
-  return <option value={value}>{translate(text)}</option>;
-}
-
-type Progress = {
-  done: number;
-  limit: number;
-} | null;
-
-interface ImportLine {
-  id: string;
-  displayname: string;
-  user_type?: string;
-  name?: string;
-  deactivated?: boolean;
-  guest?: boolean;
-  admin?: boolean;
-  is_admin?: boolean;
-  password?: string;
-  avatar_url?: string;
-}
-
-interface ChangeStats {
-  total: number;
-  id: number;
-  is_guest: number;
-  admin: number;
-  password: number;
-}
-
-interface ImportResult {
-  skippedRecords: RaRecord[];
-  erroredRecords: RaRecord[];
-  succeededRecords: RaRecord[];
-  totalRecordCount: number;
-  changeStats: ChangeStats;
-  wasDryRun: boolean;
-}
-
-const FilePicker = () => {
-  const [values, setValues] = useState<ImportLine[]>([]);
-  const [error, setError] = useState<string | string[] | null>(null);
-  const [stats, setStats] = useState<ChangeStats | null>(null);
-  const [dryRun, setDryRun] = useState(true);
-
-  const [progress, setProgress] = useState<Progress>(null);
-
-  const [importResults, setImportResults] = useState<ImportResult | null>(null);
-  const [skippedRecords, setSkippedRecords] = useState<string>("");
-
-  const [conflictMode, setConflictMode] = useState("stop");
-  const [passwordMode, setPasswordMode] = useState(true);
-  const [useridMode, setUseridMode] = useState("update");
-
-  const translate = useTranslate();
-  const notify = useNotify();
-
-  const dataProvider = useDataProvider();
-
-  const onFileChange = async (e: ChangeEvent<HTMLInputElement>) => {
-    if (progress !== null) return;
-
-    setValues([]);
-    setError(null);
-    setStats(null);
-    setImportResults(null);
-    const file = e.target.files ? e.target.files[0] : null;
-    if (!file) return;
-    /* Let's refuse some unreasonably big files instead of freezing
-     * up the browser */
-    if (file.size > 100000000) {
-      const message = translate("import_users.errors.unreasonably_big", {
-        size: (file.size / (1024 * 1024)).toFixed(2),
-      });
-      notify(message);
-      setError(message);
-      return;
-    }
-    try {
-      parseCsv<ImportLine>(file, {
-        header: true,
-        skipEmptyLines: true /* especially for a final EOL in the csv file */,
-        complete: result => {
-          if (result.errors) {
-            setError(result.errors.map(e => e.toString()));
-          }
-          /* Papaparse is very lenient, we may be able to salvage
-           * the data in the file. */
-          verifyCsv(result, { setValues, setStats, setError });
-        },
-      });
-    } catch {
-      setError("Unknown error");
-      return null;
-    }
-  };
-
-  const verifyCsv = ({ data, meta, errors }: ParseResult<ImportLine>, { setValues, setStats, setError }) => {
-    /* First, verify the presence of required fields */
-    meta.fields = meta.fields?.map(f => f.trim().toLowerCase());
-    const missingFields = expectedFields.filter(eF => !meta.fields?.find(mF => eF === mF));
-
-    if (missingFields.length > 0) {
-      setError(translate("import_users.error.required_field", { field: missingFields[0] }));
-      return false;
-    }
-
-    // XXX after deciding on how "name" and friends should be handled below,
-    //     this place will want changes, too.
-
-    /* Collect some stats to prevent sneaky csv files from adding admin
-       users or something.
-     */
-    const stats = {
-      user_types: { default: 0 },
-      is_guest: 0,
-      admin: 0,
-      deactivated: 0,
-      password: 0,
-      avatar_url: 0,
-      id: 0,
-
-      total: data.length,
-    };
-
-    const errorMessages = errors.map(e => e.message);
-    // sanitize the data first
-    data = data.map(line => {
-      const newLine = {} as ImportLine;
-      for (const [key, value] of Object.entries(line)) {
-        newLine[key.trim().toLowerCase()] = value;
-      }
-      return newLine;
-    });
-    // process the data
-    data.forEach((line, idx) => {
-      if (line.user_type === undefined || line.user_type === "") {
-        stats.user_types.default++;
-      } else {
-        stats.user_types[line.user_type] += 1;
-      }
-      /* XXX correct the csv export that react-admin offers for the users
-       * resource so it gives sensible field names and doesn't duplicate
-       * id as "name"?
-       */
-      if (meta.fields?.includes("name")) {
-        delete line.name;
-      }
-      if (meta.fields?.includes("user_type")) {
-        delete line.user_type;
-      }
-      if (meta.fields?.includes("is_admin")) {
-        delete line.is_admin;
-      }
-
-      ["is_guest", "admin", "deactivated"].forEach(f => {
-        if (line[f] === "true") {
-          stats[f]++;
-          line[f] = true; // we need true booleans instead of strings
-        } else {
-          if (line[f] !== "false" && line[f] !== "") {
-            console.log("invalid value", line[f], "for field " + f + " in row " + idx);
-            errorMessages.push(
-              translate("import_users.error.invalid_value", {
-                field: f,
-                row: idx,
-              })
-            );
-          }
-          line[f] = false; // default values to false
-        }
-      });
-
-      if (line.password !== undefined && line.password !== "") {
-        stats.password++;
-      }
-
-      if (line.avatar_url !== undefined && line.avatar_url !== "") {
-        stats.avatar_url++;
-      }
-
-      if (line.id !== undefined && line.id !== "") {
-        stats.id++;
-      }
-    });
-
-    if (errorMessages.length > 0) {
-      setError(errorMessages);
-    }
-    setStats(stats);
-    setValues(data);
-
-    return true;
-  };
-
-  const runImport = async () => {
-    if (progress !== null) {
-      notify("import_users.errors.already_in_progress");
-      return;
-    }
-
-    const results = await doImport(
-      dataProvider,
-      values,
-      conflictMode,
-      passwordMode,
-      useridMode,
-      dryRun,
-      setProgress,
-      setError
-    );
-    setImportResults(results);
-    // offer CSV download of skipped or errored records
-    // (so that the user doesn't have to filter out successful
-    // records manually when fixing stuff in the CSV)
-    setSkippedRecords(unparseCsv(results.skippedRecords));
-    if (LOGGING) console.log("Skipped records:");
-    if (LOGGING) console.log(skippedRecords);
-  };
-
-  // XXX every single one of the requests will restart the activity indicator
-  //     which doesn't look very good.
-
-  const doImport = async (
-    dataProvider: DataProvider,
-    data: ImportLine[],
-    conflictMode: string,
-    passwordMode: boolean,
-    useridMode: string,
-    dryRun: boolean,
-    setProgress: (progress: Progress) => void,
-    setError: (message: string) => void
-  ): Promise<ImportResult> => {
-    const skippedRecords: ImportLine[] = [];
-    const erroredRecords: ImportLine[] = [];
-    const succeededRecords: ImportLine[] = [];
-    const changeStats: ChangeStats = {
-      total: 0,
-      id: 0,
-      is_guest: 0,
-      admin: 0,
-      password: 0,
-    };
-    let entriesDone = 0;
-    const entriesCount = data.length;
-    try {
-      setProgress({ done: entriesDone, limit: entriesCount });
-      for (const entry of data) {
-        const userRecord = { ...entry };
-        // No need to do a bunch of cryptographic random number getting if
-        // we are using neither a generated password nor a generated user id.
-        if (useridMode === "ignore" || userRecord.id === undefined || userRecord.id === "") {
-          userRecord.id = generateRandomMXID();
-        }
-        if (passwordMode === false || entry.password === undefined || entry.password === "") {
-          userRecord.password = generateRandomPassword();
-        }
-        // we want to ensure that the ID is always full MXID, otherwise randomly-generated MXIDs will be in the full
-        // form, but the ones from the CSV will be localpart-only.
-        userRecord.id = returnMXID(userRecord.id);
-        /* TODO record update stats (especially admin no -> yes, deactivated x -> !x, ... */
-
-        /* For these modes we will consider the ID that's in the record.
-         * If the mode is "stop", we will not continue adding more records, and
-         * we will offer information on what was already added and what was
-         * skipped.
-         *
-         * If the mode is "skip", we record the record for later, but don't
-         * send it to the server.
-         *
-         * If the mode is "update", we change fields that are reasonable to
-         * update.
-         *  - If the "password mode" is "true" (i.e. "use passwords from csv"):
-         *    - if the record has a password
-         *      - send the password along with the record
-         *    - if the record has no password
-         *      - generate a new password
-         *  - If the "password mode" is "false"
-         *    - never generate a new password to update existing users with
-         */
-
-        /* We just act as if there are no IDs in the CSV, so every user will be
-         * created anew.
-         * We do a simple retry loop so that an accidental hit on an existing ID
-         * doesn't trip us up.
-         */
-        if (LOGGING) console.log("will check for existence of record " + JSON.stringify(userRecord));
-        let retries = 0;
-        const submitRecord = (recordData: ImportLine) => {
-          return dataProvider.getOne("users", { id: recordData.id }).then(
-            async () => {
-              if (LOGGING) console.log("already existed");
-
-              if (useridMode === "update" || conflictMode === "skip") {
-                skippedRecords.push(recordData);
-              } else if (conflictMode === "stop") {
-                throw new Error(
-                  translate("import_users.error.id_exits", {
-                    id: recordData.id,
-                  })
-                );
-              } else {
-                const newRecordData = Object.assign({}, recordData, {
-                  id: generateRandomMXID(),
-                });
-                retries++;
-                if (retries > 512) {
-                  console.warn("retry loop got stuck? pathological situation?");
-                  skippedRecords.push(recordData);
-                } else {
-                  await submitRecord(newRecordData);
-                }
-              }
-            },
-            async () => {
-              if (LOGGING) console.log("OK to create record " + recordData.id + " (" + recordData.displayname + ").");
-
-              if (!dryRun) {
-                await dataProvider.create("users", { data: recordData });
-              }
-              succeededRecords.push(recordData);
-            }
-          );
-        };
-
-        await submitRecord(userRecord);
-        entriesDone++;
-        setProgress({ done: entriesDone, limit: data.length });
-      }
-
-      setProgress(null);
-    } catch (e) {
-      setError(
-        translate("import_users.error.at_entry", {
-          entry: entriesDone + 1,
-          message: e instanceof Error ? e.message : String(e),
-        })
-      );
-      setProgress(null);
-    }
-    return {
-      skippedRecords,
-      erroredRecords,
-      succeededRecords,
-      totalRecordCount: entriesCount,
-      changeStats,
-      wasDryRun: dryRun,
-    };
-  };
-
-  const downloadSkippedRecords = () => {
-    const element = document.createElement("a");
-    console.log(skippedRecords);
-    const file = new Blob([skippedRecords], {
-      type: "text/comma-separated-values",
-    });
-    element.href = URL.createObjectURL(file);
-    element.download = "skippedRecords.csv";
-    document.body.appendChild(element); // Required for this to work in FireFox
-    element.click();
-  };
-
-  const onConflictModeChanged = async (e: ChangeEvent<HTMLSelectElement>) => {
-    if (progress !== null) {
-      return;
-    }
-
-    const value = e.target.value;
-    setConflictMode(value);
-  };
-
-  const onPasswordModeChange = (e: ChangeEvent<HTMLInputElement>) => {
-    if (progress !== null) {
-      return;
-    }
-
-    setPasswordMode(e.target.checked);
-  };
-
-  const onUseridModeChanged = async (e: ChangeEvent<HTMLSelectElement>) => {
-    if (progress !== null) {
-      return;
-    }
-
-    const value = e.target.value;
-    setUseridMode(value);
-  };
-
-  const onDryRunModeChanged = (e: ChangeEvent<HTMLInputElement>) => {
-    if (progress !== null) {
-      return;
-    }
-    setDryRun(e.target.checked);
-  };
-
-  // render individual small components
-
-  const statsCards = stats &&
-    !importResults && [
-      <Container>
-        <CardHeader title={translate("import_users.cards.importstats.header")} />
-        <CardContent>
-          <div>{translate("import_users.cards.importstats.users_total", stats.total)}</div>
-          <div>{translate("import_users.cards.importstats.guest_count", stats.is_guest)}</div>
-          <div>{translate("import_users.cards.importstats.admin_count", stats.admin)}</div>
-        </CardContent>
-      </Container>,
-      <Container>
-        <CardHeader title={translate("import_users.cards.ids.header")} />
-        <CardContent>
-          <div>
-            {stats.id === stats.total
-              ? translate("import_users.cards.ids.all_ids_present")
-              : translate("import_users.cards.ids.count_ids_present", stats.id)}
-          </div>
-          {stats.id > 0 ? (
-            <div>
-              <NativeSelect onChange={onUseridModeChanged} value={useridMode} disabled={progress !== null}>
-                <TranslatableOption value="ignore" text="import_users.cards.ids.mode.ignore" />
-                <TranslatableOption value="update" text="import_users.cards.ids.mode.update" />
-              </NativeSelect>
-            </div>
-          ) : (
-            ""
-          )}
-        </CardContent>
-      </Container>,
-      <Container>
-        <CardHeader title={translate("import_users.cards.passwords.header")} />
-        <CardContent>
-          <div>
-            {stats.password === stats.total
-              ? translate("import_users.cards.passwords.all_passwords_present")
-              : translate("import_users.cards.passwords.count_passwords_present", stats.password)}
-          </div>
-          {stats.password > 0 ? (
-            <div>
-              <FormControlLabel
-                control={
-                  <Checkbox checked={passwordMode} disabled={progress !== null} onChange={onPasswordModeChange} />
-                }
-                label={translate("import_users.cards.passwords.use_passwords")}
-              />
-            </div>
-          ) : (
-            ""
-          )}
-        </CardContent>
-      </Container>,
-    ];
-
-  const conflictCards = stats && !importResults && (
-    <Container>
-      <CardHeader title={translate("import_users.cards.conflicts.header")} />
-      <CardContent>
-        <div>
-          <NativeSelect onChange={onConflictModeChanged} value={conflictMode} disabled={progress !== null}>
-            <TranslatableOption value="stop" text="import_users.cards.conflicts.mode.stop" />
-            <TranslatableOption value="skip" text="import_users.cards.conflicts.mode.skip" />
-          </NativeSelect>
-        </div>
-      </CardContent>
-    </Container>
-  );
-
-  const errorCards = error && (
-    <Container>
-      <CardHeader title={translate("import_users.error.error")} />
-      <CardContent>
-        {(Array.isArray(error) ? error : [error]).map(e => (
-          <div>{e}</div>
-        ))}
-      </CardContent>
-    </Container>
-  );
-
-  const uploadCard = !importResults && (
-    <Container>
-      <CardHeader title={translate("import_users.cards.upload.header")} />
-      <CardContent>
-        {translate("import_users.cards.upload.explanation")}
-        <a href="./data/example.csv">example.csv</a>
-        <br />
-        <br />
-        <input type="file" onChange={onFileChange} disabled={progress !== null} />
-      </CardContent>
-    </Container>
-  );
-
-  const resultsCard = importResults && (
-    <CardContent>
-      <CardHeader title={translate("import_users.cards.results.header")} />
-      <div>
-        {translate("import_users.cards.results.total", importResults.totalRecordCount)}
-        <br />
-        {translate("import_users.cards.results.successful", importResults.succeededRecords.length)}
-        <br />
-        {importResults.skippedRecords.length
-          ? [
-              translate("import_users.cards.results.skipped", importResults.skippedRecords.length),
-              <div>
-                <button onClick={downloadSkippedRecords}>
-                  {translate("import_users.cards.results.download_skipped")}
-                </button>
-              </div>,
-              <br />,
-            ]
-          : ""}
-        {importResults.erroredRecords.length
-          ? [translate("import_users.cards.results.skipped", importResults.erroredRecords.length), <br />]
-          : ""}
-        <br />
-        {importResults.wasDryRun && [translate("import_users.cards.results.simulated_only"), <br />]}
-      </div>
-    </CardContent>
-  );
-
-  const startImportCard =
-    !values || values.length === 0 || importResults ? undefined : (
-      <CardActions>
-        <FormControlLabel
-          control={<Checkbox checked={dryRun} onChange={onDryRunModeChanged} disabled={progress !== null} />}
-          label={translate("import_users.cards.startImport.simulate_only")}
-        />
-        <Button size="large" onClick={runImport} disabled={progress !== null}>
-          {translate("import_users.cards.startImport.run_import")}
-        </Button>
-        {progress !== null ? (
-          <div>
-            {progress.done} of {progress.limit} done
-          </div>
-        ) : null}
-      </CardActions>
-    );
-
-  const allCards: JSX.Element[] = [];
-  if (uploadCard) allCards.push(uploadCard);
-  if (errorCards) allCards.push(errorCards);
-  if (conflictCards) allCards.push(conflictCards);
-  if (statsCards) allCards.push(...statsCards);
-  if (startImportCard) allCards.push(startImportCard);
-  if (resultsCard) allCards.push(resultsCard);
-
-  const cardContainer = <Card>{allCards}</Card>;
-
-  return [<Title defaultTitle={translate("import_users.title")} />, cardContainer];
-};
-
-export const UserImport = FilePicker;
-export default UserImport;

src/components/UserRateLimits.tsx

@@ -1,10 +1,18 @@
 import { Stack, Typography } from "@mui/material";
-import { useEffect, useState } from "react";
-import { useDataProvider, useNotify, useRecordContext, useTranslate } from "react-admin";
 import { TextField } from "@mui/material";
+import { useEffect, useState } from "react";
+import { useDataProvider, useRecordContext, useTranslate } from "react-admin";
 import { useFormContext } from "react-hook-form";
 
-const RateLimitRow = ({ limit, value, updateRateLimit }: { limit: string, value: any, updateRateLimit: (limit: string, value: any) => void }) => {
+const RateLimitRow = ({
+  limit,
+  value,
+  updateRateLimit,
+}: {
+  limit: string;
+  value: object;
+  updateRateLimit: (limit: string, value: integer | null) => void;
+}) => {
   const translate = useTranslate();
 
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -16,7 +24,8 @@ const RateLimitRow = ({ limit, value, updateRateLimit }: { limit: string, value:
     updateRateLimit(limit, value);
   };
 
-  return <Stack
+  return (
+    <Stack
       spacing={1}
       alignItems="start"
       sx={{
@@ -24,7 +33,6 @@ const RateLimitRow = ({ limit, value, updateRateLimit }: { limit: string, value:
       }}
     >
       <TextField
-      id="outlined-number"
         type="number"
         value={value}
         onChange={handleChange}
@@ -36,19 +44,15 @@ const RateLimitRow = ({ limit, value, updateRateLimit }: { limit: string, value:
         label={translate(`resources.users.limits.${limit}`)}
       />
       <Stack>
-      <Typography
-        variant="body2"
-        color="text.secondary"
-      >
+        <Typography variant="body2" color="text.secondary">
           {translate(`resources.users.limits.${limit}_text`)}
         </Typography>
       </Stack>
     </Stack>
-}
+  );
+};
 
 const UserRateLimits = () => {
-  const translate = useTranslate();
-  const notify = useNotify();
   const record = useRecordContext();
   const form = useFormContext();
   const dataProvider = useDataProvider();
@@ -67,31 +71,26 @@ const UserRateLimits = () => {
       if (Object.keys(rateLimits).length > 0) {
         setRateLimits(rateLimits);
       }
-      }
+    };
 
     fetchRateLimits();
   }, []);
 
-  const updateRateLimit = async (limit: string, value: any) => {
-    let updatedRateLimits = { ...rateLimits, [limit]: value };
+  const updateRateLimit = async (limit: string, value: integer | null) => {
+    const updatedRateLimits = { ...rateLimits, [limit]: value };
     setRateLimits(updatedRateLimits);
     form.setValue(`rates.${limit}`, value, { shouldDirty: true });
   };
 
-  return <>
-    <Stack
-      direction="column"
-    >
-      {Object.keys(rateLimits).map((limit: string) =>
-        <RateLimitRow
-          key={limit}
-          limit={limit}
-          value={rateLimits[limit]}
-          updateRateLimit={updateRateLimit}
-        />
-      )}
+  return (
+    <>
+      <Stack direction="column">
+        {Object.keys(rateLimits).map((limit: string) => (
+          <RateLimitRow key={limit} limit={limit} value={rateLimits[limit]} updateRateLimit={updateRateLimit} />
+        ))}
       </Stack>
     </>
+  );
 };
 
 export default UserRateLimits;

src/components/etke.cc/BillingPage.tsx

@@ -0,0 +1,214 @@
+import ContentCopyIcon from "@mui/icons-material/ContentCopy";
+import DownloadIcon from "@mui/icons-material/Download";
+import PaymentIcon from "@mui/icons-material/Payment";
+import {
+  Box,
+  Typography,
+  Link,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableRow,
+  Paper,
+  Chip,
+  Button,
+  Tooltip,
+} from "@mui/material";
+import { Stack } from "@mui/material";
+import IconButton from "@mui/material/IconButton";
+import { useState, useEffect } from "react";
+import { useDataProvider, useNotify } from "react-admin";
+
+import { useAppContext } from "../../Context";
+import { SynapseDataProvider, Payment } from "../../synapse/dataProvider";
+
+const TruncatedUUID = ({ uuid }): React.ReactElement => {
+  const short = `${uuid.slice(0, 8)}...${uuid.slice(-6)}`;
+  const copyToClipboard = () => navigator.clipboard.writeText(uuid);
+
+  return (
+    <Tooltip title={uuid}>
+      <span style={{ display: "inline-flex", alignItems: "center" }}>
+        {short}
+        <IconButton size="small" onClick={copyToClipboard}>
+          <ContentCopyIcon fontSize="small" />
+        </IconButton>
+      </span>
+    </Tooltip>
+  );
+};
+
+const BillingPage = () => {
+  const { etkeccAdmin } = useAppContext();
+  const dataProvider = useDataProvider() as SynapseDataProvider;
+  const notify = useNotify();
+  const [paymentsData, setPaymentsData] = useState<Payment[]>([]);
+  const [total, setTotal] = useState(0);
+  const [loading, setLoading] = useState(true);
+  const [failure, setFailure] = useState<string | null>(null);
+  const [downloadingInvoice, setDownloadingInvoice] = useState<string | null>(null);
+
+  useEffect(() => {
+    const fetchBillingData = async () => {
+      if (!etkeccAdmin) return;
+
+      try {
+        setLoading(true);
+        const response = await dataProvider.getPayments(etkeccAdmin);
+        setPaymentsData(response.payments);
+        setTotal(response.total);
+      } catch (error) {
+        console.error("Error fetching billing data:", error);
+        setFailure(error instanceof Error ? error.message : error);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchBillingData();
+  }, [etkeccAdmin, dataProvider, notify]);
+
+  const handleInvoiceDownload = async (transactionId: string) => {
+    if (!etkeccAdmin || downloadingInvoice) return;
+
+    try {
+      setDownloadingInvoice(transactionId);
+      await dataProvider.getInvoice(etkeccAdmin, transactionId);
+      notify("Invoice download started", { type: "info" });
+    } catch (error) {
+      // Use the specific error message from the dataProvider
+      const errorMessage = error instanceof Error ? error.message : "Error downloading invoice";
+      notify(errorMessage, { type: "error" });
+      console.error("Error downloading invoice:", error);
+    } finally {
+      setDownloadingInvoice(null);
+    }
+  };
+
+  const header = (
+    <Box>
+      <Typography variant="h4">
+        <PaymentIcon sx={{ verticalAlign: "middle", mr: 1 }} /> Billing
+      </Typography>
+      <Typography variant="body1">
+        View payments and generate invoices from here. More details about billing can be found{" "}
+        <Link href="https://etke.cc/help/extras/scheduler/#payments" target="_blank">
+          here
+        </Link>
+        .
+        <br />
+        If you'd like to change your billing email, or add company details, please{" "}
+        <Link href="https://etke.cc/contacts/" target="_blank">
+          contact etke.cc support
+        </Link>
+        .
+      </Typography>
+    </Box>
+  );
+
+  if (loading) {
+    return (
+      <Stack spacing={3} mt={3}>
+        {header}
+        <Box sx={{ mt: 3 }}>
+          <Typography>Loading billing information...</Typography>
+        </Box>
+      </Stack>
+    );
+  }
+
+  if (failure) {
+    return (
+      <Stack spacing={3} mt={3}>
+        {header}
+        <Box sx={{ mt: 3 }}>
+          <Typography>
+            There was a problem loading your billing information.
+            <br />
+            This might be a temporary issue - please try again in a few minutes.
+            <br />
+            If it persists, contact{" "}
+            <Link href="https://etke.cc/contacts/" target="_blank">
+              etke.cc support team
+            </Link>{" "}
+            with the following error message:
+          </Typography>
+          <Typography variant="body2" color="error" sx={{ mt: 1 }}>
+            {failure}
+          </Typography>
+        </Box>
+      </Stack>
+    );
+  }
+
+  return (
+    <Stack spacing={3} mt={3}>
+      {header}
+      <Box sx={{ mt: 2 }}>
+        <Typography variant="h5">Payment Summary</Typography>
+        <Box sx={{ mt: 1, display: "flex", alignItems: "center", gap: 1 }}>
+          <Typography variant="body1">Total Payments:</Typography>
+          <Chip label={total} color="primary" variant="outlined" />
+        </Box>
+      </Box>
+
+      <Box sx={{ mt: 2 }}>
+        <Typography variant="h5" sx={{ mb: 2 }}>
+          Payment History
+        </Typography>
+        {paymentsData.length === 0 ? (
+          <Typography variant="body1">
+            No payments found. If you believe that's an error, please{" "}
+            <Link href="https://etke.cc/contacts/" target="_blank">
+              contact etke.cc support
+            </Link>
+            .
+          </Typography>
+        ) : (
+          <TableContainer component={Paper}>
+            <Table>
+              <TableHead>
+                <TableRow>
+                  <TableCell>Transaction ID</TableCell>
+                  <TableCell>Email</TableCell>
+                  <TableCell>Type</TableCell>
+                  <TableCell>Amount</TableCell>
+                  <TableCell>Paid At</TableCell>
+                  <TableCell>Download Invoice</TableCell>
+                </TableRow>
+              </TableHead>
+              <TableBody>
+                {paymentsData.map(payment => (
+                  <TableRow key={payment.transaction_id}>
+                    <TableCell>
+                      <TruncatedUUID uuid={payment.transaction_id} />
+                    </TableCell>
+                    <TableCell>{payment.email}</TableCell>
+                    <TableCell>{payment.is_subscription ? "Subscription" : "One-time"}</TableCell>
+                    <TableCell>${payment.amount.toFixed(2)}</TableCell>
+                    <TableCell>{new Date(payment.paid_at).toLocaleDateString()}</TableCell>
+                    <TableCell>
+                      <Button
+                        variant="outlined"
+                        size="small"
+                        startIcon={<DownloadIcon />}
+                        onClick={() => handleInvoiceDownload(payment.transaction_id)}
+                        disabled={downloadingInvoice === payment.transaction_id}
+                      >
+                        {downloadingInvoice === payment.transaction_id ? "Downloading..." : "Invoice"}
+                      </Button>
+                    </TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          </TableContainer>
+        )}
+      </Box>
+    </Stack>
+  );
+};
+
+export default BillingPage;

src/components/etke.cc/CurrentlyRunningCommand.tsx

@@ -0,0 +1,37 @@
+import { Stack, Tooltip, Typography, Box, Link } from "@mui/material";
+import { useStore } from "react-admin";
+
+import { ServerProcessResponse } from "../../synapse/dataProvider";
+import { getTimeSince } from "../../utils/date";
+
+const CurrentlyRunningCommand = () => {
+  const [serverProcess, _setServerProcess] = useStore<ServerProcessResponse>("serverProcess", {
+    command: "",
+    locked_at: "",
+  });
+  const { command, locked_at } = serverProcess;
+
+  if (!command || !locked_at) {
+    return null;
+  }
+
+  return (
+    <Stack spacing={1} direction="row" alignItems="center">
+      <Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
+        <Typography variant="h5">Currently running:</Typography>
+        <Typography variant="h5" color="text.secondary">
+          <Link href={"https://etke.cc/help/extras/scheduler/#" + command} target="_blank">
+            {command}
+          </Link>
+          <Tooltip title={locked_at.toString()}>
+            <Typography component="span" color="text.secondary" sx={{ display: "inline-block", ml: 1 }}>
+              (started {getTimeSince(locked_at)} ago)
+            </Typography>
+          </Tooltip>
+        </Typography>
+      </Box>
+    </Stack>
+  );
+};
+
+export default CurrentlyRunningCommand;

src/components/etke.cc/README.md

@@ -18,6 +18,10 @@ In the application bar the new monitoring icon is displayed that shows the curre
 * 🟡 (yellow) - the server is up and running, but there is a command in progress (likely [maintenance](https://etke.cc/help/extras/scheduler/#maintenance)), so some temporary issues may occur - that's totally fine
 * 🔴 (red) - there is at least 1 issue with one of the server's components
 
+![Server Status icon in sidebar](../../../screenshots/etke.cc/server-status/indicator-sidebar.webp)
+
+The same icon (and link to the [Server Status page](#server-status-page)) is displayed in the sidebar.
+
 ### Server Status page
 
 ![Server Status Page](../../../screenshots/etke.cc/server-status/page.webp)
@@ -29,6 +33,8 @@ Server Status page. This page contains the following information:
 * Details about the currently running command (if any)
 * Details about the server's components statuses (up/down with error details and suggested actions) by categories
 
+This is [a Monitoring report](https://etke.cc/services/monitoring/)
+
 ### Server Notifications icon
 
 ![Server Notifications icon](../../../screenshots/etke.cc/server-notifications/badge.webp)
@@ -40,3 +46,29 @@ In the application bar the new notifications icon is displayed that shows the nu
 ![Server Notifications Page](../../../screenshots/etke.cc/server-notifications/page.webp)
 
 When you click on a notification from the [Server Notifications icon](#server-notifications-icon)'s list in the application bar, you will be redirected to the Server Notifications page. This page contains the full text of all the notifications you have about your server.
+
+### Server Actions Page
+
+![Server Actions Page](../../../screenshots/etke.cc/server-actions/page.webp)
+
+When you click on the `Server Actions` sidebar menu item, you will be redirected to the Server Actions page.
+On this page you can do the following:
+
+* [Run a command](#server-commands-panel) on your server immediately
+* [Schedule a command](https://etke.cc/help/extras/scheduler/#schedule) to run at a specific date and time
+* [Configure a recurring schedule](https://etke.cc/help/extras/scheduler/#recurring) for a command to run at a specific time every week
+
+### Server Commands Panel
+
+![Server Commands Panel](../../../screenshots/etke.cc/server-commands/panel.webp)
+
+When you open [Server Actions page](#server-status-page), you will see the Server Commands panel.
+This panel contains all [the commands](https://etke.cc/help/extras/scheduler/#commands) you can run on your server in 1 click.
+Once command is finished, you will get a notification about the result.
+
+### Billing Page
+
+![Billing Page](../../../screenshots/etke.cc/billing/page.webp)
+
+When you click on the `Billing` sidebar menu item, you will be see the Billing page.
+On this page you can see the list of successful payments and invoices.

src/components/etke.cc/ServerActionsPage.tsx

@@ -0,0 +1,51 @@
+import RestoreIcon from "@mui/icons-material/Restore";
+import ScheduleIcon from "@mui/icons-material/Schedule";
+import { Box, Typography, Link } from "@mui/material";
+import { Stack } from "@mui/material";
+
+import CurrentlyRunningCommand from "./CurrentlyRunningCommand";
+import ServerCommandsPanel from "./ServerCommandsPanel";
+import RecurringCommandsList from "./schedules/components/recurring/RecurringCommandsList";
+import ScheduledCommandsList from "./schedules/components/scheduled/ScheduledCommandsList";
+const ServerActionsPage = () => {
+  return (
+    <Stack spacing={3} mt={3}>
+      <Stack direction="column">
+        <CurrentlyRunningCommand />
+        <ServerCommandsPanel />
+      </Stack>
+
+      <Box sx={{ mt: 2 }}>
+        <Typography variant="h5">
+          <ScheduleIcon sx={{ verticalAlign: "middle", mr: 1 }} /> Scheduled commands
+        </Typography>
+        <Typography variant="body1">
+          The following commands are scheduled to run at specific times. You can view their details and modify them as
+          needed. More details about the mode can be found{" "}
+          <Link href="https://etke.cc/help/extras/scheduler/#schedule" target="_blank">
+            here
+          </Link>
+          .
+        </Typography>
+        <ScheduledCommandsList />
+      </Box>
+
+      <Box sx={{ mt: 2 }}>
+        <Typography variant="h5">
+          <RestoreIcon sx={{ verticalAlign: "middle", mr: 1 }} /> Recurring commands
+        </Typography>
+        <Typography variant="body1">
+          The following commands are set to run at specific weekday and time (weekly). You can view their details and
+          modify them as needed. More details about the mode can be found{" "}
+          <Link href="https://etke.cc/help/extras/scheduler/#recurring" target="_blank">
+            here
+          </Link>
+          .
+        </Typography>
+        <RecurringCommandsList />
+      </Box>
+    </Stack>
+  );
+};
+
+export default ServerActionsPage;

src/components/etke.cc/ServerCommandsPanel.tsx

@@ -0,0 +1,210 @@
+import { PlayArrow, CheckCircle, HelpCenter, Construction } from "@mui/icons-material";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableRow,
+  Paper,
+  Alert,
+  TextField,
+  Box,
+  Link,
+  Typography,
+} from "@mui/material";
+import { useEffect, useState } from "react";
+import { Button, Loading, useDataProvider, useCreatePath, useStore } from "react-admin";
+import { Link as RouterLink } from "react-router-dom";
+
+import { useAppContext } from "../../Context";
+import { useServerCommands } from "./hooks/useServerCommands";
+import { ServerCommand, ServerProcessResponse } from "../../synapse/dataProvider";
+import { Icons } from "../../utils/icons";
+
+const renderIcon = (icon: string) => {
+  /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+  const IconComponent = Icons[icon] as React.ComponentType<any> | undefined;
+  return IconComponent ? <IconComponent sx={{ verticalAlign: "middle", mr: 1 }} /> : null;
+};
+
+const ServerCommandsPanel = () => {
+  const { etkeccAdmin } = useAppContext();
+  if (!etkeccAdmin) {
+    return null;
+  }
+
+  const createPath = useCreatePath();
+  const { isLoading, serverCommands, setServerCommands } = useServerCommands();
+  const [serverProcess, setServerProcess] = useStore<ServerProcessResponse>("serverProcess", {
+    command: "",
+    locked_at: "",
+  });
+  const [commandIsRunning, setCommandIsRunning] = useState<boolean>(serverProcess.command !== "");
+  const [commandResult, setCommandResult] = useState<React.ReactNode[]>([]);
+  const dataProvider = useDataProvider();
+
+  useEffect(() => {
+    if (serverProcess.command === "") {
+      setCommandIsRunning(false);
+    }
+  }, [serverProcess]);
+
+  const setCommandAdditionalArgs = (command: string, additionalArgs: string) => {
+    const updatedServerCommands = { ...serverCommands };
+    updatedServerCommands[command].additionalArgs = additionalArgs;
+    setServerCommands(updatedServerCommands);
+  };
+
+  const runCommand = async (command: string) => {
+    setCommandResult([]);
+    setCommandIsRunning(true);
+
+    try {
+      const additionalArgs = serverCommands[command].additionalArgs || "";
+      const requestParams = additionalArgs ? { args: additionalArgs } : {};
+
+      const response = await dataProvider.runServerCommand(etkeccAdmin, command, requestParams);
+
+      if (!response.success) {
+        setCommandIsRunning(false);
+        return;
+      }
+
+      // Update UI with success message
+      const commandResults = buildCommandResultMessages(command, additionalArgs);
+      setCommandResult(commandResults);
+
+      // Reset the additional args field
+      resetCommandArgs(command);
+
+      // Update server process status
+      await updateServerProcessStatus(serverCommands[command]);
+    } catch (error) {
+      console.error("Error running command:", error);
+      setCommandIsRunning(false);
+    }
+  };
+
+  const buildCommandResultMessages = (command: string, additionalArgs: string): React.ReactNode[] => {
+    const results: React.ReactNode[] = [];
+
+    let commandScheduledText = `Command scheduled: ${command}`;
+    if (additionalArgs) {
+      commandScheduledText += `, with additional args: ${additionalArgs}`;
+    }
+
+    results.push(<Box key="command-text">{commandScheduledText}</Box>);
+    results.push(
+      <Box key="notification-link">
+        Expect your result in the{" "}
+        <RouterLink to={createPath({ resource: "server_notifications", type: "list" })}>Notifications</RouterLink> page
+        soon.
+      </Box>
+    );
+
+    return results;
+  };
+
+  const resetCommandArgs = (command: string) => {
+    const updatedServerCommands = { ...serverCommands };
+    updatedServerCommands[command].additionalArgs = "";
+    setServerCommands(updatedServerCommands);
+  };
+
+  const updateServerProcessStatus = async (command: ServerCommand) => {
+    const commandIsLocking = command.with_lock;
+    const serverProcess = await dataProvider.getServerRunningProcess(etkeccAdmin, true);
+    if (!commandIsLocking && serverProcess.command === "") {
+      // if command is not locking, we simulate the "lock" mechanism so notifications will be refetched
+      serverProcess["command"] = command.name;
+      serverProcess["locked_at"] = new Date().toISOString();
+    }
+
+    setServerProcess({ ...serverProcess });
+  };
+
+  if (isLoading) {
+    return <Loading />;
+  }
+
+  return (
+    <>
+      <Typography variant="h5">
+        <Construction sx={{ verticalAlign: "middle", mr: 1 }} /> Available Commands
+      </Typography>
+      <Typography variant="body1" sx={{ mt: 0 }}>
+        The following commands are available to run. More details about each of them can be found{" "}
+        <Link href="https://etke.cc/help/extras/scheduler/#commands" target="_blank">
+          here
+        </Link>
+        .
+      </Typography>
+      <TableContainer component={Paper} sx={{ mt: 2 }}>
+        <Table sx={{ minWidth: 450 }} size="small" aria-label="simple table">
+          <TableHead>
+            <TableRow>
+              <TableCell>Command</TableCell>
+              <TableCell></TableCell>
+              <TableCell>Description</TableCell>
+              <TableCell></TableCell>
+            </TableRow>
+          </TableHead>
+          <TableBody>
+            {Object.entries(serverCommands).map(([command, { icon, args, description, additionalArgs }]) => (
+              <TableRow key={command}>
+                <TableCell scope="row">
+                  <Box>
+                    {renderIcon(icon)}
+                    {command}
+                  </Box>
+                </TableCell>
+                <TableCell>
+                  <Link href={"https://etke.cc/help/extras/scheduler/#" + command} target="_blank">
+                    <Button size="small" startIcon={<HelpCenter />} title={command + " help"} />
+                  </Link>
+                </TableCell>
+                <TableCell>{description}</TableCell>
+                <TableCell>
+                  {args && (
+                    <TextField
+                      size="small"
+                      variant="standard"
+                      onChange={e => {
+                        setCommandAdditionalArgs(command, e.target.value);
+                      }}
+                      value={additionalArgs}
+                    />
+                  )}
+                  <Button
+                    size="small"
+                    variant="contained"
+                    color="primary"
+                    label="Run"
+                    startIcon={<PlayArrow />}
+                    onClick={() => {
+                      runCommand(command);
+                    }}
+                    disabled={
+                      commandIsRunning || (args && typeof additionalArgs === "string" && additionalArgs.length === 0)
+                    }
+                  ></Button>
+                </TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </TableContainer>
+
+      {commandResult.length > 0 && (
+        <Alert icon={<CheckCircle fontSize="inherit" />} severity="success">
+          {commandResult.map((result, index) => (
+            <div key={index}>{result}</div>
+          ))}
+        </Alert>
+      )}
+    </>
+  );
+};
+
+export default ServerCommandsPanel;

src/components/etke.cc/ServerNotificationsBadge.tsx

@@ -1,52 +1,93 @@
-import { Badge, useTheme, Button, Paper, Popper, ClickAwayListener, Box, List, ListItem, ListItemText, Typography, ListSubheader, IconButton, Divider, Tooltip } from "@mui/material";
-import NotificationsIcon from '@mui/icons-material/Notifications';
 import DeleteIcon from "@mui/icons-material/Delete";
+import NotificationsIcon from "@mui/icons-material/Notifications";
+import {
+  Badge,
+  useTheme,
+  Button,
+  Paper,
+  Popper,
+  ClickAwayListener,
+  Box,
+  List,
+  ListItem,
+  ListItemText,
+  Typography,
+  ListSubheader,
+  IconButton,
+  Divider,
+  Tooltip,
+} from "@mui/material";
+import { Fragment, useEffect, useState } from "react";
 import { useDataProvider, useStore } from "react-admin";
 import { useNavigate } from "react-router";
-import { Fragment, useEffect, useState } from "react";
-import { useAppContext } from "../../Context";
-import { ServerNotificationsResponse } from "../../synapse/dataProvider";
 
+import { useAppContext } from "../../Context";
+import { ServerNotificationsResponse, ServerProcessResponse } from "../../synapse/dataProvider";
+import { getTimeSince } from "../../utils/date";
+
+// 5 minutes
 const SERVER_NOTIFICATIONS_INTERVAL_TIME = 300000;
 
 const useServerNotifications = () => {
-  const [serverNotifications, setServerNotifications] = useStore<ServerNotificationsResponse>("serverNotifications", { notifications: [], success: false });
+  const [serverNotifications, setServerNotifications] = useStore<ServerNotificationsResponse>("serverNotifications", {
+    notifications: [],
+    success: false,
+  });
+  const [serverProcess, _setServerProcess] = useStore<ServerProcessResponse>("serverProcess", {
+    command: "",
+    locked_at: "",
+  });
+  const { command, locked_at } = serverProcess;
+
   const { etkeccAdmin } = useAppContext();
   const dataProvider = useDataProvider();
   const { notifications, success } = serverNotifications;
 
   const fetchNotifications = async () => {
-    const notificationsResponse: ServerNotificationsResponse = await dataProvider.getServerNotifications(etkeccAdmin);
+    const notificationsResponse: ServerNotificationsResponse = await dataProvider.getServerNotifications(
+      etkeccAdmin,
+      command !== ""
+    );
+    const serverNotifications = [...notificationsResponse.notifications];
+    serverNotifications.reverse();
     setServerNotifications({
       ...notificationsResponse,
-      notifications: notificationsResponse.notifications,
-      success: notificationsResponse.success
+      notifications: serverNotifications,
+      success: notificationsResponse.success,
     });
   };
 
   const deleteServerNotifications = async () => {
     const deleteResponse = await dataProvider.deleteServerNotifications(etkeccAdmin);
     if (deleteResponse.success) {
-      await fetchNotifications();
+      setServerNotifications({
+        notifications: [],
+        success: true,
+      });
     }
   };
 
   useEffect(() => {
-    let serverNotificationsInterval: NodeJS.Timeout;
+    let serverNotificationsInterval: NodeJS.Timeout | null = null;
+    let timeoutId: NodeJS.Timeout | null = null;
+
     if (etkeccAdmin) {
       fetchNotifications();
-      setTimeout(() => {
+      timeoutId = setTimeout(() => {
         // start the interval after the SERVER_NOTIFICATIONS_INTERVAL_TIME to avoid too many requests
         serverNotificationsInterval = setInterval(fetchNotifications, SERVER_NOTIFICATIONS_INTERVAL_TIME);
       }, SERVER_NOTIFICATIONS_INTERVAL_TIME);
     }
 
     return () => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
       if (serverNotificationsInterval) {
         clearInterval(serverNotificationsInterval);
       }
-    }
-  }, [etkeccAdmin]);
+    };
+  }, [etkeccAdmin, command, locked_at]);
 
   return { success, notifications, deleteServerNotifications };
 };
@@ -74,7 +115,7 @@ export const ServerNotificationsBadge = () => {
   };
 
   const handleClearAllNotifications = async () => {
-    deleteServerNotifications()
+    deleteServerNotifications();
     handleClose();
   };
 
@@ -85,36 +126,40 @@ export const ServerNotificationsBadge = () => {
   return (
     <Box>
       <IconButton onClick={handleOpen} sx={{ color: theme.palette.common.white }}>
-        <Tooltip title={notifications && notifications.length > 0 ? `${notifications.length} new notifications` : `No notifications yet`}>
-        {notifications && notifications.length > 0 && (
+        <Tooltip
+          title={
+            notifications && notifications.length > 0
+              ? `${notifications.length} new notifications`
+              : `No notifications yet`
+          }
+        >
+          {(notifications && notifications.length > 0 && (
             <Badge badgeContent={notifications.length} color="error">
               <NotificationsIcon />
             </Badge>
-        ) || <NotificationsIcon />}
+          )) || <NotificationsIcon />}
         </Tooltip>
       </IconButton>
-      <Popper
-        open={open}
-        anchorEl={anchorEl}
-        placement="bottom-end"
-        style={{ zIndex: 1300 }}
-      >
+      <Popper open={open} anchorEl={anchorEl} placement="bottom-end" style={{ zIndex: 1300 }}>
         <ClickAwayListener onClickAway={handleClose}>
           <Paper
             elevation={3}
             sx={{
               p: 1,
               maxHeight: "350px",
+              paddingTop: 0,
               overflowY: "auto",
               minWidth: "300px",
               maxWidth: {
                 xs: "100vw", // Full width on mobile
-                sm: "400px"  // Fixed width on desktop
-              }
+                sm: "400px", // Fixed width on desktop
+              },
             }}
           >
-            {(!notifications || notifications.length === 0) ? (
-              <Typography sx={{ p: 1 }} variant="body2">No new notifications</Typography>
+            {!notifications || notifications.length === 0 ? (
+              <Typography sx={{ p: 1 }} variant="body2">
+                No new notifications
+              </Typography>
             ) : (
               <List sx={{ p: 0 }} dense={true}>
                 <ListSubheader
@@ -123,22 +168,31 @@ export const ServerNotificationsBadge = () => {
                     justifyContent: "space-between",
                     alignItems: "center",
                     fontWeight: "bold",
-                    backgroundColor: "inherit",
                   }}
                 >
                   <Typography variant="h6">Notifications</Typography>
-                    <Box sx={{ cursor: "pointer", color: theme.palette.primary.main }} onClick={() => handleSeeAllNotifications()}>See all notifications</Box>
+                  <Box
+                    sx={{ cursor: "pointer", color: theme.palette.primary.main }}
+                    onClick={() => handleSeeAllNotifications()}
+                  >
+                    See all notifications
+                  </Box>
                 </ListSubheader>
                 <Divider />
                 {notifications.map((notification, index) => {
-                  return (<Fragment key={notification.event_id ? notification.event_id : index }>
+                  return (
+                    <Fragment key={notification.event_id ? notification.event_id + index : index}>
                       <ListItem
                         onClick={() => handleSeeAllNotifications()}
                         sx={{
+                          display: "flex",
+                          flexDirection: "column",
+                          alignItems: "flex-start",
+                          overflow: "hidden",
                           "&:hover": {
                             backgroundColor: "action.hover",
-                          cursor: "pointer"
-                        }
+                            cursor: "pointer",
+                          },
                         }}
                       >
                         <ListItemText
@@ -148,16 +202,23 @@ export const ServerNotificationsBadge = () => {
                               sx={{
                                 overflow: "hidden",
                                 textOverflow: "ellipsis",
-                              whiteSpace: "nowrap"
                               }}
                               dangerouslySetInnerHTML={{ __html: notification.output.split("\n")[0] }}
                             />
                           }
                         />
+                        <ListItemText
+                          primary={
+                            <Typography variant="body2" sx={{ color: theme.palette.text.secondary }}>
+                              {getTimeSince(notification.sent_at) + " ago"}
+                            </Typography>
+                          }
+                        />
                       </ListItem>
                       <Divider />
                     </Fragment>
-                )})}
+                  );
+                })}
                 <ListItem>
                   <Button
                     key="clear-all-notifications"
@@ -167,7 +228,7 @@ export const ServerNotificationsBadge = () => {
                     sx={{
                       pl: 0,
                       pt: 1,
-                      verticalAlign: "middle"
+                      verticalAlign: "middle",
                     }}
                   >
                     <DeleteIcon fontSize="small" sx={{ mr: 1 }} />

src/components/etke.cc/ServerNotificationsPage.tsx

@@ -1,12 +1,16 @@
-import { Box, Typography, Paper, Button } from "@mui/material"
-import { Stack } from "@mui/material"
-import { useStore } from "react-admin"
-import dataProvider, { ServerNotificationsResponse } from "../../synapse/dataProvider"
-import { useAppContext } from "../../Context";
 import DeleteIcon from "@mui/icons-material/Delete";
+import { Box, Typography, Paper, Button } from "@mui/material";
+import { Stack } from "@mui/material";
+import { Tooltip } from "@mui/material";
+import { useStore } from "react-admin";
+
+import { useAppContext } from "../../Context";
+import dataProvider, { ServerNotificationsResponse } from "../../synapse/dataProvider";
+import { getTimeSince } from "../../utils/date";
+
 const DisplayTime = ({ date }: { date: string }) => {
-  const dateFromDateString = new Date(date);
-  return <>{dateFromDateString.toLocaleString()}</>;
+  const dateFromDateString = new Date(date.replace(" ", "T") + "Z");
+  return <Tooltip title={dateFromDateString.toLocaleString()}>{<span>{getTimeSince(date) + " ago"}</span>}</Tooltip>;
 };
 
 const ServerNotificationsPage = () => {
@@ -23,13 +27,17 @@ const ServerNotificationsPage = () => {
       <Stack spacing={1} direction="row" alignItems="center">
         <Box sx={{ display: "flex", alignItems: "center", justifyContent: "space-between", width: "100%", gap: 1 }}>
           <Typography variant="h4">Server Notifications</Typography>
-          <Button variant="text" color="error" onClick={async () => {
+          <Button
+            variant="text"
+            color="error"
+            onClick={async () => {
               await dataProvider.deleteServerNotifications(etkeccAdmin);
               setServerNotifications({
                 notifications: [],
                 success: true,
               });
-          }}>
+            }}
+          >
             <DeleteIcon fontSize="small" sx={{ mr: 1 }} /> Clear
           </Button>
         </Box>

src/components/etke.cc/ServerStatusBadge.tsx

@@ -1,45 +1,47 @@
-import { Avatar, Badge, Theme, Tooltip } from "@mui/material";
-import { useEffect } from "react";
-import { useAppContext } from "../../Context";
-import { Button, useDataProvider, useStore } from "react-admin";
-import { styled } from '@mui/material/styles';
-import MonitorHeartIcon from '@mui/icons-material/MonitorHeart';
+import MonitorHeartIcon from "@mui/icons-material/MonitorHeart";
+import { Avatar, Badge, Box, Theme, Tooltip } from "@mui/material";
 import { BadgeProps } from "@mui/material/Badge";
-import { useNavigate } from "react-router";
+import { styled } from "@mui/material/styles";
 import { useTheme } from "@mui/material/styles";
+import { useEffect } from "react";
+import { Button, useDataProvider, useStore } from "react-admin";
+import { useNavigate } from "react-router";
+
+import { useAppContext } from "../../Context";
 import { ServerProcessResponse, ServerStatusResponse } from "../../synapse/dataProvider";
 
 interface StyledBadgeProps extends BadgeProps {
   backgroundColor: string;
-  badgeColor: string
+  badgeColor: string;
   theme?: Theme;
 }
 
-const StyledBadge = styled(Badge, { shouldForwardProp: (prop) => !['badgeColor', 'backgroundColor'].includes(prop as string) })<StyledBadgeProps>
-  (({ theme, backgroundColor, badgeColor }) => ({
-    '& .MuiBadge-badge': {
+const StyledBadge = styled(Badge, {
+  shouldForwardProp: prop => !["badgeColor", "backgroundColor"].includes(prop as string),
+})<StyledBadgeProps>(({ theme, backgroundColor, badgeColor }) => ({
+  "& .MuiBadge-badge": {
     backgroundColor: backgroundColor,
     color: badgeColor,
     boxShadow: `0 0 0 2px ${theme.palette.background.paper}`,
-      '&::after': {
-        position: 'absolute',
+    "&::after": {
+      position: "absolute",
       top: 0,
       left: 0,
-        width: '100%',
-        height: '100%',
-        borderRadius: '50%',
-        animation: 'ripple 2.5s infinite ease-in-out',
-        border: '1px solid currentColor',
+      width: "100%",
+      height: "100%",
+      borderRadius: "50%",
+      animation: "ripple 2.5s infinite ease-in-out",
+      border: "1px solid currentColor",
       content: '""',
     },
   },
-    '@keyframes ripple': {
-      '0%': {
-        transform: 'scale(.8)',
+  "@keyframes ripple": {
+    "0%": {
+      transform: "scale(.8)",
       opacity: 1,
     },
-      '100%': {
-        transform: 'scale(2.4)',
+    "100%": {
+      transform: "scale(2.4)",
       opacity: 0,
     },
   },
@@ -51,14 +53,24 @@ const SERVER_STATUS_INTERVAL_TIME = 5 * 60 * 1000;
 const SERVER_CURRENT_PROCCESS_INTERVAL_TIME = 5 * 1000;
 
 const useServerStatus = () => {
-  const [serverStatus, setServerStatus] = useStore<ServerStatusResponse>("serverStatus", { ok: false, success: false, host: "", results: [] });
+  const [serverStatus, setServerStatus] = useStore<ServerStatusResponse>("serverStatus", {
+    ok: false,
+    success: false,
+    host: "",
+    results: [],
+  });
+  const [serverProcess, _setServerProcess] = useStore<ServerProcessResponse>("serverProcess", {
+    command: "",
+    locked_at: "",
+  });
+  const { command } = serverProcess;
   const { etkeccAdmin } = useAppContext();
   const dataProvider = useDataProvider();
   const isOkay = serverStatus.ok;
   const successCheck = serverStatus.success;
 
   const checkServerStatus = async () => {
-    const serverStatus: ServerStatusResponse = await dataProvider.getServerStatus(etkeccAdmin);
+    const serverStatus: ServerStatusResponse = await dataProvider.getServerStatus(etkeccAdmin, command !== "");
     setServerStatus({
       ok: serverStatus.ok,
       success: serverStatus.success,
@@ -68,10 +80,12 @@ const useServerStatus = () => {
   };
 
   useEffect(() => {
-    let serverStatusInterval: NodeJS.Timeout;
+    let serverStatusInterval: NodeJS.Timeout | null = null;
+    let timeoutId: NodeJS.Timeout | null = null;
+
     if (etkeccAdmin) {
       checkServerStatus();
-      setTimeout(() => {
+      timeoutId = setTimeout(() => {
         // start the interval after 10 seconds to avoid too many requests
         serverStatusInterval = setInterval(checkServerStatus, SERVER_STATUS_INTERVAL_TIME);
       }, 10000);
@@ -80,35 +94,46 @@ const useServerStatus = () => {
     }
 
     return () => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
       if (serverStatusInterval) {
         clearInterval(serverStatusInterval);
       }
-    }
-  }, [etkeccAdmin]);
+    };
+  }, [etkeccAdmin, command]);
 
   return { isOkay, successCheck };
 };
 
 const useCurrentServerProcess = () => {
-  const [serverProcess, setServerProcess] = useStore<ServerProcessResponse>("serverProcess", { command: "", locked_at: "" });
+  const [serverProcess, setServerProcess] = useStore<ServerProcessResponse>("serverProcess", {
+    command: "",
+    locked_at: "",
+  });
   const { etkeccAdmin } = useAppContext();
   const dataProvider = useDataProvider();
   const { command, locked_at } = serverProcess;
 
   const checkServerRunningProcess = async () => {
-    const serverProcess: ServerProcessResponse = await dataProvider.getServerRunningProcess(etkeccAdmin);
+    const serverProcess: ServerProcessResponse = await dataProvider.getServerRunningProcess(
+      etkeccAdmin,
+      command !== ""
+    );
     setServerProcess({
       ...serverProcess,
       command: serverProcess.command,
-      locked_at: serverProcess.locked_at
+      locked_at: serverProcess.locked_at,
     });
-  }
+  };
 
   useEffect(() => {
-    let serverCheckInterval: NodeJS.Timeout;
+    let serverCheckInterval: NodeJS.Timeout | null = null;
+    let timeoutId: NodeJS.Timeout | null = null;
+
     if (etkeccAdmin) {
       checkServerRunningProcess();
-      setTimeout(() => {
+      timeoutId = setTimeout(() => {
         serverCheckInterval = setInterval(checkServerRunningProcess, SERVER_CURRENT_PROCCESS_INTERVAL_TIME);
       }, 5000);
     } else {
@@ -116,19 +141,70 @@ const useCurrentServerProcess = () => {
     }
 
     return () => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
       if (serverCheckInterval) {
         clearInterval(serverCheckInterval);
       }
-    }
-  }, [etkeccAdmin]);
+    };
+  }, [etkeccAdmin, command]);
 
   return { command, locked_at };
 };
 
+export const ServerStatusStyledBadge = ({
+  command,
+  locked_at,
+  isOkay,
+  isLoaded,
+  inSidebar = false,
+}: {
+  command: string;
+  locked_at: string;
+  isOkay: boolean;
+  isLoaded: boolean;
+  inSidebar: boolean;
+}) => {
+  const theme = useTheme();
+  let badgeBackgroundColor = isLoaded
+    ? isOkay
+      ? theme.palette.success.light
+      : theme.palette.error.main
+    : theme.palette.grey[600];
+  let badgeColor = isLoaded
+    ? isOkay
+      ? theme.palette.success.light
+      : theme.palette.error.main
+    : theme.palette.grey[600];
+
+  if (command && locked_at) {
+    badgeBackgroundColor = theme.palette.warning.main;
+    badgeColor = theme.palette.warning.main;
+  }
+  let avatarBackgroundColor = theme.palette.mode === "dark" ? theme.palette.background.default : "#2196f3";
+  if (inSidebar) {
+    avatarBackgroundColor = theme.palette.grey[600];
+  }
+
+  return (
+    <StyledBadge
+      overlap="circular"
+      anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
+      variant="dot"
+      backgroundColor={badgeBackgroundColor}
+      badgeColor={badgeColor}
+    >
+      <Avatar sx={{ height: 24, width: 24, background: avatarBackgroundColor }}>
+        <MonitorHeartIcon sx={{ height: 22, width: 22, color: theme.palette.common.white }} />
+      </Avatar>
+    </StyledBadge>
+  );
+};
+
 const ServerStatusBadge = () => {
   const { isOkay, successCheck } = useServerStatus();
   const { command, locked_at } = useCurrentServerProcess();
-    const theme = useTheme();
   const navigate = useNavigate();
 
   if (!successCheck) {
@@ -140,30 +216,26 @@ const ServerStatusBadge = () => {
   };
 
   let tooltipText = "Click to view Server Status";
-    let badgeBackgroundColor = isOkay ? theme.palette.success.light : theme.palette.error.main;
-    let badgeColor = isOkay ? theme.palette.success.light : theme.palette.error.main;
 
   if (command && locked_at) {
-      badgeBackgroundColor = theme.palette.warning.main;
-      badgeColor = theme.palette.warning.main;
     tooltipText = `Running: ${command}; ${tooltipText}`;
   }
 
-    return <Button onClick={handleServerStatusClick} size="medium" sx={{ minWidth: "auto", ".MuiButton-startIcon": { m: 0 }}}>
+  return (
+    <Button onClick={handleServerStatusClick} size="medium" sx={{ minWidth: "auto", ".MuiButton-startIcon": { m: 0 } }}>
       <Tooltip title={tooltipText} sx={{ cursor: "pointer" }}>
-        <StyledBadge
-          overlap="circular"
-          anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
-          variant="dot"
-          backgroundColor={badgeBackgroundColor}
-          badgeColor={badgeColor}
-        >
-          <Avatar sx={{ height: 24, width: 24, background: theme.palette.mode === "dark" ? theme.palette.background.default : "#2196f3" }}>
-            <MonitorHeartIcon sx={{ height: 22, width: 22, color: theme.palette.common.white }} />
-          </Avatar>
-        </StyledBadge>
+        <Box>
+          <ServerStatusStyledBadge
+            inSidebar={false}
+            command={command || ""}
+            locked_at={locked_at || ""}
+            isOkay={isOkay}
+            isLoaded={successCheck}
+          />
+        </Box>
       </Tooltip>
     </Button>
+  );
 };
 
 export default ServerStatusBadge;

src/components/etke.cc/ServerStatusPage.tsx

@@ -1,21 +1,21 @@
-import { useStore } from "ra-core";
-import { Box, Stack, Typography, Paper, Link, Chip, Divider, Tooltip, ChipProps } from "@mui/material";
-import CheckIcon from '@mui/icons-material/Check';
+import CheckIcon from "@mui/icons-material/Check";
 import CloseIcon from "@mui/icons-material/Close";
-import EngineeringIcon from '@mui/icons-material/Engineering';
+import EngineeringIcon from "@mui/icons-material/Engineering";
+import { Box, Stack, Typography, Paper, Link, Chip, Divider, ChipProps } from "@mui/material";
+import { useStore } from "ra-core";
+
+import CurrentlyRunningCommand from "./CurrentlyRunningCommand";
 import { ServerProcessResponse, ServerStatusComponent, ServerStatusResponse } from "../../synapse/dataProvider";
 
-const getTimeSince = (date: string) => {
-  const now = new Date();
-  const past = new Date(date);
-  const diffInMinutes = Math.floor((now.getTime() - past.getTime()) / (1000 * 60));
-
-  if (diffInMinutes < 1) return "a couple of seconds";
-  if (diffInMinutes === 1) return "1 minute";
-  return `${diffInMinutes} minutes`;
-};
-
-const StatusChip = ({ isOkay, size = "medium", command }: { isOkay: boolean, size?: "small" | "medium", command?: string   }) => {
+const StatusChip = ({
+  isOkay,
+  size = "medium",
+  command,
+}: {
+  isOkay: boolean;
+  size?: "small" | "medium";
+  command?: string;
+}) => {
   let label = "OK";
   let icon = <CheckIcon />;
   let color: ChipProps["color"] = "success";
@@ -31,9 +31,7 @@ const StatusChip = ({ isOkay, size = "medium", command }: { isOkay: boolean, siz
     icon = <EngineeringIcon />;
   }
 
-  return (
-    <Chip icon={icon} label={label} color={color} variant="outlined" size={size} />
-  );
+  return <Chip icon={icon} label={label} color={color} variant="outlined" size={size} />;
 };
 
 const ServerComponentText = ({ text }: { text: string }) => {
@@ -41,20 +39,23 @@ const ServerComponentText = ({ text }: { text: string }) => {
 };
 
 const ServerStatusPage = () => {
-  const [serverStatus, setServerStatus] = useStore<ServerStatusResponse>("serverStatus", {
+  const [serverStatus, _setServerStatus] = useStore<ServerStatusResponse>("serverStatus", {
     ok: false,
     success: false,
     host: "",
     results: [],
   });
-  const [ serverProcess, setServerProcess ] = useStore<ServerProcessResponse>("serverProcess", { command: "", locked_at: "" });
-  const { command, locked_at } = serverProcess;
+  const [serverProcess, _setServerProcess] = useStore<ServerProcessResponse>("serverProcess", {
+    command: "",
+    locked_at: "",
+  });
+  const { command } = serverProcess;
   const successCheck = serverStatus.success;
   const isOkay = serverStatus.ok;
   const host = serverStatus.host;
   const results = serverStatus.results;
 
-  let groupedResults: Record<string, ServerStatusComponent[]> = {};
+  const groupedResults: Record<string, ServerStatusComponent[]> = {};
   for (const result of results) {
     if (!groupedResults[result.category]) {
       groupedResults[result.category] = [];
@@ -66,10 +67,7 @@ const ServerStatusPage = () => {
     return (
       <Paper elevation={3} sx={{ p: 3, mt: 3 }}>
         <Stack direction="row" spacing={2} alignItems="center">
-          <CloseIcon color="error" />
-          <Typography color="error">
-            Unable to fetch server status. Please try again later.
-          </Typography>
+          <Typography color="info">Fetching real-time server health... Just a moment!</Typography>
         </Stack>
       </Paper>
     );
@@ -86,24 +84,26 @@ const ServerStatusPage = () => {
           {host}
         </Typography>
       </Stack>
-      {command && locked_at && (
-      <Stack spacing={1} direction="row" alignItems="center">
-        <Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
-          <Typography variant="h5">Currently running:</Typography>
-          <Typography variant="h5" color="text.secondary">
-            <Link href={"https://etke.cc/help/extras/scheduler/#"+command} target="_blank">
-              {command}
+
+      <CurrentlyRunningCommand />
+
+      <Typography variant="body1">
+        This is a{" "}
+        <Link href="https://etke.cc/services/monitoring/" target="_blank">
+          monitoring report
+        </Link>{" "}
+        of the server. If any of the checks below concern you, please check the{" "}
+        <Link
+          href="https://etke.cc/services/monitoring/#what-to-do-if-the-monitoring-report-shows-issues"
+          target="_blank"
+        >
+          suggested actions
         </Link>
-              <Tooltip title={locked_at.toString()}>
-                <Typography component="span" color="text.secondary" sx={{ display: "inline-block", ml: 1 }}>(started {getTimeSince(locked_at)} ago)</Typography>
-              </Tooltip>
+        .
       </Typography>
-        </Box>
-      </Stack>
-      )}
 
       <Stack spacing={2} direction="row">
-        {Object.keys(groupedResults).map((category, idx) => (
+        {Object.keys(groupedResults).map((category, _idx) => (
           <Box key={`category_${category}`} sx={{ flex: 1 }}>
             <Typography variant="h5" mb={1}>
               {category}
@@ -123,8 +123,10 @@ const ServerStatusPage = () => {
                           <ServerComponentText text={result.label.text} />
                         )}
                       </Box>
-                      {result.reason && <Typography color="text.secondary" dangerouslySetInnerHTML={{ __html: result.reason }}/>}
-                      {(!result.ok && result.help) && (
+                      {result.reason && (
+                        <Typography color="text.secondary" dangerouslySetInnerHTML={{ __html: result.reason }} />
+                      )}
+                      {!result.ok && result.help && (
                         <Link href={result.help} target="_blank" rel="noopener noreferrer" sx={{ mt: 1 }}>
                           Learn more
                         </Link>

src/components/etke.cc/hooks/useServerCommands.ts

@@ -0,0 +1,29 @@
+import { useState, useEffect } from "react";
+import { useDataProvider } from "react-admin";
+
+import { useAppContext } from "../../../Context";
+import { ServerCommand } from "../../../synapse/dataProvider";
+
+export const useServerCommands = () => {
+  const { etkeccAdmin } = useAppContext();
+  const [isLoading, setLoading] = useState(true);
+  const [serverCommands, setServerCommands] = useState<Record<string, ServerCommand>>({});
+  const dataProvider = useDataProvider();
+
+  useEffect(() => {
+    const fetchServerCommands = async () => {
+      const serverCommandsResponse = await dataProvider.getServerCommands(etkeccAdmin);
+      if (serverCommandsResponse) {
+        const serverCommands = serverCommandsResponse;
+        Object.keys(serverCommandsResponse).forEach((command: string) => {
+          serverCommands[command].additionalArgs = "";
+        });
+        setServerCommands(serverCommands);
+      }
+      setLoading(false);
+    };
+    fetchServerCommands();
+  }, [dataProvider, etkeccAdmin]);
+
+  return { isLoading, serverCommands, setServerCommands };
+};

src/components/etke.cc/schedules/components/recurring/RecurringCommandEdit.tsx

@@ -0,0 +1,182 @@
+import ArrowBackIcon from "@mui/icons-material/ArrowBack";
+import { Card, CardContent, CardHeader, Box, Alert, Typography, Link } from "@mui/material";
+import { useQueryClient } from "@tanstack/react-query";
+import { useState, useEffect } from "react";
+import {
+  Form,
+  TextInput,
+  SaveButton,
+  useNotify,
+  useDataProvider,
+  Loading,
+  Button,
+  SelectInput,
+  TimeInput,
+} from "react-admin";
+import { useWatch } from "react-hook-form";
+import { useParams, useNavigate } from "react-router-dom";
+
+import RecurringDeleteButton from "./RecurringDeleteButton";
+import { useAppContext } from "../../../../../Context";
+import { RecurringCommand } from "../../../../../synapse/dataProvider";
+import { useServerCommands } from "../../../hooks/useServerCommands";
+import { useRecurringCommands } from "../../hooks/useRecurringCommands";
+
+/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+const transformCommandsToChoices = (commands: Record<string, any>) => {
+  return Object.entries(commands).map(([key, value]) => ({
+    id: key,
+    name: value.name,
+    description: value.description,
+  }));
+};
+
+const ArgumentsField = ({ serverCommands }) => {
+  const selectedCommand = useWatch({ name: "command" });
+  const showArgs = selectedCommand && serverCommands[selectedCommand]?.args === true;
+
+  if (!showArgs) return null;
+
+  return <TextInput required source="args" label="Arguments" fullWidth multiline />;
+};
+
+const RecurringCommandEdit = () => {
+  const { id } = useParams();
+  const navigate = useNavigate();
+  const notify = useNotify();
+  const dataProvider = useDataProvider();
+  const queryClient = useQueryClient();
+  const { etkeccAdmin } = useAppContext();
+  const [command, setCommand] = useState<RecurringCommand | undefined>(undefined);
+  const isCreating = typeof id === "undefined";
+  const [loading, setLoading] = useState(!isCreating);
+  const { data: recurringCommands, isLoading: isLoadingList } = useRecurringCommands();
+  const { serverCommands, isLoading: isLoadingServerCommands } = useServerCommands();
+  const pageTitle = isCreating ? "Create Recurring Command" : "Edit Recurring Command";
+
+  const commandChoices = transformCommandsToChoices(serverCommands);
+  const dayOfWeekChoices = [
+    { id: "Monday", name: "Monday" },
+    { id: "Tuesday", name: "Tuesday" },
+    { id: "Wednesday", name: "Wednesday" },
+    { id: "Thursday", name: "Thursday" },
+    { id: "Friday", name: "Friday" },
+    { id: "Saturday", name: "Saturday" },
+    { id: "Sunday", name: "Sunday" },
+  ];
+
+  useEffect(() => {
+    if (!isCreating && recurringCommands) {
+      const commandToEdit = recurringCommands.find(cmd => cmd.id === id);
+      if (commandToEdit) {
+        const timeValue = commandToEdit.time || "";
+        const timeParts = timeValue.split(" ");
+
+        const parsedCommand = {
+          ...commandToEdit,
+          day_of_week: timeParts.length > 1 ? timeParts[0] : "Monday",
+          execution_time: timeParts.length > 1 ? timeParts[1] : timeValue,
+        };
+
+        setCommand(parsedCommand);
+      }
+      setLoading(false);
+    }
+  }, [id, recurringCommands, isCreating]);
+
+  const handleSubmit = async data => {
+    try {
+      // Format the time from the Date object to a string in HH:MM format
+      let formattedTime = "00:00";
+
+      if (data.execution_time instanceof Date) {
+        const hours = String(data.execution_time.getHours()).padStart(2, "0");
+        const minutes = String(data.execution_time.getMinutes()).padStart(2, "0");
+        formattedTime = `${hours}:${minutes}`;
+      } else if (typeof data.execution_time === "string") {
+        formattedTime = data.execution_time;
+      }
+
+      const submissionData = {
+        ...data,
+        time: `${data.day_of_week} ${formattedTime}`,
+      };
+
+      delete submissionData.day_of_week;
+      delete submissionData.execution_time;
+      delete submissionData.scheduled_at;
+
+      // Only include args when it's required for the selected command
+      const selectedCommand = data.command;
+      if (!selectedCommand || !serverCommands[selectedCommand]?.args) {
+        delete submissionData.args;
+      }
+
+      if (isCreating) {
+        await dataProvider.createRecurringCommand(etkeccAdmin, submissionData);
+        notify("recurring_commands.action.create_success", { type: "success" });
+      } else {
+        await dataProvider.updateRecurringCommand(etkeccAdmin, {
+          ...submissionData,
+          id: id,
+        });
+        notify("recurring_commands.action.update_success", { type: "success" });
+      }
+
+      // Invalidate scheduled commands queries
+      queryClient.invalidateQueries({ queryKey: ["scheduledCommands"] });
+
+      navigate("/server_actions");
+    } catch (error) {
+      console.error("Error saving recurring command:", error);
+      notify("recurring_commands.action.update_failure", { type: "error" });
+    }
+  };
+
+  if (loading || isLoadingList || isLoadingServerCommands) {
+    return <Loading />;
+  }
+
+  return (
+    <Box sx={{ mt: 2 }}>
+      <Button label="Back" onClick={() => navigate("/server_actions")} startIcon={<ArrowBackIcon />} sx={{ mb: 2 }} />
+
+      <Card>
+        <CardHeader title={pageTitle} />
+        <CardContent>
+          {command && (
+            <Alert severity="info">
+              <Typography variant="body1" sx={{ px: 2 }}>
+                You can find more details about the command{" "}
+                <Link href={`https://etke.cc/help/extras/scheduler/#${command.command}`} target="_blank">
+                  here
+                </Link>
+                .
+              </Typography>
+            </Alert>
+          )}
+          <Form
+            defaultValues={command || undefined}
+            onSubmit={handleSubmit}
+            record={command || undefined}
+            warnWhenUnsavedChanges
+          >
+            <Box display="flex" flexDirection="column" gap={2}>
+              {!isCreating && <TextInput readOnly source="id" label="ID" fullWidth required />}
+              <SelectInput source="command" choices={commandChoices} label="Command" fullWidth required />
+              <ArgumentsField serverCommands={serverCommands} />
+              <SelectInput source="day_of_week" choices={dayOfWeekChoices} label="Day of Week" fullWidth required />
+              <TimeInput source="execution_time" label="Time (UTC)" fullWidth required />
+              <Box mt={2} display="flex" justifyContent="space-between">
+                <SaveButton label={isCreating ? "Create" : "Update"} />
+                {!isCreating && <RecurringDeleteButton />}
+              </Box>
+            </Box>
+          </Form>
+        </CardContent>
+      </Card>
+    </Box>
+  );
+};
+
+export default RecurringCommandEdit;

src/components/etke.cc/schedules/components/recurring/RecurringCommandsList.tsx

@@ -0,0 +1,63 @@
+import AddIcon from "@mui/icons-material/Add";
+import { Paper } from "@mui/material";
+import { Loading, Button } from "react-admin";
+import { DateField } from "react-admin";
+import { Datagrid } from "react-admin";
+import { ListContextProvider, TextField, TopToolbar, Identifier } from "react-admin";
+import { ResourceContextProvider, useList } from "react-admin";
+import { useNavigate } from "react-router-dom";
+
+import { DATE_FORMAT } from "../../../../../utils/date";
+import { useRecurringCommands } from "../../hooks/useRecurringCommands";
+
+const ListActions = () => {
+  const navigate = useNavigate();
+
+  return (
+    <TopToolbar>
+      <Button label="Create" onClick={() => navigate("/server_actions/recurring/create")} startIcon={<AddIcon />} />
+    </TopToolbar>
+  );
+};
+
+const RecurringCommandsList = () => {
+  const { data, isLoading } = useRecurringCommands();
+
+  const listContext = useList({
+    resource: "recurring",
+    sort: { field: "scheduled_at", order: "DESC" },
+    perPage: 50,
+    data: data || [],
+    isLoading: isLoading,
+  });
+
+  if (isLoading) return <Loading />;
+
+  return (
+    <ResourceContextProvider value="recurring">
+      <ListContextProvider value={listContext}>
+        <ListActions />
+        <Paper>
+          <Datagrid
+            bulkActionButtons={false}
+            /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+            rowClick={(id: Identifier, resource: string, record: any) => {
+              if (!record) {
+                return "";
+              }
+
+              return `/server_actions/${resource}/${id}`;
+            }}
+          >
+            <TextField source="command" />
+            <TextField source="args" label="Arguments" />
+            <TextField source="time" label="Time (UTC)" />
+            <DateField options={DATE_FORMAT} showTime source="scheduled_at" label="Next run at (local time)" />
+          </Datagrid>
+        </Paper>
+      </ListContextProvider>
+    </ResourceContextProvider>
+  );
+};
+
+export default RecurringCommandsList;

src/components/etke.cc/schedules/components/recurring/RecurringDeleteButton.tsx

@@ -0,0 +1,65 @@
+import DeleteIcon from "@mui/icons-material/Delete";
+import { useTheme } from "@mui/material/styles";
+import { useState } from "react";
+import { useNotify, useDataProvider, useRecordContext } from "react-admin";
+import { Button, Confirm } from "react-admin";
+import { useNavigate } from "react-router-dom";
+
+import { useAppContext } from "../../../../../Context";
+import { RecurringCommand } from "../../../../../synapse/dataProvider";
+
+const RecurringDeleteButton = () => {
+  const record = useRecordContext() as RecurringCommand;
+  const { etkeccAdmin } = useAppContext();
+  const dataProvider = useDataProvider();
+  const notify = useNotify();
+  const theme = useTheme();
+  const navigate = useNavigate();
+  const [open, setOpen] = useState(false);
+  const [isDeleting, setIsDeleting] = useState(false);
+
+  const handleClick = e => {
+    e.stopPropagation();
+    setOpen(true);
+  };
+
+  const handleConfirm = async () => {
+    setIsDeleting(true);
+    try {
+      await dataProvider.deleteRecurringCommand(etkeccAdmin, record.id);
+      notify("recurring_commands.action.delete_success", { type: "success" });
+      navigate("/server_actions");
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+      notify(`Error: ${errorMessage}`, { type: "error" });
+    } finally {
+      setIsDeleting(false);
+      setOpen(false);
+    }
+  };
+
+  const handleCancel = () => {
+    setOpen(false);
+  };
+
+  return (
+    <>
+      <Button
+        sx={{ color: theme.palette.error.main }}
+        label="Delete"
+        onClick={handleClick}
+        disabled={isDeleting}
+        startIcon={<DeleteIcon />}
+      />
+      <Confirm
+        isOpen={open}
+        title="Delete Recurring Command"
+        content={`Are you sure you want to delete the command: ${record?.command || ""}?`}
+        onConfirm={handleConfirm}
+        onClose={handleCancel}
+      />
+    </>
+  );
+};
+
+export default RecurringDeleteButton;

src/components/etke.cc/schedules/components/scheduled/ScheduledCommandEdit.tsx

@@ -0,0 +1,139 @@
+import ArrowBackIcon from "@mui/icons-material/ArrowBack";
+import { Card, CardContent, CardHeader, Box } from "@mui/material";
+import { Typography, Link } from "@mui/material";
+import { useState, useEffect } from "react";
+import {
+  Form,
+  TextInput,
+  DateTimeInput,
+  SaveButton,
+  useNotify,
+  useDataProvider,
+  Loading,
+  Button,
+  SelectInput,
+} from "react-admin";
+import { useWatch } from "react-hook-form";
+import { useParams, useNavigate } from "react-router-dom";
+
+import ScheduleDeleteButton from "./ScheduledDeleteButton";
+import { useAppContext } from "../../../../../Context";
+import { ScheduledCommand } from "../../../../../synapse/dataProvider";
+import { useServerCommands } from "../../../hooks/useServerCommands";
+import { useScheduledCommands } from "../../hooks/useScheduledCommands";
+
+/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+const transformCommandsToChoices = (commands: Record<string, any>) => {
+  return Object.entries(commands).map(([key, value]) => ({
+    id: key,
+    name: value.name,
+    description: value.description,
+  }));
+};
+
+const ArgumentsField = ({ serverCommands }) => {
+  const selectedCommand = useWatch({ name: "command" });
+  const showArgs = selectedCommand && serverCommands[selectedCommand]?.args === true;
+
+  if (!showArgs) return null;
+
+  return <TextInput required source="args" label="Arguments" fullWidth multiline />;
+};
+
+const ScheduledCommandEdit = () => {
+  const { id } = useParams();
+  const navigate = useNavigate();
+  const notify = useNotify();
+  const dataProvider = useDataProvider();
+  const { etkeccAdmin } = useAppContext();
+  const [command, setCommand] = useState<ScheduledCommand | null>(null);
+  const isCreating = typeof id === "undefined";
+  const [loading, setLoading] = useState(!isCreating);
+  const { data: scheduledCommands, isLoading: isLoadingList } = useScheduledCommands();
+  const { serverCommands } = useServerCommands();
+  const pageTitle = isCreating ? "Create Scheduled Command" : "Edit Scheduled Command";
+
+  const commandChoices = transformCommandsToChoices(serverCommands);
+
+  useEffect(() => {
+    if (!isCreating && scheduledCommands) {
+      const commandToEdit = scheduledCommands.find(cmd => cmd.id === id);
+      if (commandToEdit) {
+        setCommand(commandToEdit);
+      }
+      setLoading(false);
+    }
+  }, [id, scheduledCommands, isCreating]);
+
+  const handleSubmit = async data => {
+    try {
+      data.scheduled_at = new Date(data.scheduled_at).toISOString();
+      if (isCreating) {
+        await dataProvider.createScheduledCommand(etkeccAdmin, data);
+        notify("scheduled_commands.action.create_success", { type: "success" });
+      } else {
+        await dataProvider.updateScheduledCommand(etkeccAdmin, {
+          ...data,
+          id: id,
+        });
+        notify("scheduled_commands.action.update_success", { type: "success" });
+      }
+
+      navigate("/server_actions");
+    } catch (error) {
+      console.log("Error saving scheduled command:", error);
+      notify("scheduled_commands.action.update_failure", { type: "error" });
+    }
+  };
+
+  if (loading || isLoadingList) {
+    return <Loading />;
+  }
+
+  return (
+    <Box sx={{ mt: 2 }}>
+      <Button label="Back" onClick={() => navigate("/server_actions")} startIcon={<ArrowBackIcon />} sx={{ mb: 2 }} />
+
+      <Card>
+        <CardHeader title={pageTitle} />
+        {command && (
+          <Typography variant="body1" sx={{ px: 2 }}>
+            You can find more details about the command{" "}
+            <Link href={`https://etke.cc/help/extras/scheduler/#${command.command}`} target="_blank">
+              here
+            </Link>
+            .
+          </Typography>
+        )}
+        <CardContent>
+          <Form
+            defaultValues={command || undefined}
+            onSubmit={handleSubmit}
+            record={command || undefined}
+            warnWhenUnsavedChanges
+          >
+            <Box display="flex" flexDirection="column" gap={2}>
+              {command && <TextInput readOnly source="id" label="ID" fullWidth required />}
+              <SelectInput
+                readOnly={!isCreating}
+                source="command"
+                choices={commandChoices}
+                label="Command"
+                fullWidth
+                required
+              />
+              <ArgumentsField serverCommands={serverCommands} />
+              <DateTimeInput source="scheduled_at" label="Scheduled at" fullWidth required />
+              <Box mt={2} display="flex" justifyContent="space-between">
+                <SaveButton label={isCreating ? "Create" : "Update"} />
+                {!isCreating && <ScheduleDeleteButton />}
+              </Box>
+            </Box>
+          </Form>
+        </CardContent>
+      </Card>
+    </Box>
+  );
+};
+
+export default ScheduledCommandEdit;

src/components/etke.cc/schedules/components/scheduled/ScheduledCommandShow.tsx

@@ -0,0 +1,86 @@
+import ArrowBackIcon from "@mui/icons-material/ArrowBack";
+import { Alert, Box, Card, CardContent, CardHeader, Typography, Link } from "@mui/material";
+import { useState, useEffect } from "react";
+import {
+  Loading,
+  Button,
+  SimpleShowLayout,
+  TextField,
+  BooleanField,
+  DateField,
+  RecordContextProvider,
+} from "react-admin";
+import { useParams, useNavigate } from "react-router-dom";
+
+import ScheduledDeleteButton from "./ScheduledDeleteButton";
+import { ScheduledCommand } from "../../../../../synapse/dataProvider";
+import { useScheduledCommands } from "../../hooks/useScheduledCommands";
+
+const ScheduledCommandShow = () => {
+  const { id } = useParams();
+  const navigate = useNavigate();
+  const [command, setCommand] = useState<ScheduledCommand | null>(null);
+  const [loading, setLoading] = useState(true);
+  const { data: scheduledCommands, isLoading: isLoadingList } = useScheduledCommands();
+
+  useEffect(() => {
+    if (scheduledCommands) {
+      const commandToShow = scheduledCommands.find(cmd => cmd.id === id);
+      if (commandToShow) {
+        setCommand(commandToShow);
+      }
+      setLoading(false);
+    }
+  }, [id, scheduledCommands]);
+
+  if (loading || isLoadingList) {
+    return <Loading />;
+  }
+
+  if (!command) {
+    return null;
+  }
+
+  return (
+    <Box sx={{ mt: 2 }}>
+      <Button label="Back" onClick={() => navigate("/server_actions")} startIcon={<ArrowBackIcon />} sx={{ mb: 2 }} />
+
+      <RecordContextProvider value={command}>
+        <Card>
+          <CardHeader title="Scheduled Command Details" />
+          <CardContent>
+            {command && (
+              <Alert severity="info">
+                <Typography variant="body1" sx={{ px: 2 }}>
+                  You can find more details about the command{" "}
+                  <Link href={`https://etke.cc/help/extras/scheduler/#${command.command}`} target="_blank">
+                    here
+                  </Link>
+                  .
+                </Typography>
+              </Alert>
+            )}
+            <SimpleShowLayout>
+              <TextField source="id" label="ID" />
+              <TextField source="command" label="Command" />
+              {command.args && <TextField source="args" label="Arguments" />}
+              <BooleanField source="is_recurring" label="Is recurring" />
+              <DateField source="scheduled_at" label="Scheduled at" showTime />
+            </SimpleShowLayout>
+            {command.is_recurring && (
+              <Alert severity="warning">
+                Scheduled commands created from a recurring one are not editable as they will be regenerated
+                automatically. Please edit the recurring command instead.
+              </Alert>
+            )}
+          </CardContent>
+        </Card>
+        <Box display="flex" justifyContent="flex-end" mt={2}>
+          <ScheduledDeleteButton />
+        </Box>
+      </RecordContextProvider>
+    </Box>
+  );
+};
+
+export default ScheduledCommandShow;

src/components/etke.cc/schedules/components/scheduled/ScheduledCommandsList.tsx

@@ -0,0 +1,71 @@
+import AddIcon from "@mui/icons-material/Add";
+import { Paper } from "@mui/material";
+import { Loading, Button } from "react-admin";
+import { ResourceContextProvider, useList } from "react-admin";
+import { ListContextProvider, TextField } from "react-admin";
+import { Datagrid } from "react-admin";
+import { BooleanField, DateField, TopToolbar } from "react-admin";
+import { Identifier } from "react-admin";
+import { useNavigate } from "react-router-dom";
+
+import { DATE_FORMAT } from "../../../../../utils/date";
+import { useScheduledCommands } from "../../hooks/useScheduledCommands";
+const ListActions = () => {
+  const navigate = useNavigate();
+
+  const handleCreate = () => {
+    navigate("/server_actions/scheduled/create");
+  };
+
+  return (
+    <TopToolbar>
+      <Button label="Create" onClick={handleCreate} startIcon={<AddIcon />} />
+    </TopToolbar>
+  );
+};
+
+const ScheduledCommandsList = () => {
+  const { data, isLoading } = useScheduledCommands();
+
+  const listContext = useList({
+    resource: "scheduled",
+    sort: { field: "scheduled_at", order: "DESC" },
+    perPage: 50,
+    data: data || [],
+    isLoading: isLoading,
+  });
+
+  if (isLoading) return <Loading />;
+
+  return (
+    <ResourceContextProvider value="scheduled">
+      <ListContextProvider value={listContext}>
+        <ListActions />
+        <Paper>
+          <Datagrid
+            bulkActionButtons={false}
+            /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+            rowClick={(id: Identifier, resource: string, record: any) => {
+              if (!record) {
+                return "";
+              }
+
+              if (record.is_recurring) {
+                return `/server_actions/${resource}/${id}/show`;
+              }
+
+              return `/server_actions/${resource}/${id}`;
+            }}
+          >
+            <TextField source="command" />
+            <TextField source="args" label="Arguments" />
+            <BooleanField source="is_recurring" label="Is recurring?" />
+            <DateField options={DATE_FORMAT} showTime source="scheduled_at" label="Run at (local time)" />
+          </Datagrid>
+        </Paper>
+      </ListContextProvider>
+    </ResourceContextProvider>
+  );
+};
+
+export default ScheduledCommandsList;

src/components/etke.cc/schedules/components/scheduled/ScheduledDeleteButton.tsx

@@ -0,0 +1,65 @@
+import DeleteIcon from "@mui/icons-material/Delete";
+import { useTheme } from "@mui/material/styles";
+import { useState } from "react";
+import { useNotify, useDataProvider, useRecordContext } from "react-admin";
+import { Button, Confirm } from "react-admin";
+import { useNavigate } from "react-router-dom";
+
+import { useAppContext } from "../../../../../Context";
+import { ScheduledCommand } from "../../../../../synapse/dataProvider";
+
+const ScheduledDeleteButton = () => {
+  const record = useRecordContext() as ScheduledCommand;
+  const { etkeccAdmin } = useAppContext();
+  const dataProvider = useDataProvider();
+  const notify = useNotify();
+  const theme = useTheme();
+  const navigate = useNavigate();
+  const [open, setOpen] = useState(false);
+  const [isDeleting, setIsDeleting] = useState(false);
+
+  const handleClick = e => {
+    e.stopPropagation();
+    setOpen(true);
+  };
+
+  const handleConfirm = async () => {
+    setIsDeleting(true);
+    try {
+      await dataProvider.deleteScheduledCommand(etkeccAdmin, record.id);
+      notify("scheduled_commands.action.delete_success", { type: "success" });
+      navigate("/server_actions");
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+      notify(`Error: ${errorMessage}`, { type: "error" });
+    } finally {
+      setIsDeleting(false);
+      setOpen(false);
+    }
+  };
+
+  const handleCancel = () => {
+    setOpen(false);
+  };
+
+  return (
+    <>
+      <Button
+        sx={{ color: theme.palette.error.main }}
+        label="Delete"
+        onClick={handleClick}
+        disabled={isDeleting}
+        startIcon={<DeleteIcon />}
+      />
+      <Confirm
+        isOpen={open}
+        title="Delete Scheduled Command"
+        content={`Are you sure you want to delete the command: ${record?.command || ""}?`}
+        onConfirm={handleConfirm}
+        onClose={handleCancel}
+      />
+    </>
+  );
+};
+
+export default ScheduledDeleteButton;

src/components/etke.cc/schedules/hooks/useRecurringCommands.tsx

@@ -0,0 +1,15 @@
+import { useQuery } from "@tanstack/react-query";
+import { useDataProvider } from "react-admin";
+
+import { useAppContext } from "../../../../Context";
+
+export const useRecurringCommands = () => {
+  const { etkeccAdmin } = useAppContext();
+  const dataProvider = useDataProvider();
+  const { data, isLoading, error } = useQuery({
+    queryKey: ["recurringCommands"],
+    queryFn: () => dataProvider.getRecurringCommands(etkeccAdmin),
+  });
+
+  return { data, isLoading, error };
+};

src/components/etke.cc/schedules/hooks/useScheduledCommands.tsx

@@ -0,0 +1,15 @@
+import { useQuery } from "@tanstack/react-query";
+import { useDataProvider } from "react-admin";
+
+import { useAppContext } from "../../../../Context";
+
+export const useScheduledCommands = () => {
+  const { etkeccAdmin } = useAppContext();
+  const dataProvider = useDataProvider();
+  const { data, isLoading, error } = useQuery({
+    queryKey: ["scheduledCommands"],
+    queryFn: () => dataProvider.getScheduledCommands(etkeccAdmin),
+  });
+
+  return { data, isLoading, error };
+};

src/components/media.tsx

@@ -1,17 +1,17 @@
-import { get } from "lodash";
-import { useState } from "react";
-
 import BlockIcon from "@mui/icons-material/Block";
 import IconCancel from "@mui/icons-material/Cancel";
 import ClearIcon from "@mui/icons-material/Clear";
 import DeleteSweepIcon from "@mui/icons-material/DeleteSweep";
+import DownloadIcon from "@mui/icons-material/Download";
+import DownloadingIcon from "@mui/icons-material/Downloading";
 import FileOpenIcon from "@mui/icons-material/FileOpen";
 import LockIcon from "@mui/icons-material/Lock";
 import LockOpenIcon from "@mui/icons-material/LockOpen";
-import DownloadIcon from '@mui/icons-material/Download';
-import DownloadingIcon from '@mui/icons-material/Downloading';
-import { Grid2 as Grid, Box, Dialog, DialogContent, DialogContentText, DialogTitle, Tooltip, Link } from "@mui/material";
+import { Box, Dialog, DialogContent, DialogContentText, DialogTitle, Tooltip } from "@mui/material";
 import { alpha, useTheme } from "@mui/material/styles";
+import { useMutation } from "@tanstack/react-query";
+import { get } from "lodash";
+import { useState } from "react";
 import {
   BooleanInput,
   Button,
@@ -30,10 +30,10 @@ import {
   useRefresh,
   useTranslate,
 } from "react-admin";
-import { useMutation } from "@tanstack/react-query";
 
-import { dateParser } from "../utils/date";
 import { DeleteMediaParams, SynapseDataProvider } from "../synapse/dataProvider";
+import { dateParser } from "../utils/date";
+import decodeURLComponent from "../utils/decodeURLComponent";
 import { fetchAuthenticatedMedia } from "../utils/fetchMedia";
 
 const DeleteMediaDialog = ({ open, onClose, onSubmit }) => {
@@ -54,24 +54,9 @@ const DeleteMediaDialog = ({ open, onClose, onSubmit }) => {
       <DialogContent>
         <DialogContentText>{translate("delete_media.helper.send")}</DialogContentText>
         <SimpleForm toolbar={<DeleteMediaToolbar />} onSubmit={onSubmit}>
-          <DateTimeInput
-            source="before_ts"
-            label="delete_media.fields.before_ts"
-            defaultValue={0}
-            parse={dateParser}
-          />
-          <NumberInput
-            source="size_gt"
-            label="delete_media.fields.size_gt"
-            defaultValue={0}
-            min={0}
-            step={1024}
-          />
-          <BooleanInput
-            source="keep_profiles"
-            label="delete_media.fields.keep_profiles"
-            defaultValue={true}
-          />
+          <DateTimeInput source="before_ts" label="delete_media.fields.before_ts" defaultValue={0} parse={dateParser} />
+          <NumberInput source="size_gt" label="delete_media.fields.size_gt" defaultValue={0} min={0} step={1024} />
+          <BooleanInput source="keep_profiles" label="delete_media.fields.keep_profiles" defaultValue={true} />
         </SimpleForm>
       </DialogContent>
     </Dialog>
@@ -155,7 +140,6 @@ const PurgeRemoteMediaDialog = ({ open, onClose, onSubmit }) => {
 };
 
 export const PurgeRemoteMediaButton = (props: ButtonProps) => {
-  const theme = useTheme();
   const [open, setOpen] = useState(false);
   const notify = useNotify();
   const dataProvider = useDataProvider<SynapseDataProvider>();
@@ -409,7 +393,7 @@ export const ViewMediaButton = ({ mxcURL, label, uploadName, mimetype }) => {
     document.body.appendChild(anchorElement);
     anchorElement.click();
     document.body.removeChild(anchorElement);
-    setTimeout(() => URL.revokeObjectURL(blobURL), 10);;
+    setTimeout(() => URL.revokeObjectURL(blobURL), 10);
   };
 
   const handleFile = async (preview: boolean) => {
@@ -481,7 +465,7 @@ export const MediaIDField = ({ source }) => {
 
   let uploadName = mediaID;
   if (get(record, "upload_name")) {
-    uploadName = decodeURIComponent(get(record, "upload_name")?.toString());
+    uploadName = decodeURLComponent(get(record, "upload_name")?.toString());
   }
 
   let mxcURL = mediaID;
@@ -504,7 +488,10 @@ export const ReportMediaContent = ({ source }) => {
     return null;
   }
 
-  const uploadName = decodeURIComponent(get(record, "event_json.content.body")?.toString());
+  let uploadName = "";
+  if (get(record, "event_json.content.body")) {
+    uploadName = decodeURLComponent(get(record, "event_json.content.body")?.toString());
+  }
 
   return <ViewMediaButton mxcURL={mxcURL} label={mxcURL} uploadName={uploadName} mimetype={record.media_type} />;
 };

src/components/user-import/ConflictModeCard.tsx

@@ -0,0 +1,50 @@
+import { NativeSelect, Paper } from "@mui/material";
+import { CardContent, CardHeader, Container } from "@mui/material";
+import { useTranslate } from "ra-core";
+import { ChangeEventHandler } from "react";
+
+import { ImportResult, ParsedStats, Progress } from "./types";
+
+const TranslatableOption = ({ value, text }: { value: string; text: string }) => {
+  const translate = useTranslate();
+  return <option value={value}>{translate(text)}</option>;
+};
+
+const ConflictModeCard = ({
+  stats,
+  importResults,
+  onConflictModeChanged,
+  conflictMode,
+  progress,
+}: {
+  stats: ParsedStats | null;
+  importResults: ImportResult | null;
+  onConflictModeChanged: ChangeEventHandler<HTMLSelectElement>;
+  conflictMode: string;
+  progress: Progress;
+}) => {
+  const translate = useTranslate();
+
+  if (!stats || importResults) {
+    return null;
+  }
+
+  return (
+    <Container sx={{ mb: 3 }}>
+      <Paper elevation={1}>
+        <CardHeader
+          title={translate("import_users.cards.conflicts.header")}
+          sx={{ borderBottom: 1, borderColor: "divider" }}
+        />
+        <CardContent>
+          <NativeSelect onChange={onConflictModeChanged} value={conflictMode} disabled={progress !== null}>
+            <TranslatableOption value="stop" text="import_users.cards.conflicts.mode.stop" />
+            <TranslatableOption value="skip" text="import_users.cards.conflicts.mode.skip" />
+          </NativeSelect>
+        </CardContent>
+      </Paper>
+    </Container>
+  );
+};
+
+export default ConflictModeCard;

src/components/user-import/ErrorsCard.tsx

@@ -0,0 +1,36 @@
+import { Container, Paper, CardHeader, CardContent, Stack, Typography } from "@mui/material";
+import { useTranslate } from "ra-core";
+
+const ErrorsCard = ({ errors }: { errors: string[] }) => {
+  const translate = useTranslate();
+
+  if (errors.length === 0) {
+    return null;
+  }
+
+  return (
+    <Container sx={{ mb: 3 }}>
+      <Paper elevation={1}>
+        <CardHeader
+          title={translate("import_users.error.error")}
+          sx={{
+            borderBottom: 1,
+            borderColor: "error.main",
+            color: "error.main",
+          }}
+        />
+        <CardContent>
+          <Stack spacing={1}>
+            {errors.map((e, idx) => (
+              <Typography key={idx} color="error">
+                {e}
+              </Typography>
+            ))}
+          </Stack>
+        </CardContent>
+      </Paper>
+    </Container>
+  );
+};
+
+export default ErrorsCard;

src/components/user-import/ResultsCard.tsx

@@ -0,0 +1,95 @@
+import ArrowBackIcon from "@mui/icons-material/ArrowBack";
+import DownloadIcon from "@mui/icons-material/Download";
+import {
+  Alert,
+  Box,
+  CardContent,
+  CardHeader,
+  Container,
+  List,
+  ListItem,
+  ListItemText,
+  Paper,
+  Stack,
+  Typography,
+} from "@mui/material";
+import { Button, Link, useTranslate } from "react-admin";
+
+import { ImportResult } from "./types";
+
+const ResultsCard = ({
+  importResults,
+  downloadSkippedRecords,
+}: {
+  importResults: ImportResult | null;
+  downloadSkippedRecords: () => void;
+}) => {
+  const translate = useTranslate();
+
+  if (!importResults) {
+    return null;
+  }
+
+  return (
+    <Container>
+      <Paper>
+        <CardHeader
+          title={translate("import_users.cards.results.header")}
+          pb={0}
+          sx={{
+            borderBottom: 1,
+          }}
+        />
+        <CardContent>
+          <Stack spacing={2}>
+            <Typography key="total" color="text.primary">
+              {translate("import_users.cards.results.total", importResults.totalRecordCount)}
+            </Typography>
+            <Typography key="successful" color="success.main">
+              {translate("import_users.cards.results.successful", importResults.succeededRecords.length)}
+            </Typography>
+            <List dense>
+              {importResults.succeededRecords.map(record => (
+                <ListItem key={record.id}>
+                  <ListItemText primary={record.displayname} />
+                </ListItem>
+              ))}
+            </List>
+            {importResults.skippedRecords.length > 0 && (
+              <Box>
+                <Typography key="skipped" color="warning.main">
+                  {translate("import_users.cards.results.skipped", importResults.skippedRecords.length)}
+                </Typography>
+                <Button
+                  variant="outlined"
+                  startIcon={<DownloadIcon />}
+                  onClick={downloadSkippedRecords}
+                  sx={{ mt: 2 }}
+                  label={translate("import_users.cards.results.download_skipped")}
+                ></Button>
+              </Box>
+            )}
+            {importResults.erroredRecords.length > 0 && (
+              <Typography key="errored" color="error.main">
+                {translate("import_users.cards.results.skipped", importResults.erroredRecords.length)}
+              </Typography>
+            )}
+
+            {importResults.wasDryRun && (
+              <Alert severity="warning" key="simulated">
+                {translate("import_users.cards.results.simulated_only")}
+              </Alert>
+            )}
+          </Stack>
+        </CardContent>
+      </Paper>
+      <Box sx={{ mt: 2 }}>
+        <Link to="/users">
+          <Button variant="outlined" startIcon={<ArrowBackIcon />} label={translate("ra.action.back")} />
+        </Link>
+      </Box>
+    </Container>
+  );
+};
+
+export default ResultsCard;

src/components/user-import/StartImportCard.tsx

@@ -0,0 +1,50 @@
+import { Button, Checkbox, Paper, Container } from "@mui/material";
+import { CardActions, FormControlLabel } from "@mui/material";
+import { useTranslate } from "ra-core";
+import { ChangeEventHandler } from "react";
+
+import { Progress, ImportLine, ImportResult } from "./types";
+
+const StartImportCard = ({
+  csvData,
+  importResults,
+  progress,
+  dryRun,
+  onDryRunModeChanged,
+  runImport,
+}: {
+  csvData: ImportLine[];
+  importResults: ImportResult | null;
+  progress: Progress;
+  dryRun: boolean;
+  onDryRunModeChanged: ChangeEventHandler<HTMLInputElement>;
+  runImport: () => void;
+}) => {
+  const translate = useTranslate();
+  if (!csvData || csvData.length === 0 || importResults) {
+    return null;
+  }
+
+  return (
+    <Container>
+      <Paper>
+        <CardActions>
+          <FormControlLabel
+            control={<Checkbox checked={dryRun} onChange={onDryRunModeChanged} disabled={progress !== null} />}
+            label={translate("import_users.cards.startImport.simulate_only")}
+          />
+          <Button variant="contained" size="large" onClick={runImport} disabled={progress !== null}>
+            {translate("import_users.cards.startImport.run_import")}
+          </Button>
+          {progress !== null ? (
+            <div>
+              {progress.done} of {progress.limit} done
+            </div>
+          ) : null}
+        </CardActions>
+      </Paper>
+    </Container>
+  );
+};
+
+export default StartImportCard;

src/components/user-import/StatsCard.tsx

@@ -0,0 +1,100 @@
+import { Card, Paper, Stack, CardContent, CardHeader, Container, Typography } from "@mui/material";
+import { NativeSelect } from "@mui/material";
+import { FormControlLabel } from "@mui/material";
+import { Checkbox } from "@mui/material";
+import { useTranslate } from "ra-core";
+import { ChangeEventHandler } from "react";
+
+import { ImportResult, ParsedStats, Progress } from "./types";
+
+const StatsCard = ({
+  stats,
+  progress,
+  importResults,
+  useridMode,
+  passwordMode,
+  onUseridModeChanged,
+  onPasswordModeChange,
+}: {
+  stats: ParsedStats | null;
+  progress: Progress;
+  importResults: ImportResult | null;
+  useridMode: string;
+  passwordMode: boolean;
+  onUseridModeChanged: ChangeEventHandler<HTMLSelectElement>;
+  onPasswordModeChange: ChangeEventHandler<HTMLInputElement>;
+}) => {
+  const translate = useTranslate();
+
+  if (!stats) {
+    return null;
+  }
+
+  if (importResults) {
+    return null;
+  }
+
+  return (
+    <>
+      <Container sx={{ mb: 3 }}>
+        <Paper>
+          <Card>
+            <CardHeader
+              title={translate("import_users.cards.importstats.header")}
+              sx={{ borderBottom: 1, borderColor: "divider" }}
+            />
+            <CardContent>
+              <Stack spacing={1}>
+                <Typography>{translate("import_users.cards.importstats.users_total", stats.total)}</Typography>
+                <Typography>{translate("import_users.cards.importstats.guest_count", stats.is_guest)}</Typography>
+                <Typography>{translate("import_users.cards.importstats.admin_count", stats.admin)}</Typography>
+              </Stack>
+            </CardContent>
+            <CardHeader
+              title={translate("import_users.cards.ids.header")}
+              sx={{ borderBottom: 1, borderColor: "divider" }}
+            />
+            <CardContent>
+              <Stack spacing={2}>
+                <Typography>
+                  {stats.id === stats.total
+                    ? translate("import_users.cards.ids.all_ids_present")
+                    : translate("import_users.cards.ids.count_ids_present", stats.id)}
+                </Typography>
+                {stats.id > 0 && (
+                  <NativeSelect onChange={onUseridModeChanged} value={useridMode} disabled={progress !== null}>
+                    <option value={"ignore"}>{translate("import_users.cards.ids.mode.ignore")}</option>
+                    <option value={"update"}>{translate("import_users.cards.ids.mode.update")}</option>
+                  </NativeSelect>
+                )}
+              </Stack>
+            </CardContent>
+            <CardHeader
+              title={translate("import_users.cards.passwords.header")}
+              sx={{ borderBottom: 1, borderColor: "divider" }}
+            />
+            <CardContent>
+              <Stack spacing={1}>
+                <Typography>
+                  {stats.password === stats.total
+                    ? translate("import_users.cards.passwords.all_passwords_present")
+                    : translate("import_users.cards.passwords.count_passwords_present", stats.password)}
+                </Typography>
+                {stats.password > 0 && (
+                  <FormControlLabel
+                    control={
+                      <Checkbox checked={passwordMode} disabled={progress !== null} onChange={onPasswordModeChange} />
+                    }
+                    label={translate("import_users.cards.passwords.use_passwords")}
+                  />
+                )}
+              </Stack>
+            </CardContent>
+          </Card>
+        </Paper>
+      </Container>
+    </>
+  );
+};
+
+export default StatsCard;

src/components/user-import/UploadCard.tsx

@@ -0,0 +1,44 @@
+import { CardHeader, CardContent, Container, Link, Stack, Typography, Paper } from "@mui/material";
+import { useTranslate } from "ra-core";
+import { ChangeEventHandler } from "react";
+
+import { ImportResult, Progress } from "./types";
+
+const UploadCard = ({
+  importResults,
+  onFileChange,
+  progress,
+}: {
+  importResults: ImportResult | null;
+  onFileChange: ChangeEventHandler<HTMLInputElement>;
+  progress: Progress;
+}) => {
+  const translate = useTranslate();
+  if (importResults) {
+    return null;
+  }
+
+  return (
+    <Container sx={{ mb: 3 }}>
+      <Paper elevation={1}>
+        <CardHeader
+          title={translate("import_users.cards.upload.header")}
+          sx={{ borderBottom: 1, borderColor: "divider" }}
+        />
+        <CardContent>
+          <Stack spacing={2}>
+            <Typography>
+              {translate("import_users.cards.upload.explanation")}
+              <Link href="./data/example.csv" sx={{ ml: 1 }}>
+                example.csv
+              </Link>
+            </Typography>
+            <input type="file" onChange={onFileChange} disabled={progress !== null} />
+          </Stack>
+        </CardContent>
+      </Paper>
+    </Container>
+  );
+};
+
+export default UploadCard;

src/components/user-import/UserImport.tsx

@@ -0,0 +1,69 @@
+import { Stack } from "@mui/material";
+import { useTranslate } from "ra-core";
+import { Title } from "react-admin";
+
+import ConflictModeCard from "./ConflictModeCard";
+import ErrorsCard from "./ErrorsCard";
+import ResultsCard from "./ResultsCard";
+import StartImportCard from "./StartImportCard";
+import StatsCard from "./StatsCard";
+import UploadCard from "./UploadCard";
+import useImportFile from "./useImportFile";
+
+const UserImport = () => {
+  const {
+    csvData,
+    dryRun,
+    importResults,
+    progress,
+    errors,
+    stats,
+    conflictMode,
+    passwordMode,
+    useridMode,
+    onFileChange,
+    onDryRunModeChanged,
+    runImport,
+    onConflictModeChanged,
+    onPasswordModeChange,
+    onUseridModeChanged,
+    downloadSkippedRecords,
+  } = useImportFile();
+
+  const translate = useTranslate();
+
+  return (
+    <Stack spacing={3} mt={3} direction="column">
+      <Title defaultTitle={translate("import_users.title")} />
+      <UploadCard importResults={importResults} onFileChange={onFileChange} progress={progress} />
+      <ErrorsCard errors={errors} />
+      <ConflictModeCard
+        stats={stats}
+        importResults={importResults}
+        conflictMode={conflictMode}
+        onConflictModeChanged={onConflictModeChanged}
+        progress={progress}
+      />
+      <StatsCard
+        stats={stats}
+        progress={progress}
+        importResults={importResults}
+        passwordMode={passwordMode}
+        useridMode={useridMode}
+        onPasswordModeChange={onPasswordModeChange}
+        onUseridModeChanged={onUseridModeChanged}
+      />
+      <StartImportCard
+        csvData={csvData}
+        importResults={importResults}
+        progress={progress}
+        dryRun={dryRun}
+        onDryRunModeChanged={onDryRunModeChanged}
+        runImport={runImport}
+      />
+      <ResultsCard importResults={importResults} downloadSkippedRecords={downloadSkippedRecords} />
+    </Stack>
+  );
+};
+
+export default UserImport;

src/components/user-import/types.ts

@@ -0,0 +1,47 @@
+import { RaRecord } from "react-admin";
+
+export interface ImportLine {
+  id: string;
+  displayname: string;
+  user_type?: string;
+  name?: string;
+  deactivated?: boolean;
+  is_guest?: boolean;
+  admin?: boolean;
+  is_admin?: boolean;
+  password?: string;
+  avatar_url?: string;
+}
+
+export interface ParsedStats {
+  user_types: Record<string, number>;
+  is_guest: number;
+  admin: number;
+  deactivated: number;
+  password: number;
+  avatar_url: number;
+  id: number;
+  total: number;
+}
+
+export interface ChangeStats {
+  total: number;
+  id: number;
+  is_guest: number;
+  admin: number;
+  password: number;
+}
+
+export type Progress = {
+  done: number;
+  limit: number;
+} | null;
+
+export interface ImportResult {
+  skippedRecords: RaRecord[];
+  erroredRecords: RaRecord[];
+  succeededRecords: RaRecord[];
+  totalRecordCount: number;
+  changeStats: ChangeStats;
+  wasDryRun: boolean;
+}

src/components/user-import/useImportFile.tsx

@@ -0,0 +1,377 @@
+import { parse as parseCsv, unparse as unparseCsv, ParseResult } from "papaparse";
+import { ChangeEvent, useState } from "react";
+import { useTranslate, useNotify, HttpError } from "react-admin";
+
+import { ImportLine, ParsedStats, Progress, ImportResult, ChangeStats } from "./types";
+import dataProvider from "../../synapse/dataProvider";
+import { returnMXID } from "../../utils/mxid";
+import { generateRandomMXID } from "../../utils/mxid";
+import { generateRandomPassword } from "../../utils/password";
+
+const LOGGING = true;
+
+const EXPECTED_FIELDS = ["id", "displayname"].sort();
+
+const useImportFile = () => {
+  const [csvData, setCsvData] = useState<ImportLine[]>([]);
+  const [errors, setErrors] = useState<string[]>([]);
+  const [stats, setStats] = useState<ParsedStats | null>(null);
+  const [dryRun, setDryRun] = useState(true);
+
+  const [progress, setProgress] = useState<Progress>(null);
+
+  const [importResults, setImportResults] = useState<ImportResult | null>(null);
+  const [skippedRecords, setSkippedRecords] = useState<string>("");
+
+  const [conflictMode, setConflictMode] = useState<"stop" | "skip">("stop");
+  const [passwordMode, setPasswordMode] = useState(true);
+  const [useridMode, setUseridMode] = useState<"update" | "ignore">("update");
+
+  const translate = useTranslate();
+  const notify = useNotify();
+
+  const onFileChange = async (e: ChangeEvent<HTMLInputElement>) => {
+    if (progress !== null) return;
+
+    setCsvData([]);
+    setErrors([]);
+    setStats(null);
+    setImportResults(null);
+    const file = e.target.files ? e.target.files[0] : null;
+    if (!file) return;
+    /* Let's refuse some unreasonably big files instead of freezing
+     * up the browser */
+    if (file.size > 100000000) {
+      const message = translate("import_users.errors.unreasonably_big", {
+        size: (file.size / (1024 * 1024)).toFixed(2),
+      });
+      notify(message);
+      setErrors([message]);
+      return;
+    }
+    try {
+      parseCsv<ImportLine>(file, {
+        header: true,
+        skipEmptyLines: true /* especially for a final EOL in the csv file */,
+        complete: result => {
+          if (result.errors) {
+            setErrors(result.errors.map(e => e.toString()));
+          }
+          /* Papaparse is very lenient, we may be able to salvage
+           * the data in the file. */
+          verifyCsv(result);
+        },
+      });
+    } catch {
+      setErrors(["Unknown error"]);
+      return null;
+    }
+  };
+
+  const verifyCsv = ({ data, meta, errors }: ParseResult<ImportLine>) => {
+    /* First, verify the presence of required fields */
+    meta.fields = meta.fields?.map(f => f.trim().toLowerCase());
+    const missingFields = EXPECTED_FIELDS.filter(eF => !meta.fields?.find(mF => eF === mF));
+
+    if (missingFields.length > 0) {
+      setErrors([translate("import_users.error.required_field", { field: missingFields[0] })]);
+      return false;
+    }
+
+    /* Collect some stats to prevent sneaky csv files from adding admin
+       users or something.
+     */
+    const stats: ParsedStats = {
+      user_types: { default: 0 },
+      is_guest: 0,
+      admin: 0,
+      deactivated: 0,
+      password: 0,
+      avatar_url: 0,
+      id: 0,
+
+      total: data.length,
+    };
+
+    const errorMessages = errors.map(e => e.message);
+    // sanitize the data first
+    data = data.map(line => {
+      const newLine = {} as ImportLine;
+      for (const [key, value] of Object.entries(line)) {
+        newLine[key.trim().toLowerCase()] = value;
+      }
+      return newLine;
+    });
+
+    // process the data
+    data.forEach((line, idx) => {
+      if (line.user_type === undefined || line.user_type === "") {
+        stats.user_types.default++;
+      } else {
+        stats.user_types[line.user_type] += 1;
+      }
+      /* XXX correct the csv export that react-admin offers for the users
+       * resource so it gives sensible field names and doesn't duplicate
+       * id as "name"?
+       */
+      if (meta.fields?.includes("name")) {
+        delete line.name;
+      }
+      if (meta.fields?.includes("user_type")) {
+        delete line.user_type;
+      }
+      if (meta.fields?.includes("is_admin")) {
+        delete line.is_admin;
+      }
+
+      ["is_guest", "admin", "deactivated"].forEach(f => {
+        if (line[f] === "true") {
+          stats[f]++;
+          line[f] = true; // we need true booleans instead of strings
+        } else {
+          if (line[f] !== "false" && line[f] !== "") {
+            console.log("invalid value", line[f], "for field " + f + " in row " + idx);
+            errorMessages.push(
+              translate("import_users.error.invalid_value", {
+                field: f,
+                row: idx,
+              })
+            );
+          }
+          line[f] = false; // default values to false
+        }
+      });
+
+      if (line.password !== undefined && line.password !== "") {
+        stats.password++;
+      }
+
+      if (line.avatar_url !== undefined && line.avatar_url !== "") {
+        stats.avatar_url++;
+      }
+
+      if (line.id !== undefined && line.id !== "") {
+        stats.id++;
+      }
+    });
+
+    if (errorMessages.length > 0) {
+      setErrors(errorMessages);
+      return false;
+    }
+
+    setStats(stats);
+    setCsvData(data);
+
+    return true;
+  };
+
+  const onConflictModeChanged = async (e: ChangeEvent<HTMLSelectElement>) => {
+    if (progress !== null) {
+      return;
+    }
+
+    const value = e.target.value as "stop" | "skip";
+    setConflictMode(value);
+  };
+
+  const onPasswordModeChange = (e: ChangeEvent<HTMLInputElement>) => {
+    if (progress !== null) {
+      return;
+    }
+
+    setPasswordMode(e.target.checked);
+  };
+
+  const onUseridModeChanged = (e: ChangeEvent<HTMLSelectElement>) => {
+    if (progress !== null) {
+      return;
+    }
+
+    const value = e.target.value as "update" | "ignore";
+    setUseridMode(value);
+  };
+
+  const onDryRunModeChanged = (e: ChangeEvent<HTMLInputElement>) => {
+    if (progress !== null) {
+      return;
+    }
+    setDryRun(e.target.checked);
+  };
+
+  const runImport = async () => {
+    if (progress !== null) {
+      notify("import_users.errors.already_in_progress");
+      return;
+    }
+
+    const results = await doImport();
+    setImportResults(results);
+    // offer CSV download of skipped or errored records
+    // (so that the user doesn't have to filter out successful
+    // records manually when fixing stuff in the CSV)
+    setSkippedRecords(unparseCsv(results.skippedRecords));
+    if (LOGGING) console.log("Skipped records:");
+    if (LOGGING) console.log(skippedRecords);
+  };
+
+  const doImport = async (): Promise<ImportResult> => {
+    const skippedRecords: ImportLine[] = [];
+    const erroredRecords: ImportLine[] = [];
+    const succeededRecords: ImportLine[] = [];
+    const changeStats: ChangeStats = {
+      total: 0,
+      id: 0,
+      is_guest: 0,
+      admin: 0,
+      password: 0,
+    };
+    let entriesDone = 0;
+    const entriesCount = csvData.length;
+    try {
+      setProgress({ done: entriesDone, limit: entriesCount });
+      for (const entry of csvData) {
+        const userRecord = { ...entry };
+        // No need to do a bunch of cryptographic random number getting if
+        // we are using neither a generated password nor a generated user id.
+        if (useridMode === "ignore" || userRecord.id === undefined || userRecord.id === "") {
+          userRecord.id = generateRandomMXID();
+        }
+        if (passwordMode === false || entry.password === undefined || entry.password === "") {
+          userRecord.password = generateRandomPassword();
+        }
+        // we want to ensure that the ID is always full MXID, otherwise randomly-generated MXIDs will be in the full
+        // form, but the ones from the CSV will be localpart-only.
+        userRecord.id = returnMXID(userRecord.id);
+        /* TODO record update stats (especially admin no -> yes, deactivated x -> !x, ... */
+
+        /* For these modes we will consider the ID that's in the record.
+         * If the mode is "stop", we will not continue adding more records, and
+         * we will offer information on what was already added and what was
+         * skipped.
+         *
+         * If the mode is "skip", we record the record for later, but don't
+         * send it to the server.
+         *
+         * If the mode is "update", we change fields that are reasonable to
+         * update.
+         *  - If the "password mode" is "true" (i.e. "use passwords from csv"):
+         *    - if the record has a password
+         *      - send the password along with the record
+         *    - if the record has no password
+         *      - generate a new password
+         *  - If the "password mode" is "false"
+         *    - never generate a new password to update existing users with
+         */
+
+        /* We just act as if there are no IDs in the CSV, so every user will be
+         * created anew.
+         * We do a simple retry loop so that an accidental hit on an existing ID
+         * doesn't trip us up.
+         */
+        if (LOGGING) console.log("will check for existence of record " + JSON.stringify(userRecord));
+        let retries = 0;
+        const submitRecord = async (recordData: ImportLine) => {
+          try {
+            await dataProvider.getOne("users", { id: recordData.id });
+
+            if (LOGGING) console.log("already existed");
+
+            if (conflictMode === "stop") {
+              throw new Error(
+                translate("import_users.error.id_exits", {
+                  id: recordData.id,
+                })
+              );
+            }
+
+            if (conflictMode === "skip" || useridMode === "update") {
+              skippedRecords.push(recordData);
+              return;
+            }
+
+            const newRecordData = Object.assign({}, recordData, {
+              id: generateRandomMXID(),
+            });
+            retries++;
+
+            if (retries > 512) {
+              console.warn("retry loop got stuck? pathological situation?");
+              skippedRecords.push(recordData);
+              return;
+            }
+
+            await submitRecord(newRecordData);
+          } catch (e) {
+            if (!(e instanceof HttpError) || (e.status && e.status !== 404)) {
+              throw e;
+            }
+
+            if (LOGGING) console.log("OK to create record " + recordData.id + " (" + recordData.displayname + ").");
+
+            if (!dryRun) {
+              await dataProvider.create("users", { data: recordData });
+            }
+            succeededRecords.push(recordData);
+          }
+        };
+
+        await submitRecord(userRecord);
+        entriesDone++;
+        setProgress({ done: entriesDone, limit: csvData.length });
+      }
+
+      setProgress(null);
+    } catch (e) {
+      setErrors([
+        translate("import_users.error.at_entry", {
+          entry: entriesDone + 1,
+          message: e instanceof Error ? e.message : String(e),
+        }),
+      ]);
+      setProgress(null);
+    }
+
+    return {
+      skippedRecords,
+      erroredRecords,
+      succeededRecords,
+      totalRecordCount: entriesCount,
+      changeStats,
+      wasDryRun: dryRun,
+    };
+  };
+
+  const downloadSkippedRecords = () => {
+    const element = document.createElement("a");
+    console.log(skippedRecords);
+    const file = new Blob([skippedRecords], {
+      type: "text/comma-separated-values",
+    });
+    element.href = URL.createObjectURL(file);
+    element.download = "skippedRecords.csv";
+    document.body.appendChild(element); // Required for this to work in FireFox
+    element.click();
+  };
+
+  return {
+    csvData,
+    dryRun,
+    onDryRunModeChanged,
+    runImport,
+    progress,
+    importResults,
+    errors,
+    stats,
+    conflictMode,
+    passwordMode,
+    useridMode,
+    onConflictModeChanged,
+    onPasswordModeChange,
+    onUseridModeChanged,
+    onFileChange,
+    downloadSkippedRecords,
+  };
+};
+
+export default useImportFile;

src/i18n/de.ts

@@ -12,9 +12,14 @@ const fixedGermanMessages = {
       clear_filters: "Alle Filter entfernen",
       add_filter: "Filter hinzufügen",
     },
+    auth: {
+      ...formalGermanMessages.ra.auth,
+      email: "E-Mail",
+    },
     action: {
       ...formalGermanMessages.ra.action,
       update_application: "Anwendung aktualisieren",
+      select_all_button: "Alle auswählen",
     },
     page: {
       ...formalGermanMessages.ra.page,
@@ -24,13 +29,15 @@ const fixedGermanMessages = {
     },
     message: {
       ...formalGermanMessages.ra.message,
-      access_denied:
-        "Sie haben nicht die erforderlichen Berechtigungen um auf diese Seite zuzugreifen.",
+      access_denied: "Sie haben nicht die erforderlichen Berechtigungen um auf diese Seite zuzugreifen.",
       authentication_error:
         "Der Authentifizierungsserver hat einen Fehler zurückgegeben und Ihre Anmeldedaten konnten nicht überprüft werden.",
+      select_all_limit_reached:
+        "Es gibt zu viele Elemente, um sie alle auszuwählen. Es wurden nur die ersten %{max} Elemente ausgewählt.",
+      placeholder_data_warning: "Netzwerkproblem: Datenaktualisierung fehlgeschlagen.",
     },
   },
-}
+};
 
 const de: SynapseTranslationMessages = {
   ...fixedGermanMessages,
@@ -48,7 +55,8 @@ const de: SynapseTranslationMessages = {
       access_token: "Zugriffstoken",
       logout_acces_token_dialog: {
         title: "Sie verwenden ein bestehendes Matrix-Zugriffstoken.",
-        content: "Möchten Sie diese Sitzung (die anderswo, z.B. in einem Matrix-Client, verwendet werden könnte) beenden oder sich nur vom Admin-Panel abmelden?",
+        content:
+          "Möchten Sie diese Sitzung (die anderswo, z.B. in einem Matrix-Client, verwendet werden könnte) beenden oder sich nur vom Admin-Panel abmelden?",
         confirm: "Sitzung beenden",
         cancel: "Nur vom Admin-Panel abmelden",
       },
@@ -84,7 +92,7 @@ const de: SynapseTranslationMessages = {
     goToPdf: "Gehe zum PDF",
     cards: {
       importstats: {
-        header: "Benutzer importieren",
+        header: "Geparste Benutzer für den Import",
         users_total: "%{smart_count} Benutzer in der CSV Datei |||| %{smart_count} Benutzer in der CSV Datei",
         guest_count: "%{smart_count} Gast |||| %{smart_count} Gäste",
         admin_count: "%{smart_count} Server Administrator |||| %{smart_count} Server Administratoren",
@@ -196,11 +204,16 @@ const de: SynapseTranslationMessages = {
       },
       helper: {
         password: "Durch die Änderung des Passworts wird der Benutzer von allen Sitzungen abgemeldet.",
+        password_required_for_reactivation: "Sie müssen ein Passwort angeben, um ein Konto wieder zu aktivieren.",
         create_password: "Generiere ein starkes und sicheres Passwort mit dem Button unten.",
         deactivate: "Sie müssen ein Passwort angeben, um ein Konto wieder zu aktivieren.",
-        suspend: "Ein gesperrter Benutzer kann sich nicht mehr anmelden und wird in den schreibgeschützten Modus versetzt.",
+        suspend:
+          "Ein gesperrter Benutzer kann sich nicht mehr anmelden und wird in den schreibgeschützten Modus versetzt.",
         erase: "DSGVO konformes Löschen der Benutzerdaten.",
-        erase_text: "Das bedeutet, dass die von dem/den Benutzer(n) gesendeten Nachrichten für alle, die zum Zeitpunkt des Sendens im Raum waren, sichtbar bleiben, aber für Benutzer, die dem Raum später beitreten, nicht sichtbar sind.",
+        admin: "Ein Serveradministrator hat volle Kontrolle über den Server und seine Benutzer.",
+        lock: "Verhindert, dass der Benutzer den Server nutzen kann. Dies ist eine nicht-destruktive Aktion, die rückgängig gemacht werden kann.",
+        erase_text:
+          "Das bedeutet, dass die von dem/den Benutzer(n) gesendeten Nachrichten für alle, die zum Zeitpunkt des Sendens im Raum waren, sichtbar bleiben, aber für Benutzer, die dem Raum später beitreten, nicht sichtbar sind.",
         erase_admin_error: "Das Löschen des eigenen Benutzers ist nicht erlaubt.",
         modify_managed_user_error: "Das Ändern eines vom System verwalteten Benutzers ist nicht zulässig.",
         username_available: "Benutzername verfügbar",
@@ -220,7 +233,8 @@ const de: SynapseTranslationMessages = {
         redact_events: "Schwärzen aller vom Benutzer gesendeten Ereignisse (-s)",
         generate_password: "Passwort generieren",
         overwrite_title: "Warnung!",
-        overwrite_content: "Dieser Benutzername ist bereits vergeben. Sind Sie sicher, dass Sie den vorhandenen Benutzer überschreiben möchten?",
+        overwrite_content:
+          "Dieser Benutzername ist bereits vergeben. Sind Sie sicher, dass Sie den vorhandenen Benutzer überschreiben möchten?",
         overwrite_cancel: "Abbrechen",
         overwrite_confirm: "Überschreiben",
       },
@@ -234,7 +248,7 @@ const de: SynapseTranslationMessages = {
         title: "Kontodaten",
         global: "Globale",
         rooms: "Räume",
-      }
+      },
     },
     rooms: {
       name: "Raum |||| Räume",
@@ -297,10 +311,11 @@ const de: SynapseTranslationMessages = {
           assign_admin: "Raumadministrator zuweisen",
           title: "Raumadministrator zu %{roomName} zuweisen",
           confirm: "Raumadministrator zuweisen",
-          content: "Geben Sie die vollständige MXID des Benutzers an, der als Administrator gesetzt werden soll.\nWarnung: Damit dies funktioniert, muss der Raum mindestens ein lokales Mitglied als Administrator haben.",
+          content:
+            "Geben Sie die vollständige MXID des Benutzers an, der als Administrator gesetzt werden soll.\nWarnung: Damit dies funktioniert, muss der Raum mindestens ein lokales Mitglied als Administrator haben.",
           success: "Der/die Benutzer wurde/n als Raumadministrator gesetzt.",
           failure: "Der/die Benutzer konnte/n nicht als Raumadministrator gesetzt werden. %{errMsg}",
-        }
+        },
       },
     },
     reports: {
@@ -461,8 +476,8 @@ const de: SynapseTranslationMessages = {
         info: "Dies ist eine Liste der Medien, die in den Raum hochgeladen wurden. Es ist nicht möglich, Medien zu löschen, die in externen Medien-Repositories hochgeladen wurden.",
       },
       action: {
-        error: "%{errcode} (%{errstatus}) %{error}"
-      }
+        error: "%{errcode} (%{errstatus}) %{error}",
+      },
     },
     room_directory: {
       name: "Raumverzeichnis",

src/i18n/en.ts

@@ -1,3 +1,13 @@
+// SPDX-FileCopyrightText: 2020 Michael Albert
+// SPDX-FileCopyrightText: 2020 - 2024 Manuel Stahl
+// SPDX-FileCopyrightText: 2021 Dirk Klimpel
+// SPDX-FileCopyrightText: 2023 Przemysław Romanik
+// SPDX-FileCopyrightText: 2024 Alexander Tumin
+// SPDX-FileCopyrightText: 2024 - 2025 Borislav Pantaleev
+// SPDX-FileCopyrightText: 2024 - 2025 Nikita Chernyi
+//
+// SPDX-License-Identifier: Apache-2.0
+
 import englishMessages from "ra-language-english";
 
 import { SynapseTranslationMessages } from ".";
@@ -18,7 +28,8 @@ const en: SynapseTranslationMessages = {
       access_token: "Access token",
       logout_acces_token_dialog: {
         title: "You are using an existing Matrix access token.",
-        content: "Do you want to destroy this session (that could be used elsewhere, e.g. in a Matrix client) or just logout from the admin panel?",
+        content:
+          "Do you want to destroy this session (that could be used elsewhere, e.g. in a Matrix client) or just logout from the admin panel?",
         confirm: "Destroy session",
         cancel: "Just logout from admin panel",
       },
@@ -40,7 +51,7 @@ const en: SynapseTranslationMessages = {
         detail: "Details",
         permission: "Permissions",
         media: "Media",
-      }
+      },
     },
     reports: { tabs: { basic: "Basic", detail: "Details" } },
   },
@@ -58,7 +69,7 @@ const en: SynapseTranslationMessages = {
     goToPdf: "Go to PDF",
     cards: {
       importstats: {
-        header: "Import users",
+        header: "Parsed users for import",
         users_total: "%{smart_count} user in CSV file |||| %{smart_count} users in CSV file",
         guest_count: "%{smart_count} guest |||| %{smart_count} guests",
         admin_count: "%{smart_count} admin |||| %{smart_count} admins",
@@ -170,11 +181,15 @@ const en: SynapseTranslationMessages = {
       },
       helper: {
         password: "Changing password will log user out of all sessions.",
+        password_required_for_reactivation: "You must provide a password to re-activate an account.",
         create_password: "Generate a strong and secure password using the button below.",
+        lock: "Prevent the user from usefully using their account. This is a non-destructive action that can be reversed.",
         deactivate: "You must provide a password to re-activate an account.",
         suspend: "Suspending user means they are put into a read-only mode.",
-        erase: "Mark the user as GDPR-erased",
-        erase_text: "This means messages sent by the user(-s) will still be visible by anyone who was in the room when these messages were sent, but hidden from users joining the room afterward.",
+        erase: "In addition to deactivating the user, mark the user as GDPR-erased.",
+        admin: "A server administrator has full control over the server and its users.",
+        erase_text:
+          "This means messages sent by the user(-s) will still be visible by anyone who was in the room when these messages were sent, but hidden from users joining the room afterward.",
         erase_admin_error: "Deleting own user is not allowed.",
         modify_managed_user_error: "Modifying a system-managed user is not allowed.",
         username_available: "Username is available",
@@ -208,7 +223,7 @@ const en: SynapseTranslationMessages = {
         title: "Account Data",
         global: "Global",
         rooms: "Rooms",
-      }
+      },
     },
     rooms: {
       name: "Room |||| Rooms",
@@ -271,10 +286,11 @@ const en: SynapseTranslationMessages = {
           assign_admin: "Assign admin",
           title: "Assign a room admin to %{roomName}",
           confirm: "Make admin",
-          content: "Put the full MXID of the user which will be set as admin.\nWarning: for this to work, the room needs to have at least one local member as admin.",
+          content:
+            "Put the full MXID of the user which will be set as admin.\nWarning: for this to work, the room needs to have at least one local member as admin.",
           success: "The user has been set as room admin.",
           failure: "The user could not be set as room admin. %{errMsg}",
-        }
+        },
       },
     },
     reports: {
@@ -479,5 +495,23 @@ const en: SynapseTranslationMessages = {
       helper: { length: "Length of the token if no token is given." },
     },
   },
+  scheduled_commands: {
+    action: {
+      create_success: "Scheduled command created successfully",
+      update_success: "Scheduled command updated successfully",
+      update_failure: "An error has occurred",
+      delete_success: "Scheduled command deleted successfully",
+      delete_failure: "An error has occurred",
+    },
+  },
+  recurring_commands: {
+    action: {
+      create_success: "Recurring command created successfully",
+      update_success: "Recurring command updated successfully",
+      update_failure: "An error has occurred",
+      delete_success: "Recurring command deleted successfully",
+      delete_failure: "An error has occurred",
+    },
+  },
 };
 export default en;

src/i18n/fa.ts

@@ -17,7 +17,8 @@ const fa: SynapseTranslationMessages = {
       access_token: "توکن دسترسی",
       logout_acces_token_dialog: {
         title: "شما در حال استفاده از یک نشانه دسترسی ماتریکس موجود هستید.",
-        content: "آیا می‌خواهید این جلسه (که می‌تواند در جای دیگر، مانند یک کلاینت ماتریکس استفاده شود) را نابود کنید یا فقط از پنل مدیریت خارج شوید؟",
+        content:
+          "آیا می‌خواهید این جلسه (که می‌تواند در جای دیگر، مانند یک کلاینت ماتریکس استفاده شود) را نابود کنید یا فقط از پنل مدیریت خارج شوید؟",
         confirm: "نابودی جلسه",
         cancel: "فقط خروج از پنل مدیریت",
       },
@@ -51,7 +52,7 @@ const fa: SynapseTranslationMessages = {
     goToPdf: "رفتن به PDF",
     cards: {
       importstats: {
-        header: "وارد کردن کاربران",
+        header: "کاربران پردازش شده برای وارد کردن",
         users_total: "%{smart_count} user in CSV file |||| %{smart_count} users in CSV file",
         guest_count: "%{smart_count} guest |||| %{smart_count} guests",
         admin_count: "%{smart_count} admin |||| %{smart_count} admins",
@@ -161,12 +162,16 @@ const fa: SynapseTranslationMessages = {
         user_type: "نوع کاربر",
       },
       helper: {
+        password_required_for_reactivation: "برای فعالسازی مجدد حساب باید رمز عبور وارد کنید.",
+        admin: "مدیر سرور دارای کنترل کامل بر روی سرور و کاربران آن است.",
+        lock: "ممنوعیت استفاده از سرور توسط کاربر. این یک عملیات غیر مخرب است که می تواند برگردانده شود.",
         password: "با تغییر رمز عبور کاربر از تمام دستگاه ها خارج می شود.",
         create_password: "رمز عبور قوی و امنی را با استفاده از دکمه زیر ایجاد کنید.",
         deactivate: "برای فعالسازی مجدد حساب باید رمز عبور وارد کنید.",
         suspend: "کاربران معلق نمی توانند وارد شوند و پیام های آنها به دیگران نمایش داده نمی شود.",
         erase: "کاربر را به عنوان GDPR پاک شده علامت گذاری کنید",
-        erase_text: "وهذا يعني أن الرسائل المرسلة من قبل المستخدم (المستخدمين) ستظل مرئية من قبل أي شخص كان في الغرفة عند إرسال هذه الرسائل، ولكنها مخفية عن المستخدمين الذين ينضمون إلى الغرفة بعد ذلك.",
+        erase_text:
+          "وهذا يعني أن الرسائل المرسلة من قبل المستخدم (المستخدمين) ستظل مرئية من قبل أي شخص كان في الغرفة عند إرسال هذه الرسائل، ولكنها مخفية عن المستخدمين الذين ينضمون إلى الغرفة بعد ذلك.",
         erase_admin_error: "حذف المستخدم الخاص غير مسموح به.",
         modify_managed_user_error: "لا يُسمح بتغيير المستخدم الذي يديره النظام.",
         username_available: "نام کاربری موجود",
@@ -186,7 +191,8 @@ const fa: SynapseTranslationMessages = {
         redact_events: "تنقيح جميع الأحداث المرسلة من قبل المستخدم (-s)",
         generate_password: "توليد رمز عبور",
         overwrite_title: "هشدار!",
-        overwrite_content: "این نام کاربری قبلا استفاده شده است. آیا مطمئن هستید که می خواهید کاربر موجود را بازنویسی کنید؟",
+        overwrite_content:
+          "این نام کاربری قبلا استفاده شده است. آیا مطمئن هستید که می خواهید کاربر موجود را بازنویسی کنید؟",
         overwrite_cancel: "انصراف",
         overwrite_confirm: "بازنویسی",
       },
@@ -200,7 +206,7 @@ const fa: SynapseTranslationMessages = {
         title: "داده های کاربر",
         global: "عمومی",
         rooms: "اتاق ها",
-      }
+      },
     },
     rooms: {
       name: "اتاق |||| اتاق ها",
@@ -263,10 +269,11 @@ const fa: SynapseTranslationMessages = {
           assign_admin: "مدیر انتخاب کنید",
           title: "مدیر اتاق %{roomName} را انتخاب کنید",
           confirm: "مدیر انتخاب کنید",
-          content: "کامل MXID کاربری را وارد کنید که به عنوان مدیر تنظیم شود.\nهشدار: برای این کار، اتاق باید حداقل یک اعضای محلی به عنوان مدیر داشته باشد.",
+          content:
+            "کامل MXID کاربری را وارد کنید که به عنوان مدیر تنظیم شود.\nهشدار: برای این کار، اتاق باید حداقل یک اعضای محلی به عنوان مدیر داشته باشد.",
           success: "کاربر به عنوان مدیر اتاق تنظیم شد.",
           failure: "کاربر به عنوان مدیر اتاق تنظیم نشد. %{errMsg}",
-        }
+        },
       },
     },
     reports: {
@@ -413,8 +420,8 @@ const fa: SynapseTranslationMessages = {
         info: "این یک لیست از رسانه ها است که در اتاق بارگذاری شده است. نمی توان رسانه ها را حذف کرد که در اتاق های خارجی بارگذاری شده اند.",
       },
       action: {
-        error: "%{errcode} (%{errstatus}) %{error}"
-      }
+        error: "%{errcode} (%{errstatus}) %{error}",
+      },
     },
     room_directory: {
       name: "راهنمای اتاق",

src/i18n/fr.ts

@@ -17,14 +17,20 @@ const fr: SynapseTranslationMessages = {
       access_token: "Jeton d'accès",
       logout_acces_token_dialog: {
         title: "Vous utilisez un jeton d'accès Matrix existant.",
-        content: "Voulez-vous détruire cette session (qui pourrait être utilisée ailleurs, par exemple dans un client Matrix) ou simplement vous déconnecter du panneau d'administration?",
+        content:
+          "Voulez-vous détruire cette session (qui pourrait être utilisée ailleurs, par exemple dans un client Matrix) ou simplement vous déconnecter du panneau d'administration?",
         confirm: "Détruire la session",
         cancel: "Se déconnecter simplement du panneau d'administration",
       },
     },
     users: {
       invalid_user_id: "Partie locale d'un identifiant utilisateur Matrix sans le nom du serveur d’accueil.",
-      tabs: { sso: "Authentification unique", experimental: "Expérimental", limits: "Limites", account_data: "Données du compte" },
+      tabs: {
+        sso: "Authentification unique",
+        experimental: "Expérimental",
+        limits: "Limites",
+        account_data: "Données du compte",
+      },
     },
     rooms: {
       tabs: {
@@ -52,7 +58,7 @@ const fr: SynapseTranslationMessages = {
     goToPdf: "Voir le PDF",
     cards: {
       importstats: {
-        header: "Importer des utilisateurs",
+        header: "Utilisateurs analysés pour l'import",
         users_total:
           "%{smart_count} utilisateur dans le fichier CSV |||| %{smart_count} utilisateurs dans le fichier CSV",
         guest_count: "%{smart_count} visiteur |||| %{smart_count} visiteurs",
@@ -164,11 +170,15 @@ const fr: SynapseTranslationMessages = {
       },
       helper: {
         password: "Changer le mot de passe déconnectera l'utilisateur de toutes les sessions.",
+        password_required_for_reactivation: "Vous devez fournir un mot de passe pour réactiver le compte.",
         create_password: "Générer un mot de passe fort et sécurisé en utilisant le bouton ci-dessous.",
         deactivate: "Vous devrez fournir un mot de passe pour réactiver le compte.",
         suspend: "L'utilisateur sera suspendu jusqu'à ce que vous le réactiviez.",
         erase: "Marquer l'utilisateur comme effacé conformément au RGPD",
-        erase_text: "Cela signifie que les messages envoyés par le(s) utilisateur(s) seront toujours visibles par toute personne qui se trouvait dans la salle au moment où ces messages ont été envoyés, mais qu'ils seront cachés aux utilisateurs qui rejoindront la salle par la suite.",
+        admin: "Un administrateur de serveur a un contrôle total sur le serveur et ses utilisateurs.",
+        lock: "Empêche l'utilisateur d'utiliser le serveur. C'est une action non destructive qui peut être annulée.",
+        erase_text:
+          "Cela signifie que les messages envoyés par le(s) utilisateur(s) seront toujours visibles par toute personne qui se trouvait dans la salle au moment où ces messages ont été envoyés, mais qu'ils seront cachés aux utilisateurs qui rejoindront la salle par la suite.",
         erase_admin_error: "La suppression de son propre utilisateur n'est pas autorisée.",
         modify_managed_user_error: "La modification d'un utilisateur géré par le système n'est pas autorisée.",
         username_available: "Nom d'utilisateur disponible",
@@ -188,7 +198,8 @@ const fr: SynapseTranslationMessages = {
         redact_events: "Expurger tous les événements envoyés par l'utilisateur(-s)",
         generate_password: "Générer un mot de passe",
         overwrite_title: "Attention !",
-        overwrite_content: "Ce nom d'utilisateur est déjà pris. Êtes-vous sûr de vouloir écraser l'utilisateur existant ?",
+        overwrite_content:
+          "Ce nom d'utilisateur est déjà pris. Êtes-vous sûr de vouloir écraser l'utilisateur existant ?",
         overwrite_cancel: "Annuler",
         overwrite_confirm: "Écraser",
       },
@@ -202,7 +213,7 @@ const fr: SynapseTranslationMessages = {
         title: "Données du compte",
         global: "Globales",
         rooms: "Salons",
-      }
+      },
     },
     rooms: {
       name: "Salon |||| Salons",
@@ -265,10 +276,11 @@ const fr: SynapseTranslationMessages = {
           assign_admin: "Assigner un administrateur",
           title: "Assigner un administrateur au salon %{roomName}",
           confirm: "Assigner un administrateur",
-          content: "Entrez la MXID complète de l'utilisateur qui sera désigné comme administrateur.\nAttention : pour que cela fonctionne, la salle doit avoir au moins un membre local en tant qu'administrateur.",
+          content:
+            "Entrez la MXID complète de l'utilisateur qui sera désigné comme administrateur.\nAttention : pour que cela fonctionne, la salle doit avoir au moins un membre local en tant qu'administrateur.",
           success: "L'utilisateur a été désigné comme administrateur de la salle.",
           failure: "L'utilisateur n'a pas pu être désigné comme administrateur de la salle. %{errMsg}",
-        }
+        },
       },
     },
     reports: {
@@ -415,8 +427,8 @@ const fr: SynapseTranslationMessages = {
         info: "Cette liste contient les médias qui ont été téléchargés dans le salon. Il n'est pas possible de supprimer les médias qui ont été téléversés dans des dépôts de médias externes.",
       },
       action: {
-        error: "%{errcode} (%{errstatus}) %{error}"
-      }
+        error: "%{errcode} (%{errstatus}) %{error}",
+      },
     },
     room_directory: {
       name: "Répertoire des salons",

src/i18n/index.d.ts

@@ -22,7 +22,7 @@ interface SynapseTranslationMessages extends TranslationMessages {
     };
     users: {
       invalid_user_id: string;
-      tabs: { sso: string; experimental: string; limits: string; account_data: string; };
+      tabs: { sso: string; experimental: string; limits: string; account_data: string };
     };
     rooms: {
       details?: string; // TODO: fa, fr, it, zh
@@ -161,9 +161,12 @@ interface SynapseTranslationMessages extends TranslationMessages {
       };
       helper: {
         password: string;
+        password_required_for_reactivation: string;
         create_password: string;
+        lock: string;
         deactivate: string;
         suspend: string;
+        admin: string;
         erase: string;
         erase_text: string;
         erase_admin_error: string;
@@ -188,7 +191,7 @@ interface SynapseTranslationMessages extends TranslationMessages {
         support: string;
         regular: string;
         system_managed: string;
-      }
+      };
       limits: {
         messages_per_second: string;
         messages_per_second_text: string;
@@ -199,7 +202,7 @@ interface SynapseTranslationMessages extends TranslationMessages {
         title: string;
         global: string;
         rooms: string;
-      }
+      };
     };
     rooms: {
       name: string;
@@ -252,7 +255,7 @@ interface SynapseTranslationMessages extends TranslationMessages {
           content: string;
           fields: {
             block: string;
-          },
+          };
           success: string;
           failure: string;
         };
@@ -473,4 +476,22 @@ interface SynapseTranslationMessages extends TranslationMessages {
       };
     };
   };
+  scheduled_commands?: {
+    action: {
+      create_success: string;
+      update_success: string;
+      update_failure: string;
+      delete_success: string;
+      delete_failure: string;
+    };
+  };
+  recurring_commands?: {
+    action: {
+      create_success: string;
+      update_success: string;
+      update_failure: string;
+      delete_success: string;
+      delete_failure: string;
+    };
+  };
 }

src/i18n/it.ts

@@ -17,7 +17,8 @@ const it: SynapseTranslationMessages = {
       access_token: "Token di accesso",
       logout_acces_token_dialog: {
         title: "Stai utilizzando un token di accesso Matrix esistente.",
-        content: "Vuoi distruggere questa sessione (che potrebbe essere utilizzata altrove, ad esempio in un client Matrix) o semplicemente disconnetterti dal pannello di amministrazione?",
+        content:
+          "Vuoi distruggere questa sessione (che potrebbe essere utilizzata altrove, ad esempio in un client Matrix) o semplicemente disconnetterti dal pannello di amministrazione?",
         confirm: "Distruggi sessione",
         cancel: "Disconnetti solo dal pannello di amministrazione",
       },
@@ -51,7 +52,7 @@ const it: SynapseTranslationMessages = {
     goToPdf: "Vai al PDF",
     cards: {
       importstats: {
-        header: "Importa utenti",
+        header: "Utenti analizzati per l'importazione",
         users_total: "%{smart_count} utente nel file CSV |||| %{smart_count} utenti nel file CSV",
         guest_count: "%{smart_count} ospite |||| %{smart_count} ospiti",
         admin_count: "%{smart_count} amministratore |||| %{smart_count} amministratori",
@@ -162,11 +163,15 @@ const it: SynapseTranslationMessages = {
       },
       helper: {
         password: "Cambiando la password l'utente verrà disconnesso da tutte le sessioni attive.",
+        password_required_for_reactivation: "Devi fornire una password per riattivare l'account.",
         create_password: "Genera una password forte e sicura utilizzando il pulsante sottostante.",
         deactivate: "Devi fornire una password per riattivare l'account.",
         suspend: "Sospendi l'utente",
         erase: "Constrassegna l'utente come cancellato dal GDPR",
-        erase_text: "Ciò significa che i messaggi inviati dall'utente (o dagli utenti) saranno ancora visibili da chiunque si trovasse nella stanza al momento dell'invio, ma saranno nascosti agli utenti che si uniranno alla stanza in seguito.",
+        admin: "Un amministratore del server ha controllo totale sul server e sui suoi utenti.",
+        lock: "Impedisce all'utente di utilizzare il server. Questa è un'azione non distruttiva che può essere annullata.",
+        erase_text:
+          "Ciò significa che i messaggi inviati dall'utente (o dagli utenti) saranno ancora visibili da chiunque si trovasse nella stanza al momento dell'invio, ma saranno nascosti agli utenti che si uniranno alla stanza in seguito.",
         erase_admin_error: "Non è consentito eliminare il proprio utente.",
         modify_managed_user_error: "La modifica di un utente gestito dal sistema non è consentita.",
         username_available: "Nome utente disponibile",
@@ -186,7 +191,8 @@ const it: SynapseTranslationMessages = {
         redact_events: "Ridurre tutti gli eventi inviati dall'utente(-s)",
         generate_password: "Genera password",
         overwrite_title: "Attenzione!",
-        overwrite_content: "Questo nome utente è già stato utilizzato. Sei sicuro di voler sovrascrivere l'utente esistente?",
+        overwrite_content:
+          "Questo nome utente è già stato utilizzato. Sei sicuro di voler sovrascrivere l'utente esistente?",
         overwrite_cancel: "Annulla",
         overwrite_confirm: "Sovrascrivi",
       },
@@ -200,7 +206,7 @@ const it: SynapseTranslationMessages = {
         title: "Dati del profilo",
         global: "Globale",
         rooms: "Stanza",
-      }
+      },
     },
     rooms: {
       name: "Stanza |||| Stanze",
@@ -258,10 +264,11 @@ const it: SynapseTranslationMessages = {
           assign_admin: "Assegna un amministratore",
           title: "Assegna un amministratore alla stanza %{roomName}",
           confirm: "Assegna un amministratore",
-        content: "Inserisci la MXID completa dell'utente che sarà designato come amministratore.\nAttenzione: per questo funzionare, la stanza deve avere almeno un membro locale come amministratore.",
+          content:
+            "Inserisci la MXID completa dell'utente che sarà designato come amministratore.\nAttenzione: per questo funzionare, la stanza deve avere almeno un membro locale come amministratore.",
           success: "L'utente è stato designato come amministratore della stanza.",
           failure: "L'utente non può essere designato come amministratore della stanza. %{errMsg}",
-      }
+        },
       },
     },
     reports: {
@@ -408,8 +415,8 @@ const it: SynapseTranslationMessages = {
         info: "Questo è un elenco dei media caricati nella stanza. Non è possibile eliminare i media caricati su repository esterni.",
       },
       action: {
-      error: "%{errcode} (%{errstatus}) %{error}"
-    }
+        error: "%{errcode} (%{errstatus}) %{error}",
+      },
     },
     room_directory: {
       name: "Elenco delle stanze",

src/i18n/ja.ts

@@ -0,0 +1,519 @@
+// SPDX-FileCopyrightText: 2020 Michael Albert
+// SPDX-FileCopyrightText: 2020 - 2024 Manuel Stahl
+// SPDX-FileCopyrightText: 2021 Dirk Klimpel
+// SPDX-FileCopyrightText: 2023 Przemysław Romanik
+// SPDX-FileCopyrightText: 2024 Alexander Tumin
+// SPDX-FileCopyrightText: 2024 - 2025 Borislav Pantaleev
+// SPDX-FileCopyrightText: 2024 - 2025 Nikita Chernyi
+// SPDX-FileCopyrightText: 2025 Suguru Hirahara
+//
+// SPDX-License-Identifier: Apache-2.0
+
+import japaneseMessages from "@bicstone/ra-language-japanese";
+
+import { SynapseTranslationMessages } from ".";
+
+const ja: SynapseTranslationMessages = {
+  ...japaneseMessages,
+  synapseadmin: {
+    auth: {
+      base_url: "ホームサーバーのURL",
+      welcome: "Synapse Adminにようこそ",
+      server_version: "Synapseのバージョン",
+      supports_specs: "次のMatrixのスペックをサポートしています",
+      username_error: "有効なユーザーIDを入力してください。形式は「@user:domain」です。",
+      protocol_error: "URLの先頭には「http://」または「https://」を置いてください",
+      url_error: "正しいMatrixのサーバーのURLではありません",
+      sso_sign_in: "シングルサインオン",
+      credentials: "認証情報",
+      access_token: "アクセストークン",
+      logout_acces_token_dialog: {
+        title: "既存のMatrixアクセストークンが使われています。",
+        content:
+          "このセッションを破棄しますか？　このセッションは、Matrixのクライアントなどで使われている可能性があります。または、管理パネルからログアウトしますか？",
+        confirm: "破棄する",
+        cancel: "管理パネルからログアウト",
+      },
+    },
+    users: {
+      invalid_user_id: "ホームサーバーが指定されていないMatrixのユーザーIDです。",
+      tabs: {
+        sso: "シングルサインオン",
+        experimental: "実験的",
+        limits: "レート制限",
+        account_data: "アカウントのデータ",
+      },
+    },
+    rooms: {
+      details: "ルームの詳細",
+      tabs: {
+        basic: "基本情報",
+        members: "メンバー",
+        detail: "詳細",
+        permission: "権限",
+        media: "メディア",
+      },
+    },
+    reports: { tabs: { basic: "基本情報", detail: "詳細" } },
+  },
+  import_users: {
+    error: {
+      at_entry: "エントリー %{entry}: %{message}",
+      error: "エラー",
+      required_field: "必須のフィールド「%{field}」がありません",
+      invalid_value:
+        "%{row}行目に不正な値があります。「%{field}」のフィールドには「true」または「false」を指定してください",
+      unreasonably_big: "ファイルは%{size}メガバイトで大きすぎるため、読み込みを行いませんでした",
+      already_in_progress: "インポートを実行しています",
+      id_exits: "ID %{id} は既に存在しています",
+    },
+    title: "CSVでユーザーをインポート",
+    goToPdf: "Go to PDF",
+    cards: {
+      importstats: {
+        header: "インポートするユーザー",
+        users_total: "CSVファイルの%{smart_count}人のユーザー",
+        guest_count: "%{smart_count}人のゲスト",
+        admin_count: "%{smart_count}人の管理者",
+      },
+      conflicts: {
+        header: "競合を処理する方針",
+        mode: {
+          stop: "競合の発生時に停止",
+          skip: "エラーを表示して競合をスキップ",
+        },
+      },
+      ids: {
+        header: "ID",
+        all_ids_present: "全てのエントリーにIDsがあります",
+        count_ids_present: "%{smart_count}個のエントリーにIDがあります",
+        mode: {
+          ignore: "CSVファイルのIDを無視し、新しいIDを作成",
+          update: "既存のレコードを更新",
+        },
+      },
+      passwords: {
+        header: "パスワード",
+        all_passwords_present: "全てのエントリーにパスワードがあります",
+        count_passwords_present: "%{smart_count}個のエントリーにパスワードがあります",
+        use_passwords: "CSVファイルのパスワードを使用",
+      },
+      upload: {
+        header: "CSVファイルを送信",
+        explanation:
+          "作成またはアップデートするユーザーをコンマで区切って入力したファイルをアップロードできます。ファイルには「id」と「displayname」のフィールドを含めてください。参照用のファイルは以下からダウンロードできます。",
+      },
+      startImport: {
+        simulate_only: "シミュレーション",
+        run_import: "インポート",
+      },
+      results: {
+        header: "インポートの結果",
+        total: "合計%{smart_count}個のエントリー",
+        successful: "%{smart_count}個のエントリーをインポートしました",
+        skipped: "%{smart_count}個のエントリーをスキップしました",
+        download_skipped: "スキップしたエントリーをダウンロード",
+        with_error: "%{smart_count}個のエントリーでエラーが発生しました",
+        simulated_only: "シミュレーションのみ実行",
+      },
+    },
+  },
+  delete_media: {
+    name: "メディアファイル",
+    fields: {
+      before_ts: "最終アクセス日時がこれより以前のもの",
+      size_gt: "サイズがこれより大きいもの（バイト）",
+      keep_profiles: "プロフィールの画像は削除しない",
+    },
+    action: {
+      send: "メディアファイルを削除",
+      send_success: "リクエストを送信しました。",
+      send_failure: "エラーが発生しました。",
+    },
+    helper: {
+      send: "このAPIを使うとサーバーからローカルメディアファイルを削除できます。削除できるファイルは、ローカルのサムネイルファイルと、ダウンロードしたメディアファイルのコピーも含みます。外部のメディアリポジトリーにアップロードされたメディアファイルは削除できません。",
+    },
+  },
+  purge_remote_media: {
+    name: "リモートのメディアファイル",
+    fields: {
+      before_ts: "最終アクセス日時がこれより以前のもの",
+    },
+    action: {
+      send: "リモートのメディアファイルを削除",
+      send_success: "削除のリクエストを送信しました。",
+      send_failure: "エラーが発生しました。",
+    },
+    helper: {
+      send: "このAPIを使うとサーバーからリモートメディアファイルのキャッシュを削除できます。削除できるファイルは、ローカルのサムネイルファイルと、ダウンロードしたメディアファイルのコピーも含みます。サーバーのメディアリポジトリーにアップロードされたメディアファイルは削除できません。",
+    },
+  },
+  resources: {
+    users: {
+      name: "ユーザー",
+      email: "メールアドレス",
+      msisdn: "電話番号",
+      threepid: "メールアドレスまたは電話番号",
+      fields: {
+        avatar: "アバター",
+        id: "ユーザーID",
+        name: "名前",
+        is_guest: "ゲスト",
+        admin: "サーバーの管理者",
+        locked: "ロック",
+        suspended: "停止",
+        deactivated: "無効化",
+        erased: "消去",
+        guests: "ゲストを表示",
+        show_deactivated: "無効化されたユーザーを表示",
+        show_locked: "ロックされたユーザーを表示",
+        show_suspended: "停止されたユーザーを表示",
+        user_id: "ユーザーを検索",
+        displayname: "表示名",
+        password: "パスワード",
+        avatar_url: "アバターのURL",
+        avatar_src: "アバター",
+        medium: "Medium",
+        threepids: "サードパーティーのID",
+        address: "アドレス",
+        creation_ts_ms: "作成日時",
+        consent_version: "同意のバージョン",
+        auth_provider: "プロバイダー",
+        user_type: "ユーザーの種類",
+      },
+      helper: {
+        password: "パスワードを変更すると、全てのセッションからログアウトします。",
+        password_required_for_reactivation: "アカウントを再度有効にするにはパスワードを設定する必要があります",
+        create_password: "以下のボタンで強力なパスワードを生成できます。",
+        lock: "ユーザーにアカウントを使用できないよう設定。これは後から取り消せます。",
+        deactivate: "アカウントを再度有効にするにはパスワードを設定する必要があります。",
+        suspend: "ユーザーを停止すると、ユーザーは読み込み限定のモードに設定されます。",
+        erase: "ユーザーをGDPRに準拠した形で消去",
+        admin: "サーバーの管理者には、サーバーとユーザーに対する完全なコントロールの権利が与えられています。",
+        erase_text:
+          "ユーザーが送信したメッセージは、メッセージが送信された時点にルームに参加していたユーザーは今後もこれを閲覧できますが、その後で参加したユーザーには表示されません。",
+        erase_admin_error: "自分自身のユーザーは削除できません。",
+        modify_managed_user_error: "システムが管理しているユーザーは変更できません。",
+        username_available: "ユーザー名は利用できます",
+      },
+      action: {
+        erase: "ユーザーのデータを消去",
+        erase_avatar: "アバターを消去",
+        delete_media: "このユーザーがアップロードしたメディアファイルを削除",
+        redact_events: "このユーザーが送信したイベントを削除",
+        generate_password: "パスワードを生成",
+        overwrite_title: "注意！",
+        overwrite_content: "このユーザー名はすでに取得されています。既存のユーザーを上書きしてもよろしいですか？",
+        overwrite_cancel: "キャンセル",
+        overwrite_confirm: "上書きする",
+      },
+      badge: {
+        you: "あなた",
+        bot: "ボット",
+        admin: "管理者",
+        support: "サポート",
+        regular: "一般ユーザー",
+        system_managed: "システム管理",
+      },
+      limits: {
+        messages_per_second: "毎秒のメッセージ数",
+        messages_per_second_text: "毎秒ごとに実行できるアクションの数。",
+        burst_count: "バースト数",
+        burst_count_text: "制限が実行されるまで行えるアクションの数。",
+      },
+      account_data: {
+        title: "アカウントのデータ",
+        global: "グローバル",
+        rooms: "ルーム",
+      },
+    },
+    rooms: {
+      name: "ルーム",
+      fields: {
+        room_id: "ルームのID",
+        name: "名称",
+        canonical_alias: "エイリアス",
+        joined_members: "メンバー",
+        joined_local_members: "ローカルのメンバー",
+        joined_local_devices: "ローカルの端末",
+        state_events: "ステートイベント / 複雑さ",
+        version: "バージョン",
+        is_encrypted: "暗号化",
+        encryption: "暗号化",
+        federatable: "フェデレーションに対応",
+        public: "ルームディレクトリーに表示",
+        creator: "作成者",
+        join_rules: "参加のルール",
+        guest_access: "ゲストによるアクセス",
+        history_visibility: "履歴の見え方",
+        topic: "トピック",
+        avatar: "アバター",
+        actions: "アクション",
+      },
+      helper: {
+        forward_extremities:
+          "転送末端（forward extremities）は、ルーム内の有向非巡回グラフ（DAG）の終端にあるイベント、つまり、子をもたないイベントのことをいいます。これが多ければ多いほど、Synapseが実行しなければならないステート解決（これは負荷の大きい作業です）の数も多くなります。Synapseには、ルーム内に存在する末端の数を減らす仕組みが備わっていますが、バグによりそれが機能しない場合があります。もしルームに10個以上の転送末端がある場合は、どのルームがそれを引き起こしているかを確認して #1760 で参照されているSQLクエリーで転送末端を削除することを検討してみてください。",
+      },
+      enums: {
+        join_rules: {
+          public: "公開",
+          knock: "ノック",
+          invite: "招待",
+          private: "非公開",
+        },
+        guest_access: {
+          can_join: "ゲスト参加可",
+          forbidden: "ゲスト参加不可",
+        },
+        history_visibility: {
+          invited: "招待以後",
+          joined: "参加以後",
+          shared: "共有以後",
+          world_readable: "制限なし",
+        },
+        unencrypted: "非暗号化",
+      },
+      action: {
+        erase: {
+          title: "ルームの削除",
+          content:
+            "ルームを削除してよろしいですか？　これは取り消せません。ルームのメッセージとメディアファイルはサーバーから削除されます！",
+          fields: {
+            block: "ユーザーがルームに参加できないように設定",
+          },
+          success: "ルームを削除しました。",
+          failure: "ルームを削除できませんでした。",
+        },
+        make_admin: {
+          assign_admin: "管理者を任命",
+          title: "%{roomName}のルームの管理者を任命",
+          confirm: "管理者にする",
+          content:
+            "管理者に任命するユーザーのMXIDを入力してください。\n注意：これが機能するには、ルームには管理者となるローカルメンバーが最低1人以上いる必要があります。",
+          success: "ユーザーをルームの管理者に設定しました。",
+          failure: "ユーザーをルームの管理者に設定できませんでした。%{errMsg}",
+        },
+      },
+    },
+    reports: {
+      name: "報告されたイベント",
+      fields: {
+        id: "ID",
+        received_ts: "報告日時",
+        user_id: "報告者",
+        name: "ルーム名",
+        score: "点数",
+        reason: "理由",
+        event_id: "イベントのID",
+        event_json: {
+          origin: "送信元のサーバー",
+          origin_server_ts: "送信日時",
+          type: "イベントの種類",
+          content: {
+            msgtype: "内容の種類",
+            body: "内容",
+            format: "形式",
+            formatted_body: "フォーマット済の内容",
+            algorithm: "アルゴリズム",
+            url: "URL",
+            info: {
+              mimetype: "種類",
+            },
+          },
+        },
+      },
+      action: {
+        erase: {
+          title: "報告されたイベントを削除",
+          content: "報告されたイベントを削除してよろしいですか？これは取り消せません。",
+        },
+      },
+    },
+    connections: {
+      name: "接続",
+      fields: {
+        last_seen: "日時",
+        ip: "IPアドレス",
+        user_agent: "ユーザーエージェント",
+      },
+    },
+    devices: {
+      name: "端末",
+      fields: {
+        device_id: "端末のID",
+        display_name: "端末の名称",
+        last_seen_ts: "タイムスタンプ",
+        last_seen_ip: "IPアドレス",
+      },
+      action: {
+        erase: {
+          title: "%{id}を削除",
+          content: "「%{name}」を削除してよろしいですか？",
+          success: "端末を削除しました。",
+          failure: "エラーが発生しました。",
+        },
+      },
+    },
+    users_media: {
+      name: "メディアファイル",
+      fields: {
+        media_id: "メディアのID",
+        media_length: "ファイルの大きさ（バイト数）",
+        media_type: "種類",
+        upload_name: "ファイル名",
+        quarantined_by: "検疫の実行者",
+        safe_from_quarantine: "検疫で保護",
+        created_ts: "作成日時",
+        last_access_ts: "最終アクセス",
+      },
+      action: {
+        open: "メディアファイルを新しいウィンドウで開く",
+      },
+    },
+    protect_media: {
+      action: {
+        create: "未保護。保護を実行",
+        delete: "保護済。保護を削除",
+        none: "検疫済",
+        send_success: "保護に関する状態を変更しました。",
+        send_failure: "エラーが発生しました。",
+      },
+    },
+    quarantine_media: {
+      action: {
+        name: "検疫",
+        create: "検疫に追加",
+        delete: "検疫に追加されています。検疫から取り出す",
+        none: "検疫によって保護されています",
+        send_success: "検疫に関する状態を変更しました。",
+        send_failure: "エラーが発生しました。",
+      },
+    },
+    pushers: {
+      name: "プッシュ",
+      fields: {
+        app: "アプリケーション",
+        app_display_name: "アプリケーションの名称",
+        app_id: "アプリケーションのID",
+        device_display_name: "端末の名称",
+        kind: "種類",
+        lang: "言語",
+        profile_tag: "プロフィールのタグ",
+        pushkey: "プッシュ鍵",
+        data: { url: "URL" },
+      },
+    },
+    servernotices: {
+      name: "サーバーの告知",
+      send: "サーバーの告知を送信",
+      fields: {
+        body: "メッセージ",
+      },
+      action: {
+        send: "告知を送信",
+        send_success: "サーバーの告知を送信しました。",
+        send_failure: "エラーが発生しました。",
+      },
+      helper: {
+        send: "サーバーの告知を指定したユーザーに送信。「サーバーの告知」機能がサーバーで有効になっている必要があります。",
+      },
+    },
+    user_media_statistics: {
+      name: "ユーザーのメディア",
+      fields: {
+        media_count: "メディア数",
+        media_length: "メディアの大きさ",
+      },
+    },
+    forward_extremities: {
+      name: "転送末端",
+      fields: {
+        id: "イベントのID",
+        received_ts: "タイムスタンプ",
+        depth: "深さ",
+        state_group: "ステートのグループ",
+      },
+    },
+    room_state: {
+      name: "ステートイベント",
+      fields: {
+        type: "種類",
+        content: "内容",
+        origin_server_ts: "送信日時",
+        sender: "送信元",
+      },
+    },
+    room_media: {
+      name: "メディア",
+      fields: {
+        media_id: "メディアのID",
+      },
+      helper: {
+        info: "ルームにアップロードされたメディアファイルの一覧です。外部のレポジトリーにアップロードされたメディアファイルは削除できません。",
+      },
+      action: {
+        error: "%{errcode} (%{errstatus}) %{error}",
+      },
+    },
+    room_directory: {
+      name: "ルームのディレクトリー",
+      fields: {
+        world_readable: "ゲストユーザーは参加せず閲覧可",
+        guest_can_join: "ゲストユーザーが参加可能",
+      },
+      action: {
+        title: "ルームをディレクトリーから削除 |||| %{smart_count}個のルームをディレクトリーから削除",
+        content:
+          "このルームをディレクトリーから削除してよろしいですか？ |||| %{smart_count}個のルームをディレクトリーから削除してよろしいですか？",
+        erase: "ルームをディレクトリーから削除",
+        create: "ルームをディレクトリーで公開",
+        send_success: "ルームを公開しました。",
+        send_failure: "エラーが発生しました。",
+      },
+    },
+    destinations: {
+      name: "フェデレーション",
+      fields: {
+        destination: "目的地",
+        failure_ts: "失敗した時点のタイムスタンプ",
+        retry_last_ts: "最後に試行した時点のタイムスタンプ",
+        retry_interval: "再試行までの間隔",
+        last_successful_stream_ordering: "最後に成功したストリーム",
+        stream_ordering: "ストリーム",
+      },
+      action: { reconnect: "再接続" },
+    },
+    registration_tokens: {
+      name: "登録トークン",
+      fields: {
+        token: "トークン",
+        valid: "有効なトークン",
+        uses_allowed: "使用が許可",
+        pending: "保留中",
+        completed: "完了",
+        expiry_time: "期限切れとなる日時",
+        length: "長さ",
+      },
+      helper: { length: "トークンが与えられていない場合のトークンの長さ。" },
+    },
+  },
+  scheduled_commands: {
+    action: {
+      create_success: "スケジュール済のコマンドを作成しました",
+      update_success: "スケジュール済のコマンドを更新しました",
+      update_failure: "エラーが発生しました",
+      delete_success: "スケジュール済のコマンドを削除しました",
+      delete_failure: "エラーが発生しました",
+    },
+  },
+  recurring_commands: {
+    action: {
+      create_success: "繰り返しを行うコマンドを作成しました",
+      update_success: "繰り返しを行うコマンドを更新しました",
+      update_failure: "エラーが発生しました",
+      delete_success: "繰り返しを行うコマンドを削除しました",
+      delete_failure: "エラーが発生しました",
+    },
+  },
+};
+export default ja;

src/i18n/ru.ts

@@ -11,6 +11,10 @@ const fixedRussianMessages = {
       no_filtered_results: "Нет результатов",
       clear_filters: "Все фильтры сбросить",
     },
+    action: {
+      ...russianMessages.ra.action,
+      select_all_button: "Выбрать все",
+    },
     page: {
       ...russianMessages.ra.page,
       empty: "Пусто",
@@ -19,13 +23,12 @@ const fixedRussianMessages = {
     },
     message: {
       ...russianMessages.ra.message,
-      access_denied:
-        "У вас нет прав доступа к этой странице.",
-      authentication_error:
-        "Сервер аутентификации вернул ошибку и не смог проверить ваши учетные данные.",
+      access_denied: "У вас нет прав доступа к этой странице.",
+      authentication_error: "Сервер аутентификации вернул ошибку и не смог проверить ваши учетные данные.",
+      select_all_limit_reached: "Слишком много элементов для выбора. Были выбраны только первые %{max} элементов.",
     },
   },
-}
+};
 
 const ru: SynapseTranslationMessages = {
   ...fixedRussianMessages,
@@ -43,14 +46,20 @@ const ru: SynapseTranslationMessages = {
       access_token: "Токен доступа",
       logout_acces_token_dialog: {
         title: "Вы используете существующий токен доступа Matrix.",
-        content: "Вы хотите завершить эту сессию (которая может быть использована в другом месте, например, в клиенте Matrix) или просто выйти из панели администрирования?",
+        content:
+          "Вы хотите завершить эту сессию (которая может быть использована в другом месте, например, в клиенте Matrix) или просто выйти из панели администрирования?",
         confirm: "Завершить сессию",
         cancel: "Просто выйти из панели администрирования",
       },
     },
     users: {
       invalid_user_id: "Локальная часть ID пользователя Matrix без адреса домашнего сервера.",
-      tabs: { sso: "SSO", experimental: "Экспериментальные", limits: "Ограничения", account_data: "Данные пользователя" },
+      tabs: {
+        sso: "SSO",
+        experimental: "Экспериментальные",
+        limits: "Ограничения",
+        account_data: "Данные пользователя",
+      },
     },
     rooms: {
       details: "Данные комнаты",
@@ -78,7 +87,7 @@ const ru: SynapseTranslationMessages = {
     goToPdf: "Перейти к PDF",
     cards: {
       importstats: {
-        header: "Импорт пользователей",
+        header: "Анализированные пользователи для импорта",
         users_total:
           "%{smart_count} пользователь в CSV файле |||| %{smart_count} пользователя в CSV файле |||| %{smart_count} пользователей в CSV файле",
         guest_count: "%{smart_count} гость |||| %{smart_count} гостя |||| %{smart_count} гостей",
@@ -199,11 +208,16 @@ const ru: SynapseTranslationMessages = {
       },
       helper: {
         password: "Смена пароля завершит все сессии пользователя.",
+        password_required_for_reactivation: "Вы должны предоставить пароль для реактивации учётной записи.",
         create_password: "Сгенерировать надёжный и безопасный пароль, используя кнопку ниже.",
         deactivate: "Вы должны предоставить пароль для реактивации учётной записи.",
-        suspend: "Приостановка учётной записи означает, что пользователь не сможет войти в свою учётную запись, пока она не будет снова активирована.",
+        suspend:
+          "Приостановка учётной записи означает, что пользователь не сможет войти в свою учётную запись, пока она не будет снова активирована.",
         erase: "Пометить пользователя как удалённого в соответствии с GDPR",
-        erase_text: "Это означает, что сообщения, отправленные пользователем (-ами), будут по-прежнему видны всем, кто находился в комнате в момент их отправки, но будут скрыты от пользователей, присоединившихся к комнате после этого.",
+        admin: "Администратор сервера имеет полный контроль над сервером и его пользователями.",
+        lock: "Предотвращает использование пользователем сервера. Это неразрушающее действие, которое может быть отменено.",
+        erase_text:
+          "Это означает, что сообщения, отправленные пользователем (-ами), будут по-прежнему видны всем, кто находился в комнате в момент их отправки, но будут скрыты от пользователей, присоединившихся к комнате после этого.",
         erase_admin_error: "Удаление собственного пользователя запрещено.",
         modify_managed_user_error: "Изменение пользователя, управляемого системой, не допускается.",
         username_available: "Имя пользователя доступно",
@@ -223,7 +237,8 @@ const ru: SynapseTranslationMessages = {
         redact_events: "Удаление всех событий, отправленных пользователем (-ами)",
         generate_password: "Сгенерировать пароль",
         overwrite_title: "Предупреждение!",
-        overwrite_content: "Это имя пользователя уже занято. Вы уверены, что хотите перезаписать существующего пользователя?",
+        overwrite_content:
+          "Это имя пользователя уже занято. Вы уверены, что хотите перезаписать существующего пользователя?",
         overwrite_cancel: "Отмена",
         overwrite_confirm: "Перезаписать",
       },
@@ -237,7 +252,7 @@ const ru: SynapseTranslationMessages = {
         title: "Данные пользователя",
         global: "Глобальные",
         rooms: "Комнаты",
-      }
+      },
     },
     rooms: {
       name: "Комната |||| Комнаты",
@@ -303,10 +318,11 @@ const ru: SynapseTranslationMessages = {
           assign_admin: "Назначить администратора",
           title: "Назначить администратора комнате %{roomName}",
           confirm: "Назначить администратора",
-          content: "Введите полную MXID пользователя, которого нужно назначить администратором.\nПредупреждение: для этого должен быть назначен хотя бы один локальный участник в качестве администратора.",
+          content:
+            "Введите полную MXID пользователя, которого нужно назначить администратором.\nПредупреждение: для этого должен быть назначен хотя бы один локальный участник в качестве администратора.",
           success: "Пользователь назначен администратором комнаты.",
           failure: "Пользователь не может быть назначен администратором комнаты. %{errMsg}",
-        }
+        },
       },
     },
     reports: {
@@ -466,8 +482,8 @@ const ru: SynapseTranslationMessages = {
         info: "Это список медиа, которые были загружены в комнату. Невозможно удалить медиа, которые были загружены в внешние медиа-репозитории.",
       },
       action: {
-        error: "%{errcode} (%{errstatus}) %{error}"
-      }
+        error: "%{errcode} (%{errstatus}) %{error}",
+      },
     },
     room_directory: {
       name: "Каталог комнат",

src/i18n/zh.ts

@@ -11,9 +11,14 @@ const fixedChineseMessages = {
       no_filtered_results: "没有结果",
       clear_filters: "清除所有过滤器",
     },
+    auth: {
+      ...chineseMessages.ra.auth,
+      email: "邮箱",
+    },
     action: {
       ...chineseMessages.ra.action,
-      update_application: "Anwendung aktualisieren",
+      update_application: "更新应用",
+      select_all_button: "全部选择",
     },
     page: {
       ...chineseMessages.ra.page,
@@ -22,13 +27,13 @@ const fixedChineseMessages = {
     },
     message: {
       ...chineseMessages.ra.message,
-      access_denied:
-        "您没有访问此页面的权限。",
-      authentication_error:
-        "身份验证服务器返回错误，无法验证您的凭据。",
+      access_denied: "您没有访问此页面的权限。",
+      authentication_error: "身份验证服务器返回错误，无法验证您的凭据。",
+      select_all_limit_reached: "选择的元素太多。只选择了前 %{max} 个元素。",
+      placeholder_data_warning: "网络问题：数据刷新失败。",
     },
   },
-}
+};
 
 const zh: SynapseTranslationMessages = {
   ...fixedChineseMessages,
@@ -79,7 +84,7 @@ const zh: SynapseTranslationMessages = {
     goToPdf: "转到 PDF",
     cards: {
       importstats: {
-        header: "导入用户",
+        header: "分析用于导入的用户",
         users_total: "%{smart_count} 用户在 CSV 文件中 |||| %{smart_count} 用户在 CSV 文件中",
         guest_count: "%{smart_count} 访客 |||| %{smart_count} 访客",
         admin_count: "%{smart_count} 管理员 |||| %{smart_count} 管理员",
@@ -188,11 +193,15 @@ const zh: SynapseTranslationMessages = {
       },
       helper: {
         password: "更改密码会使用户注销所有会话。",
+        password_required_for_reactivation: "您必须提供一串密码来激活账户。",
         create_password: "使用下面的按钮生成一个强大和安全的密码。",
         deactivate: "您必须提供一串密码来激活账户。",
         suspend: "您必须提供一串密码来暂停账户。",
         erase: "将用户标记为根据 GDPR 的要求抹除了",
-        erase_text: "这意味着用户发送的信息对于发送信息时在房间内的任何人来说都是可见的，但对于之后加入房间的用户来说则是隐藏的。",
+        admin: "服务器管理员对服务器和其用户有完全的控制权。",
+        lock: "阻止用户使用服务器。这是一个非破坏性的操作，可以被撤销。",
+        erase_text:
+          "这意味着用户发送的信息对于发送信息时在房间内的任何人来说都是可见的，但对于之后加入房间的用户来说则是隐藏的。",
         erase_admin_error: "不允许删除自己的用户",
         modify_managed_user_error: "不允许修改系统管理的用户。",
         username_available: "用户名可用",
@@ -226,7 +235,7 @@ const zh: SynapseTranslationMessages = {
         title: "账户数据",
         global: "全局",
         rooms: "房间",
-      }
+      },
     },
     rooms: {
       name: "房间",
@@ -377,8 +386,8 @@ const zh: SynapseTranslationMessages = {
         info: "这是上传到房间的媒体列表。无法删除上传到外部媒体存储库的媒体。",
       },
       action: {
-        error: "%{errcode} (%{errstatus}) %{error}"
-      }
+        error: "%{errcode} (%{errstatus}) %{error}",
+      },
     },
   },
 };

src/index.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-
 import { createRoot } from "react-dom/client";
 
 import { App } from "./App";

src/pages/LoginPage.test.tsx

@@ -1,6 +1,5 @@
+import { act, render, screen } from "@testing-library/react";
 import polyglotI18nProvider from "ra-i18n-polyglot";
-
-import { render, screen } from "@testing-library/react";
 import { AdminContext } from "react-admin";
 
 import LoginPage from "./LoginPage";
@@ -8,7 +7,6 @@ import { AppContext } from "../Context";
 import englishMessages from "../i18n/en";
 
 const i18nProvider = polyglotI18nProvider(() => englishMessages, "en", [{ locale: "en", name: "English" }]);
-import { act } from "@testing-library/react";
 
 describe("LoginForm", () => {
   it("renders with no restriction to homeserver", async () => {
@@ -34,7 +32,12 @@ describe("LoginForm", () => {
   it("renders with single restricted homeserver", () => {
     render(
       <AppContext.Provider
-        value={{ restrictBaseUrl: "https://matrix.example.com", asManagedUsers: [], menu: [] }}
+        value={{
+          restrictBaseUrl: "https://matrix.example.com",
+          asManagedUsers: [],
+          menu: [],
+          corsCredentials: "include",
+        }}
       >
         <AdminContext i18nProvider={i18nProvider}>
           <LoginPage />
@@ -60,6 +63,7 @@ describe("LoginForm", () => {
           restrictBaseUrl: ["https://matrix.example.com", "https://matrix.example.org"],
           asManagedUsers: [],
           menu: [],
+          corsCredentials: "include",
         }}
       >
         <AdminContext i18nProvider={i18nProvider}>

src/pages/LoginPage.tsx

@@ -1,6 +1,17 @@
+import {
+  Avatar,
+  Box,
+  Button,
+  Card,
+  CardActions,
+  CircularProgress,
+  MenuItem,
+  Select,
+  Tab,
+  Tabs,
+  Typography,
+} from "@mui/material";
 import { useState, useEffect } from "react";
-
-import { Avatar, Box, Button, Card, CardActions, CircularProgress, MenuItem, Select, Tab, Tabs, Typography } from "@mui/material";
 import {
   Form,
   FormDataConsumer,
@@ -12,11 +23,14 @@ import {
   useTranslate,
   PasswordInput,
   TextInput,
+  SelectInput,
   useLocales,
 } from "react-admin";
 import { useFormContext } from "react-hook-form";
-import LoginFormBox from "../components/LoginFormBox";
+
 import { useAppContext } from "../Context";
+import Footer from "../components/Footer";
+import LoginFormBox from "../components/LoginFormBox";
 import {
   getServerVersion,
   getSupportedFeatures,
@@ -25,7 +39,6 @@ import {
   isValidBaseUrl,
   splitMxid,
 } from "../synapse/matrix";
-import Footer from "../components/Footer";
 
 export type LoginMethod = "credentials" | "accessToken";
 
@@ -39,16 +52,31 @@ const LoginPage = () => {
     restrictBaseUrl.length > 0 &&
     restrictBaseUrl[0] !== "" &&
     restrictBaseUrl[0] !== null;
+  const baseUrlChoices = allowMultipleBaseUrls ? restrictBaseUrl.map(url => ({ id: url, name: url })) : [];
   const allowAnyBaseUrl = !(allowSingleBaseUrl || allowMultipleBaseUrls);
+  const localStorageBaseUrl = localStorage.getItem("base_url");
+  let base_url = allowSingleBaseUrl ? restrictBaseUrl : localStorageBaseUrl;
+  if (allowMultipleBaseUrls && localStorageBaseUrl && !restrictBaseUrl.includes(localStorageBaseUrl)) {
+    // don't set base_url if it is not in the restrictBaseUrl array
+    base_url = null;
+  }
   const [loading, setLoading] = useState(false);
   const [supportPassAuth, setSupportPassAuth] = useState(true);
   const [locale, setLocale] = useLocaleState();
   const locales = useLocales();
   const translate = useTranslate();
-  const base_url = allowSingleBaseUrl ? restrictBaseUrl : localStorage.getItem("base_url");
+
   const [ssoBaseUrl, setSSOBaseUrl] = useState("");
-  const loginToken = new URLSearchParams(window.location.search).get("loginToken")
+  const loginToken = new URLSearchParams(window.location.search).get("loginToken");
   const [loginMethod, setLoginMethod] = useState<LoginMethod>("credentials");
+  const [serverVersion, setServerVersion] = useState("");
+  const [matrixVersions, setMatrixVersions] = useState("");
+
+  useEffect(() => {
+    if (base_url) {
+      checkServerInfo(base_url);
+    }
+  }, []);
 
   useEffect(() => {
     if (!loginToken) {
@@ -57,8 +85,8 @@ const LoginPage = () => {
 
     console.log("SSO token is", loginToken);
     // Prevent further requests
-    const previousUrl = new URL(window.location.toString())
-    previousUrl.searchParams.delete("loginToken")
+    const previousUrl = new URL(window.location.toString());
+    previousUrl.searchParams.delete("loginToken");
     window.history.replaceState({}, "", previousUrl.toString());
     const baseUrl = localStorage.getItem("sso_base_url");
     localStorage.removeItem("sso_base_url");
@@ -121,54 +149,75 @@ const LoginPage = () => {
     window.location.href = ssoFullUrl;
   };
 
+  const checkServerInfo = async (url: string) => {
+    if (!isValidBaseUrl(url)) {
+      setServerVersion("");
+      setMatrixVersions("");
+      setSupportPassAuth(false);
+      setSSOBaseUrl("");
+      return;
+    }
+
+    try {
+      const serverVersion = await getServerVersion(url);
+      setServerVersion(`${translate("synapseadmin.auth.server_version")} ${serverVersion}`);
+    } catch {
+      setServerVersion("");
+    }
+
+    try {
+      const features = await getSupportedFeatures(url);
+      setMatrixVersions(`${translate("synapseadmin.auth.supports_specs")} ${features.versions.join(", ")}`);
+    } catch {
+      setMatrixVersions("");
+    }
+
+    // Set SSO Url
+    try {
+      const loginFlows = await getSupportedLoginFlows(url);
+      const supportPass = loginFlows.find(f => f.type === "m.login.password") !== undefined;
+      const supportSSO = loginFlows.find(f => f.type === "m.login.sso") !== undefined;
+      setSupportPassAuth(supportPass);
+      setSSOBaseUrl(supportSSO ? url : "");
+    } catch {
+      setSupportPassAuth(false);
+      setSSOBaseUrl("");
+    }
+  };
+
   const UserData = ({ formData }) => {
     const form = useFormContext();
-    const [serverVersion, setServerVersion] = useState("");
-    const [matrixVersions, setMatrixVersions] = useState("");
 
-    const handleUsernameChange = () => {
+    const handleUsernameChange = async () => {
       if (formData.base_url || allowSingleBaseUrl) {
         return;
       }
       // check if username is a full qualified userId then set base_url accordingly
       const domain = splitMxid(formData.username)?.domain;
       if (domain) {
-        getWellKnownUrl(domain).then(url => {
-          if (allowAnyBaseUrl || (allowMultipleBaseUrls && restrictBaseUrl.includes(url)))
-            form.setValue("base_url", url);
+        const url = await getWellKnownUrl(domain);
+        if (allowAnyBaseUrl || (allowMultipleBaseUrls && restrictBaseUrl.includes(url))) {
+          form.setValue("base_url", url, {
+            shouldValidate: true,
+            shouldDirty: true,
           });
+          checkServerInfo(url);
+        }
       }
     };
 
-    useEffect(() => {
-      if (!formData.base_url) {
-        form.setValue("base_url", "");
+    const handleBaseUrlBlurOrChange = event => {
+      // Get the value either from the event (onChange) or from formData (onBlur)
+      const value = event?.target?.value || formData.base_url;
+
+      if (!value) {
+        return;
       }
-      if (formData.base_url === "" && allowMultipleBaseUrls) {
-        form.setValue("base_url", restrictBaseUrl[0]);
-      }
-      if (!isValidBaseUrl(formData.base_url)) return;
 
-      getServerVersion(formData.base_url)
-        .then(serverVersion => setServerVersion(`${translate("synapseadmin.auth.server_version")} ${serverVersion}`))
-        .catch(() => setServerVersion(""));
-
-      getSupportedFeatures(formData.base_url)
-        .then(features =>
-          setMatrixVersions(`${translate("synapseadmin.auth.supports_specs")} ${features.versions.join(", ")}`)
-        )
-        .catch(() => setMatrixVersions(""));
-
-      // Set SSO Url
-      getSupportedLoginFlows(formData.base_url)
-        .then(loginFlows => {
-          const supportPass = loginFlows.find(f => f.type === "m.login.password") !== undefined;
-          const supportSSO = loginFlows.find(f => f.type === "m.login.sso") !== undefined;
-          setSupportPassAuth(supportPass);
-          setSSOBaseUrl(supportSSO ? formData.base_url : "");
-        })
-        .catch(() => setSSOBaseUrl(""));
-    }, [formData.base_url, form]);
+      // Trigger validation only when user finishes typing/selecting
+      form.trigger("base_url");
+      checkServerInfo(value);
+    };
 
     useEffect(() => {
       const params = new URLSearchParams(window.location.search);
@@ -177,6 +226,7 @@ const LoginPage = () => {
       const password = params.get("password");
       const accessToken = params.get("accessToken");
       let serverURL = params.get("server");
+
       if (username) {
         form.setValue("username", username);
       }
@@ -190,12 +240,19 @@ const LoginPage = () => {
           form.setValue("accessToken", accessToken);
         }
       }
+
       if (serverURL) {
         const isFullUrl = serverURL.match(/^(http|https):\/\//);
         if (!isFullUrl) {
           serverURL = `https://${serverURL}`;
         }
-        form.setValue("base_url", serverURL);
+
+        form.setValue("base_url", serverURL, {
+          shouldValidate: true,
+          shouldDirty: true,
+        });
+
+        checkServerInfo(serverURL);
       }
     }, [window.location.search]);
 
@@ -215,7 +272,6 @@ const LoginPage = () => {
           <>
             <Box>
               <TextInput
-                autoFocus
                 source="username"
                 label="ra.auth.username"
                 autoComplete="username"
@@ -249,23 +305,30 @@ const LoginPage = () => {
           </Box>
         )}
         <Box>
-          <TextInput
+          {allowMultipleBaseUrls && (
+            <SelectInput
               source="base_url"
               label="synapseadmin.auth.base_url"
               select={allowMultipleBaseUrls}
               autoComplete="url"
               {...(loading ? { disabled: true } : {})}
+              onChange={handleBaseUrlBlurOrChange}
+              validate={[required(), validateBaseUrl]}
+              choices={baseUrlChoices}
+            />
+          )}
+          {!allowMultipleBaseUrls && (
+            <TextInput
+              source="base_url"
+              label="synapseadmin.auth.base_url"
+              autoComplete="url"
+              {...(loading ? { disabled: true } : {})}
               readOnly={allowSingleBaseUrl}
               resettable={allowAnyBaseUrl}
               validate={[required(), validateBaseUrl]}
-          >
-            {allowMultipleBaseUrls &&
-              restrictBaseUrl.map(url => (
-                <MenuItem key={url} value={url}>
-                  {url}
-                </MenuItem>
-              ))}
-          </TextInput>
+              onBlur={handleBaseUrlBlurOrChange}
+            />
+          )}
         </Box>
         <Typography className="serverVersion">{serverVersion}</Typography>
         <Typography className="matrixVersions">{matrixVersions}</Typography>
@@ -274,7 +337,7 @@ const LoginPage = () => {
   };
 
   return (
-    <Form defaultValues={{ base_url: base_url }} onSubmit={handleSubmit} mode="onTouched">
+    <Form defaultValues={{ base_url: base_url }} onSubmit={handleSubmit} mode="onBlur">
       <LoginFormBox>
         <Card className="card">
           <Box className="avatar">
@@ -300,7 +363,8 @@ const LoginPage = () => {
               ))}
             </Select>
             <FormDataConsumer>{formDataProps => <UserData {...formDataProps} />}</FormDataConsumer>
-            {loginMethod === "credentials" && <CardActions className="actions">
+            {loginMethod === "credentials" && (
+              <CardActions className="actions">
                 <Button
                   variant="contained"
                   type="submit"
@@ -319,18 +383,15 @@ const LoginPage = () => {
                 >
                   {translate("synapseadmin.auth.sso_sign_in")}
                 </Button>
-            </CardActions>}
-            {loginMethod === "accessToken" && <CardActions className="actions">
-              <Button
-                variant="contained"
-                type="submit"
-                color="primary"
-                disabled={loading}
-                fullWidth
-              >
+              </CardActions>
+            )}
+            {loginMethod === "accessToken" && (
+              <CardActions className="actions">
+                <Button variant="contained" type="submit" color="primary" disabled={loading} fullWidth>
                   {translate("ra.auth.sign_in")}
                 </Button>
-            </CardActions>}
+              </CardActions>
+            )}
           </Box>
         </Card>
       </LoginFormBox>

src/resources/destinations.tsx

@@ -1,10 +1,10 @@
-import { MouseEvent } from "react";
-
 import AutorenewIcon from "@mui/icons-material/Autorenew";
 import DestinationsIcon from "@mui/icons-material/CloudQueue";
+import ErrorIcon from "@mui/icons-material/Error";
 import FolderSharedIcon from "@mui/icons-material/FolderShared";
 import ViewListIcon from "@mui/icons-material/ViewList";
-import ErrorIcon from '@mui/icons-material/Error';
+import { get } from "lodash";
+import { MouseEvent } from "react";
 import {
   Button,
   Datagrid,
@@ -34,7 +34,6 @@ import {
 } from "react-admin";
 
 import { DATE_FORMAT } from "../utils/date";
-import { get } from "lodash";
 
 const DestinationPagination = () => <Pagination rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />;
 
@@ -101,7 +100,6 @@ const RetryDateField = (props: DateFieldProps) => {
   return <DateField {...props} />;
 };
 
-
 const destinationFieldRender = (record: RaRecord) => {
   if (record.retry_last_ts > 0) {
     return (
@@ -113,10 +111,9 @@ const destinationFieldRender = (record: RaRecord) => {
     );
   }
   return <> {record.destination} </>;
-}
+};
 
 export const DestinationList = (props: ListProps) => {
-  const record = useRecordContext(props);
   return (
     <List
       {...props}
@@ -126,11 +123,28 @@ export const DestinationList = (props: ListProps) => {
       perPage={50}
     >
       <DatagridConfigurable rowClick={id => `${id}/show/rooms`} bulkActionButtons={false}>
-        <FunctionField source="destination" render={destinationFieldRender} label="resources.destinations.fields.destination" />
-        <DateField source="failure_ts" showTime options={DATE_FORMAT} label="resources.destinations.fields.failure_ts" />
-        <RetryDateField source="retry_last_ts" showTime options={DATE_FORMAT} label="resources.destinations.fields.retry_last_ts" />
+        <FunctionField
+          source="destination"
+          render={destinationFieldRender}
+          label="resources.destinations.fields.destination"
+        />
+        <DateField
+          source="failure_ts"
+          showTime
+          options={DATE_FORMAT}
+          label="resources.destinations.fields.failure_ts"
+        />
+        <RetryDateField
+          source="retry_last_ts"
+          showTime
+          options={DATE_FORMAT}
+          label="resources.destinations.fields.retry_last_ts"
+        />
         <TextField source="retry_interval" label="resources.destinations.fields.retry_interval" />
-        <TextField source="last_successful_stream_ordering" label="resources.destinations.fields.last_successful_stream_ordering" />
+        <TextField
+          source="last_successful_stream_ordering"
+          label="resources.destinations.fields.last_successful_stream_ordering"
+        />
         <DestinationReconnectButton />
       </DatagridConfigurable>
     </List>

src/resources/registration_tokens.tsx

@@ -3,7 +3,6 @@ import {
   BooleanInput,
   Create,
   CreateProps,
-  Datagrid,
   DatagridConfigurable,
   DateField,
   DateTimeInput,
@@ -45,7 +44,13 @@ export const RegistrationTokenList = (props: ListProps) => (
       <NumberField source="uses_allowed" sortable={false} label="resources.registration_tokens.fields.uses_allowed" />
       <NumberField source="pending" sortable={false} label="resources.registration_tokens.fields.pending" />
       <NumberField source="completed" sortable={false} label="resources.registration_tokens.fields.completed" />
-      <DateField source="expiry_time" showTime options={DATE_FORMAT} sortable={false} label="resources.registration_tokens.fields.expiry_time" />
+      <DateField
+        source="expiry_time"
+        showTime
+        options={DATE_FORMAT}
+        sortable={false}
+        label="resources.registration_tokens.fields.expiry_time"
+      />
     </DatagridConfigurable>
   </List>
 );

src/resources/reports.tsx

@@ -2,7 +2,6 @@ import PageviewIcon from "@mui/icons-material/Pageview";
 import ViewListIcon from "@mui/icons-material/ViewList";
 import ReportIcon from "@mui/icons-material/Warning";
 import {
-  Datagrid,
   DatagridConfigurable,
   DateField,
   DeleteButton,
@@ -22,8 +21,8 @@ import {
   useTranslate,
 } from "react-admin";
 
-import { DATE_FORMAT } from "../utils/date";
 import { ReportMediaContent } from "../components/media";
+import { DATE_FORMAT } from "../utils/date";
 
 const ReportPagination = () => <Pagination rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />;
 
@@ -93,7 +92,13 @@ export const ReportList = (props: ListProps) => (
   <List {...props} pagination={<ReportPagination />} perPage={50} sort={{ field: "received_ts", order: "DESC" }}>
     <DatagridConfigurable rowClick="show" bulkActionButtons={false}>
       <TextField source="id" sortable={false} label="resources.reports.fields.id" />
-      <DateField source="received_ts" showTime options={DATE_FORMAT} sortable={true} label="resources.reports.fields.received_ts" />
+      <DateField
+        source="received_ts"
+        showTime
+        options={DATE_FORMAT}
+        sortable={true}
+        label="resources.reports.fields.received_ts"
+      />
       <TextField sortable={false} source="user_id" label="resources.reports.fields.user_id" />
       <TextField sortable={false} source="name" label="resources.reports.fields.name" />
       <TextField sortable={false} source="score" label="resources.reports.fields.score" />

src/resources/room_directory.tsx

@@ -1,4 +1,5 @@
 import RoomDirectoryIcon from "@mui/icons-material/FolderShared";
+import { useMutation } from "@tanstack/react-query";
 import {
   BooleanField,
   BulkDeleteButton,
@@ -25,9 +26,9 @@ import {
   useRefresh,
   useUnselectAll,
 } from "react-admin";
-import { useMutation } from "@tanstack/react-query";
-import AvatarField from "../components/AvatarField";
+
 import { MakeAdminBtn } from "./rooms";
+import AvatarField from "../components/AvatarField";
 const RoomDirectoryPagination = () => <Pagination rowsPerPageOptions={[100, 500, 1000, 2000]} />;
 
 export const RoomDirectoryUnpublishButton = (props: DeleteButtonProps) => {
@@ -141,11 +142,7 @@ export const RoomDirectoryList = () => (
       bulkActionButtons={<RoomDirectoryBulkUnpublishButton />}
       omit={["room_id", "canonical_alias", "topic"]}
     >
-      <AvatarField
-        source="avatar_src"
-        sx={{ height: "40px", width: "40px" }}
-        label="resources.rooms.fields.avatar"
-      />
+      <AvatarField source="avatar_src" sx={{ height: "40px", width: "40px" }} label="resources.rooms.fields.avatar" />
       <TextField source="name" sortable={false} label="resources.rooms.fields.name" />
       <TextField source="room_id" sortable={false} label="resources.rooms.fields.room_id" />
       <TextField source="canonical_alias" sortable={false} label="resources.rooms.fields.canonical_alias" />

src/resources/rooms.tsx

@@ -4,12 +4,19 @@ import UserIcon from "@mui/icons-material/Group";
 import HttpsIcon from "@mui/icons-material/Https";
 import NoEncryptionIcon from "@mui/icons-material/NoEncryption";
 import PageviewIcon from "@mui/icons-material/Pageview";
+import PermMediaIcon from "@mui/icons-material/PermMedia";
+import PersonIcon from "@mui/icons-material/Person";
 import ViewListIcon from "@mui/icons-material/ViewList";
 import RoomIcon from "@mui/icons-material/ViewList";
 import VisibilityIcon from "@mui/icons-material/Visibility";
-import PermMediaIcon from "@mui/icons-material/PermMedia";
+import Alert from "@mui/material/Alert";
 import Box from "@mui/material/Box";
+import Button from "@mui/material/Button";
+import TextField from "@mui/material/TextField";
+import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
+import { useMutation } from "@tanstack/react-query";
+import { useState } from "react";
 import {
   BooleanField,
   DateField,
@@ -40,27 +47,20 @@ import {
   useNotify,
   DeleteButton,
 } from "react-admin";
+import { useDataProvider } from "react-admin";
+import { Confirm } from "react-admin";
 
-import TextField from "@mui/material/TextField";
 import {
   RoomDirectoryBulkUnpublishButton,
   RoomDirectoryBulkPublishButton,
   RoomDirectoryUnpublishButton,
   RoomDirectoryPublishButton,
 } from "./room_directory";
-import { DATE_FORMAT } from "../utils/date";
+import AvatarField from "../components/AvatarField";
 import DeleteRoomButton from "../components/DeleteRoomButton";
 import { MediaIDField } from "../components/media";
-import AvatarField from "../components/AvatarField";
 import { Room } from "../synapse/dataProvider";
-import { useMutation } from "@tanstack/react-query";
-import { useDataProvider } from "react-admin";
-import { Confirm } from "react-admin";
-import { useState } from "react";
-import Button from "@mui/material/Button";
-import PersonIcon from '@mui/icons-material/Person';
-import Typography from "@mui/material/Typography";
-import Alert from "@mui/material/Alert";
+import { DATE_FORMAT } from "../utils/date";
 
 const RoomPagination = () => <Pagination rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />;
 
@@ -110,7 +110,6 @@ export const MakeAdminBtn = () => {
     return null;
   }
 
-
   const ownMXID = localStorage.getItem("user_id") || "";
   const [open, setOpen] = useState(false);
   const [userIdValue, setUserIdValue] = useState(ownMXID);
@@ -120,26 +119,22 @@ export const MakeAdminBtn = () => {
 
   const { mutate, isPending } = useMutation({
     mutationFn: async () => {
-      try {
       const result = await dataProvider.makeRoomAdmin(record.room_id, userIdValue);
       if (!result.success) {
         throw new Error(result.error);
       }
-      } catch (error) {
-        throw error;
-      }
     },
     onSuccess: () => {
       notify("resources.rooms.action.make_admin.success", { type: "success" });
       setOpen(false);
       setUserIdValue("");
     },
-    onError: (err) => {
+    onError: err => {
       const errorMessage = err instanceof Error ? err.message : "Unknown error";
       notify("resources.rooms.action.make_admin.failure", { type: "error", messageArgs: { errMsg: errorMessage } });
       setOpen(false);
       setUserIdValue("");
-    }
+    },
   });
 
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -161,8 +156,16 @@ export const MakeAdminBtn = () => {
     }
   };
 
-  return (<>
-      <Button size="small" onClick={(e) => { e.stopPropagation(); setOpen(true); }} disabled={isPending}>
+  return (
+    <>
+      <Button
+        size="small"
+        onClick={e => {
+          e.stopPropagation();
+          setOpen(true);
+        }}
+        disabled={isPending}
+      >
         <PersonIcon /> {translate("resources.rooms.action.make_admin.assign_admin")}
       </Button>
       <Confirm
@@ -171,9 +174,14 @@ export const MakeAdminBtn = () => {
         onClose={handleDialogClose}
         confirm="resources.rooms.action.make_admin.confirm"
         cancel="ra.action.cancel"
-        title={translate("resources.rooms.action.make_admin.title", { roomName: record.name ? record.name : record.room_id })}
-        content={<>
-          <Typography sx={{ marginBottom: 2, whiteSpace: "pre-line"}}>{translate("resources.rooms.action.make_admin.content")}</Typography>
+        title={translate("resources.rooms.action.make_admin.title", {
+          roomName: record.name ? record.name : record.room_id,
+        })}
+        content={
+          <>
+            <Typography sx={{ marginBottom: 2, whiteSpace: "pre-line" }}>
+              {translate("resources.rooms.action.make_admin.content")}
+            </Typography>
             <TextField
               type="text"
               variant="filled"
@@ -182,23 +190,20 @@ export const MakeAdminBtn = () => {
               onKeyDown={handleKeyDown}
               label={"Matrix ID"}
             />
-        </>}
+          </>
+        }
       />
-  </>);
+    </>
+  );
 };
 
 export const RoomShow = (props: ShowProps) => {
   const translate = useTranslate();
-  const record = useRecordContext();
   return (
     <Show {...props} actions={<RoomShowActions />} title={<RoomTitle />}>
       <TabbedShowLayout>
         <Tab label="synapseadmin.rooms.tabs.basic" icon={<ViewListIcon />}>
-          <AvatarField
-            source="avatar"
-            sx={{ height: "120px", width: "120px" }}
-            label="resources.rooms.fields.avatar"
-          />
+          <AvatarField source="avatar" sx={{ height: "120px", width: "120px" }} label="resources.rooms.fields.avatar" />
           <RaTextField source="room_id" />
           <RaTextField source="name" />
           <RaTextField source="topic" />
@@ -301,7 +306,11 @@ export const RoomShow = (props: ShowProps) => {
             <Datagrid sx={{ width: "100%" }} bulkActionButtons={false}>
               <RaTextField source="type" sortable={false} />
               <DateField source="origin_server_ts" showTime options={DATE_FORMAT} sortable={false} />
-              <FunctionField source="content" sortable={false} render={record => `${JSON.stringify(record.content, null, 2)}`} />
+              <FunctionField
+                source="content"
+                sortable={false}
+                render={record => `${JSON.stringify(record.content, null, 2)}`}
+              />
               <ReferenceField source="sender" reference="users" sortable={false}>
                 <RaTextField source="id" />
               </ReferenceField>
@@ -373,9 +382,16 @@ export const RoomList = (props: ListProps) => {
         bulkActionButtons={<RoomBulkActionButtons />}
         omit={["joined_local_members", "state_events", "version", "federatable"]}
       >
-        <ReferenceField reference="rooms" source="id" label="resources.users.fields.avatar" link={false} sortable={false}>
+        <ReferenceField
+          reference="rooms"
+          source="id"
+          label="resources.users.fields.avatar"
+          link={false}
+          sortable={false}
+        >
           <AvatarField source="avatar" sx={{ height: "40px", width: "40px" }} />
         </ReferenceField>
+        <RaTextField source="id" label="resources.rooms.fields.room_id" sortable={false} />
         <WrapperField source="encryption" sortBy="is_encrypted" label="resources.rooms.fields.encryption">
           <BooleanField
             source="is_encrypted"
@@ -389,7 +405,15 @@ export const RoomList = (props: ListProps) => {
             }}
           />
         </WrapperField>
-        <FunctionField source="name" render={record => record["name"] || record["canonical_alias"] || record["id"]} label="resources.rooms.fields.name" />
+        <FunctionField
+          source="name"
+          sx={{
+            wordBreak: "break-word",
+            overflowWrap: "break-word",
+          }}
+          render={record => record["name"] || record["canonical_alias"] || record["id"]}
+          label="resources.rooms.fields.name"
+        />
         <RaTextField source="joined_members" label="resources.rooms.fields.joined_members" />
         <RaTextField source="joined_local_members" label="resources.rooms.fields.joined_local_members" />
         <RaTextField source="state_events" label="resources.rooms.fields.state_events" />

src/resources/user_media_statistics.tsx

@@ -1,6 +1,5 @@
 import PermMediaIcon from "@mui/icons-material/PermMedia";
 import {
-  Datagrid,
   DatagridConfigurable,
   ExportButton,
   List,

src/resources/users.tsx

@@ -1,19 +1,19 @@
 import AssignmentIndIcon from "@mui/icons-material/AssignmentInd";
 import ContactMailIcon from "@mui/icons-material/ContactMail";
 import DevicesIcon from "@mui/icons-material/Devices";
+import DocumentScannerIcon from "@mui/icons-material/DocumentScanner";
 import GetAppIcon from "@mui/icons-material/GetApp";
 import UserIcon from "@mui/icons-material/Group";
+import LockClockIcon from "@mui/icons-material/LockClock";
 import NotificationsIcon from "@mui/icons-material/Notifications";
 import PermMediaIcon from "@mui/icons-material/PermMedia";
 import PersonPinIcon from "@mui/icons-material/PersonPin";
-import SettingsInputComponentIcon from "@mui/icons-material/SettingsInputComponent";
 import ScienceIcon from "@mui/icons-material/Science";
-import LockClockIcon from '@mui/icons-material/LockClock';
+import SettingsInputComponentIcon from "@mui/icons-material/SettingsInputComponent";
 import ViewListIcon from "@mui/icons-material/ViewList";
-import DocumentScannerIcon from "@mui/icons-material/DocumentScanner";
-import { useEffect, useState } from "react";
 import { Alert, Typography } from "@mui/material";
 import { useTheme } from "@mui/material/styles";
+import { useEffect, useState } from "react";
 import {
   ArrayInput,
   ArrayField,
@@ -67,22 +67,23 @@ import {
   useCreate,
   useRedirect,
 } from "react-admin";
+import { useFormContext } from "react-hook-form";
 import { Link } from "react-router-dom";
 
+import { MakeAdminBtn } from "./rooms";
 import AvatarField from "../components/AvatarField";
 import DeleteUserButton from "../components/DeleteUserButton";
-import { isASManaged } from "../utils/mxid";
-import { ServerNoticeButton, ServerNoticeBulkButton } from "../components/ServerNotices";
-import { DATE_FORMAT } from "../utils/date";
 import DeviceRemoveButton from "../components/DeviceRemoveButton";
-import { MediaIDField, ProtectMediaButton, QuarantineMediaButton } from "../components/media";
-import { generateRandomPassword } from "../utils/password";
-import { useFormContext } from "react-hook-form";
 import ExperimentalFeaturesList from "../components/ExperimentalFeatures";
-import UserRateLimits from "../components/UserRateLimits";
-import { User, UsernameAvailabilityResult } from "../synapse/dataProvider";
-import { MakeAdminBtn } from "./rooms";
+import { ServerNoticeButton, ServerNoticeBulkButton } from "../components/ServerNotices";
 import UserAccountData from "../components/UserAccountData";
+import UserRateLimits from "../components/UserRateLimits";
+import { MediaIDField, ProtectMediaButton, QuarantineMediaButton } from "../components/media";
+import { User, UsernameAvailabilityResult } from "../synapse/dataProvider";
+import { DATE_FORMAT } from "../utils/date";
+import decodeURLComponent from "../utils/decodeURLComponent";
+import { isASManaged } from "../utils/mxid";
+import { generateRandomPassword } from "../utils/password";
 
 const choices_medium = [
   { id: "email", name: "resources.users.email" },
@@ -114,10 +115,15 @@ const userFilters = [
   <BooleanInput source="guests" alwaysOn />,
   <BooleanInput label="resources.users.fields.show_deactivated" source="deactivated" alwaysOn />,
   <BooleanInput label="resources.users.fields.show_locked" source="locked" alwaysOn />,
-  <BooleanInput label="resources.users.fields.show_suspended" source="suspended" alwaysOn />,
+  // waiting for https://github.com/element-hq/synapse/issues/18016
+  // <BooleanInput label="resources.users.fields.show_suspended" source="suspended" alwaysOn />,
 ];
 
-const UserPreventSelfDelete: React.FC<{ children: React.ReactNode; ownUserIsSelected: boolean; asManagedUserIsSelected: boolean }> = props => {
+const UserPreventSelfDelete: React.FC<{
+  children: React.ReactNode;
+  ownUserIsSelected: boolean;
+  asManagedUserIsSelected: boolean;
+}> = props => {
   const ownUserIsSelected = props.ownUserIsSelected;
   const asManagedUserIsSelected = props.asManagedUserIsSelected;
   const notify = useNotify();
@@ -166,24 +172,43 @@ export const UserList = (props: ListProps) => (
   <List
     {...props}
     filters={userFilters}
-    filterDefaultValues={{ guests: true, deactivated: false, locked: false, suspended: false }}
+    filterDefaultValues={{ guests: false, deactivated: false, locked: false, suspended: false }}
     sort={{ field: "name", order: "ASC" }}
     actions={<UserListActions />}
     pagination={<UserPagination />}
     perPage={50}
   >
     <DatagridConfigurable
-      rowClick={(id: Identifier, resource: string) => `/${resource}/${id}`}
+      rowClick={(id: Identifier, resource: string) => `/${resource}/${encodeURIComponent(id)}`}
       bulkActionButtons={<UserBulkActionButtons />}
     >
-      <AvatarField source="avatar_src" sx={{ height: "40px", width: "40px" }} sortBy="avatar_url" label="resources.users.fields.avatar" />
-      <TextField source="id" sortBy="name" label="resources.users.fields.id" />
-      <TextField source="displayname" label="resources.users.fields.displayname" />
+      <AvatarField
+        source="avatar_src"
+        sx={{ height: "40px", width: "40px" }}
+        sortBy="avatar_url"
+        label="resources.users.fields.avatar"
+      />
+      <TextField
+        source="id"
+        sx={{
+          wordBreak: "break-word",
+          overflowWrap: "break-word",
+        }}
+        sortBy="name"
+        label="resources.users.fields.id"
+      />
+      <TextField
+        source="displayname"
+        sx={{
+          wordBreak: "break-word",
+          overflowWrap: "break-word",
+        }}
+        label="resources.users.fields.displayname"
+      />
       <BooleanField source="is_guest" label="resources.users.fields.is_guest" />
       <BooleanField source="admin" label="resources.users.fields.admin" />
       <BooleanField source="deactivated" label="resources.users.fields.deactivated" />
       <BooleanField source="locked" label="resources.users.fields.locked" />
-      <BooleanField source="suspended" label="resources.users.fields.suspended" />
       <BooleanField source="erased" sortable={false} label="resources.users.fields.erased" />
       <DateField source="creation_ts" label="resources.users.fields.creation_ts_ms" showTime options={DATE_FORMAT} />
     </DatagridConfigurable>
@@ -194,13 +219,12 @@ export const UserList = (props: ListProps) => (
 // here only local part of user_id
 // maxLength = 255 - "@" - ":" - storage.getItem("home_server").length
 // storage.getItem("home_server").length is not valid here
-const validateUser = [required(), maxLength(253), regex(/^[a-z0-9._=\-\+/]+$/, "synapseadmin.users.invalid_user_id")];
+const validateUser = [required(), maxLength(253), regex(/^[a-z0-9._=\-+/]+$/, "synapseadmin.users.invalid_user_id")];
 
 const validateAddress = [required(), maxLength(255)];
 
 const UserEditActions = () => {
   const record = useRecordContext();
-  const translate = useTranslate();
   const ownUserId = localStorage.getItem("user_id");
   let ownUserIsSelected = false;
   let asManagedUserIsSelected = false;
@@ -234,7 +258,10 @@ export const UserCreate = (props: CreateProps) => {
 
   const [open, setOpen] = useState(false);
   const [userIsAvailable, setUserIsAvailable] = useState<boolean | undefined>();
-  const [userAvailabilityEl, setUserAvailabilityEl] = useState<React.ReactElement | false>(<Typography component="span"></Typography>);
+  const [userAvailabilityEl, setUserAvailabilityEl] = useState<React.ReactElement | false>(
+    <Typography component="span"></Typography>
+  );
+  /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
   const [formData, setFormData] = useState<Record<string, any>>({});
   const [create] = useCreate();
 
@@ -243,12 +270,21 @@ export const UserCreate = (props: CreateProps) => {
     const result: UsernameAvailabilityResult = await dataProvider.checkUsernameAvailability(username);
     setUserIsAvailable(!!result?.available);
     if (result?.available) {
-      setUserAvailabilityEl(<Typography component="span" variant="body2" sx={{ color: theme.palette.success.main }}>✔️ {translate("resources.users.helper.username_available")}</Typography>);
+      setUserAvailabilityEl(
+        <Typography component="span" variant="body2" sx={{ color: theme.palette.success.main }}>
+          ✔️ {translate("resources.users.helper.username_available")}
+        </Typography>
+      );
     } else {
-      setUserAvailabilityEl(<Typography component="span" variant="body2" sx={{ color:  theme.palette.warning.main }}>⚠️ {result?.error || "unknown error"}</Typography>);
+      setUserAvailabilityEl(
+        <Typography component="span" variant="body2" sx={{ color: theme.palette.warning.main }}>
+          ⚠️ {result?.error || "unknown error"}
+        </Typography>
+      );
     }
   };
 
+  /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
   const postSave = (data: Record<string, any>) => {
     setFormData(data);
     if (!userIsAvailable) {
@@ -256,12 +292,18 @@ export const UserCreate = (props: CreateProps) => {
       return;
     }
 
-    create("users", { data: data }, {
+    create(
+      "users",
+      { data: data },
+      {
         onSuccess: (resource: User) => {
           notify("ra.notification.created", { messageArgs: { smart_count: 1 } });
-        redirect(() => { return `users/${resource.id}` });
-      }
+          redirect(() => {
+            return `users/${encodeURIComponent(resource.id as string)}`;
           });
+        },
+      }
+    );
   };
 
   const handleConfirm = () => {
@@ -274,21 +316,30 @@ export const UserCreate = (props: CreateProps) => {
   };
 
   const updateUser = () => {
-    create("users", { data: formData }, {
+    create(
+      "users",
+      { data: formData },
+      {
         onSuccess: (resource: User) => {
           notify("ra.notification.updated", { messageArgs: { smart_count: 1 } });
-        redirect(() => { return `users/${resource.id}` });
-      }
+          redirect(() => {
+            return `users/${encodeURIComponent(resource.id as string)}`;
           });
+        },
       }
+    );
+  };
 
-  return <Create
-    {...props}
-  >
-    <SimpleForm
-      onSubmit={postSave}
-    >
-      <TextInput source="id" autoComplete="off" validate={validateUser} onBlur={checkAvailability} helperText={userAvailabilityEl}/>
+  return (
+    <Create {...props}>
+      <SimpleForm onSubmit={postSave}>
+        <TextInput
+          source="id"
+          autoComplete="off"
+          validate={validateUser}
+          onBlur={checkAvailability}
+          helperText={userAvailabilityEl}
+        />
         <TextInput source="displayname" validate={maxLength(256)} />
         <UserPasswordInput source="password" autoComplete="new-password" helperText="resources.users.helper.password" />
         <SelectInput source="user_type" choices={choices_type} translateChoice={false} resettable />
@@ -316,6 +367,7 @@ export const UserCreate = (props: CreateProps) => {
         cancel="resources.users.action.overwrite_cancel"
       />
     </Create>
+  );
 };
 
 const UserTitle = () => {
@@ -325,7 +377,7 @@ const UserTitle = () => {
     return null;
   }
 
-  let username = record ? (record.displayname ? `"${record.displayname}"` : `"${record.name}"`) : ""
+  const username = record ? (record.displayname ? `"${record.displayname}"` : `"${record.name}"`) : "";
   return (
     <span>
       {translate("resources.users.name", {
@@ -351,7 +403,10 @@ const UserEditToolbar = () => {
       <div className={ToolbarClasses.defaultToolbar}>
         <Toolbar sx={{ justifyContent: "space-between" }}>
           <SaveButton />
-          <UserPreventSelfDelete ownUserIsSelected={ownUserIsSelected} asManagedUserIsSelected={asManagedUserIsSelected}>
+          <UserPreventSelfDelete
+            ownUserIsSelected={ownUserIsSelected}
+            asManagedUserIsSelected={asManagedUserIsSelected}
+          >
             <DeleteButton />
           </UserPreventSelfDelete>
         </Toolbar>
@@ -372,7 +427,7 @@ const UserBooleanInput = props => {
 
   return (
     <UserPreventSelfDelete ownUserIsSelected={ownUserIsSelected} asManagedUserIsSelected={asManagedUserIsSelected}>
-      <BooleanInput {...props} disabled={ownUserIsSelected || asManagedUserIsSelected} />
+      <BooleanInput disabled={ownUserIsSelected || asManagedUserIsSelected} {...props} />
     </UserPreventSelfDelete>
   );
 };
@@ -380,6 +435,7 @@ const UserBooleanInput = props => {
 const UserPasswordInput = props => {
   const record = useRecordContext();
   let asManagedUserIsSelected = false;
+  const translate = useTranslate();
 
   // Get form context to update field value
   const form = useFormContext();
@@ -392,9 +448,36 @@ const UserPasswordInput = props => {
     form.setValue("password", password, { shouldDirty: true });
   };
 
+  // Get the current deactivated state and the original value
+  const deactivated = form.watch("deactivated");
+  const deactivatedFromRecord = record?.deactivated;
+
+  // Custom validation for reactivation case
+  const validatePasswordOnReactivation = value => {
+    if (deactivatedFromRecord === true && deactivated === false && !value) {
+      return translate("resources.users.helper.password_required_for_reactivation");
+    }
+    return undefined;
+  };
+
+  let passwordHelperText = "resources.users.helper.create_password";
+
+  if (asManagedUserIsSelected) {
+    passwordHelperText = "resources.users.helper.modify_managed_user_error";
+  } else if (deactivatedFromRecord === true && deactivated === false) {
+    passwordHelperText = "resources.users.helper.password_required_for_reactivation";
+  } else if (record) {
+    passwordHelperText = "resources.users.helper.password";
+  }
+
   return (
     <>
-      <PasswordInput {...props} helperText={asManagedUserIsSelected ? "resources.users.helper.modify_managed_user_error" : (record ? "resources.users.helper.password" : "resources.users.helper.create_password")} disabled={asManagedUserIsSelected} />
+      <PasswordInput
+        {...props}
+        validate={validatePasswordOnReactivation}
+        helperText={passwordHelperText}
+        disabled={asManagedUserIsSelected}
+      />
       <Button
         variant="outlined"
         label="resources.users.action.generate_password"
@@ -406,15 +489,41 @@ const UserPasswordInput = props => {
   );
 };
 
+const ErasedBooleanInput = props => {
+  const record = useRecordContext();
+  const form = useFormContext();
+  const deactivated = form.watch("deactivated");
+  const erased = form.watch("erased");
+
+  const erasedFromRecord = record?.erased;
+  const deactivatedFromRecord = record?.deactivated;
+
+  useEffect(() => {
+    // If the user was erased and deactivated, by unchecking Erased, we want to also uncheck Deactivated
+    if (erasedFromRecord === true && erased === false) {
+      form.setValue("deactivated", false);
+    }
+  }, [deactivatedFromRecord, erased, erasedFromRecord]);
+
+  return <UserBooleanInput disabled={!deactivated} {...props} />;
+};
+
 export const UserEdit = (props: EditProps) => {
   const translate = useTranslate();
+  const theme = useTheme();
 
   return (
-    <Edit {...props} title={<UserTitle />} actions={<UserEditActions />} mutationMode="pessimistic" queryOptions={{
+    <Edit
+      {...props}
+      title={<UserTitle />}
+      actions={<UserEditActions />}
+      mutationMode="pessimistic"
+      queryOptions={{
         meta: {
-        include: ["features"] // Tell your dataProvider to include features
-      }
-    }}>
+          include: ["features"], // Tell your dataProvider to include features
+        },
+      }}
+    >
       <TabbedForm toolbar={<UserEditToolbar />}>
         <FormTab label={translate("resources.users.name", { smart_count: 1 })} icon={<PersonPinIcon />}>
           <AvatarField source="avatar_src" sx={{ height: "120px", width: "120px" }} />
@@ -424,23 +533,45 @@ export const UserEdit = (props: EditProps) => {
             label="resources.users.fields.avatar"
             accept={{ "image/*": [".png", ".jpg"] }}
           >
-            <ImageField source="src" title="Avatar" sx={{ '& img': {
+            <ImageField
+              source="src"
+              title="Avatar"
+              sx={{
+                "& img": {
                   width: "120px !important",
                   height: "120px !important",
                   objectFit: "cover !important",
-              borderRadius: '50% !important',
-            }}} />
+                  borderRadius: "50% !important",
+                },
+              }}
+            />
           </ImageInput>
           <TextInput source="id" readOnly />
           <TextInput source="displayname" />
-          <UserPasswordInput source="password" autoComplete="new-password" helperText="resources.users.helper.password" />
+          <UserPasswordInput
+            source="password"
+            autoComplete="new-password"
+            helperText="resources.users.helper.password"
+          />
           <SelectInput source="user_type" choices={choices_type} translateChoice={false} resettable />
-          <BooleanInput source="admin" />
-          <UserBooleanInput source="locked" />
-          <UserBooleanInput source="deactivated" helperText="resources.users.helper.deactivate" />
+          <BooleanInput source="admin" helperText="resources.users.helper.admin" />
           <UserBooleanInput source="suspended" helperText="resources.users.helper.suspend" />
-          <BooleanInput source="erased" disabled />
-          <DateField source="creation_ts_ms" showTime options={DATE_FORMAT} />
+          <UserBooleanInput
+            sx={{ color: theme.palette.warning.main }}
+            source="locked"
+            helperText="resources.users.helper.lock"
+          />
+          <UserBooleanInput
+            sx={{ color: theme.palette.error.main }}
+            source="deactivated"
+            helperText="resources.users.helper.deactivate"
+          />
+          <ErasedBooleanInput
+            sx={{ color: theme.palette.error.main, marginLeft: "25px" }}
+            source="erased"
+            helperText="resources.users.helper.erase"
+          />
+          <DateField sx={{ marginTop: "20px" }} source="creation_ts_ms" showTime options={DATE_FORMAT} />
           <TextField source="consent_version" />
         </FormTab>
 
@@ -496,7 +627,7 @@ export const UserEdit = (props: EditProps) => {
             target="user_id"
             label={false}
             pagination={<UserPagination />}
-            perPage={50}
+            perPage={10}
             sort={{ field: "created_ts", order: "DESC" }}
           >
             <Datagrid sx={{ width: "100%" }} bulkActionButtons={<BulkDeleteButton />}>
@@ -505,7 +636,10 @@ export const UserEdit = (props: EditProps) => {
               <DateField source="last_access_ts" showTime options={DATE_FORMAT} />
               <NumberField source="media_length" />
               <TextField source="media_type" sx={{ display: "block", width: 200, wordBreak: "break-word" }} />
-              <FunctionField source="upload_name" render={record => decodeURIComponent(record.upload_name)} />
+              <FunctionField
+                source="upload_name"
+                render={record => (record.upload_name ? decodeURLComponent(record.upload_name) : "")}
+              />
               <TextField source="quarantined_by" />
               <QuarantineMediaButton label="resources.quarantine_media.action.name" />
               <ProtectMediaButton label="resources.users_media.fields.safe_from_quarantine" />
@@ -515,19 +649,45 @@ export const UserEdit = (props: EditProps) => {
         </FormTab>
 
         <FormTab label={translate("resources.rooms.name", { smart_count: 2 })} icon={<ViewListIcon />} path="rooms">
-          <ReferenceManyField reference="joined_rooms" target="user_id" label={false}>
+          <ReferenceManyField
+            reference="joined_rooms"
+            target="user_id"
+            label={false}
+            perPage={10}
+            pagination={<Pagination />}
+          >
             <Datagrid sx={{ width: "100%" }} rowClick={id => "/rooms/" + id + "/show"} bulkActionButtons={false}>
               <ReferenceField reference="rooms" source="id" label={false} link={false} sortable={false}>
                 <AvatarField source="avatar" sx={{ height: "40px", width: "40px" }} />
               </ReferenceField>
               <TextField source="id" label="resources.rooms.fields.room_id" sortable={false} />
-                <ReferenceField reference="rooms" source="id" label="resources.rooms.fields.name" link={false} sortable={false}>
-                  <TextField source="name" />
+              <ReferenceField
+                reference="rooms"
+                source="id"
+                label="resources.rooms.fields.name"
+                link={false}
+                sortable={false}
+              >
+                <TextField
+                  source="name"
+                  sx={{
+                    wordBreak: "break-word",
+                    overflowWrap: "break-word",
+                  }}
+                />
               </ReferenceField>
-                <ReferenceField reference="rooms" source="id" label="resources.rooms.fields.joined_members" link={false} sortable={false}>
+              <ReferenceField
+                reference="rooms"
+                source="id"
+                label="resources.rooms.fields.joined_members"
+                link={false}
+                sortable={false}
+              >
                 <TextField source="joined_members" sortable={false} />
               </ReferenceField>
+              <ReferenceField reference="rooms" source="id" label={false} link={false} sortable={false}>
                 <MakeAdminBtn />
+              </ReferenceField>
             </Datagrid>
           </ReferenceManyField>
         </FormTab>

src/synapse/authProvider.test.ts

@@ -1,7 +1,7 @@
 import fetchMock from "jest-fetch-mock";
+import { HttpError } from "ra-core";
 
 import authProvider from "./authProvider";
-import { HttpError } from "ra-core";
 
 fetchMock.enableMocks();
 
@@ -35,6 +35,7 @@ describe("authProvider", () => {
           Accept: "application/json",
           "Content-Type": "application/json",
         }),
+        credentials: "same-origin",
         method: "POST",
       });
       expect(localStorage.getItem("base_url")).toEqual("http://example.com");
@@ -66,6 +67,7 @@ describe("authProvider", () => {
         Accept: "application/json",
         "Content-Type": "application/json",
       }),
+      credentials: "same-origin",
       method: "POST",
     });
     expect(localStorage.getItem("base_url")).toEqual("https://example.com");
@@ -85,9 +87,11 @@ describe("authProvider", () => {
       expect(fetch).toHaveBeenCalledWith("example.com/_matrix/client/v3/logout", {
         headers: new Headers({
           Accept: "application/json",
+          "Content-Type": "application/json",
           Authorization: "Bearer foo",
         }),
         method: "POST",
+        credentials: "same-origin",
         user: { authenticated: true, token: "Bearer foo" },
       });
       expect(localStorage.getItem("access_token")).toBeNull();
@@ -100,11 +104,15 @@ describe("authProvider", () => {
     });
 
     it("should reject if error.status is 401", async () => {
-      await expect(authProvider.checkError(new HttpError("test-error", 401, {errcode: "test-errcode", error: "test-error"}))).rejects.toBeDefined();
+      await expect(
+        authProvider.checkError(new HttpError("test-error", 401, { errcode: "test-errcode", error: "test-error" }))
+      ).rejects.toBeDefined();
     });
 
     it("should reject if error.status is 403", async () => {
-      await expect(authProvider.checkError(new HttpError("test-error", 403, {errcode: "test-errcode", error: "test-error"}))).rejects.toBeDefined();
+      await expect(
+        authProvider.checkError(new HttpError("test-error", 403, { errcode: "test-errcode", error: "test-error" }))
+      ).rejects.toBeDefined();
     });
   });
 

src/synapse/authProvider.ts

@@ -1,8 +1,9 @@
 import { AuthProvider, HttpError, Options, fetchUtils } from "react-admin";
 
+import { FetchConfig, ClearConfig, GetConfig } from "../utils/config";
+import decodeURLComponent from "../utils/decodeURLComponent";
 import { MatrixError, displayError } from "../utils/error";
 import { fetchAuthenticatedMedia } from "../utils/fetchMedia";
-import { FetchConfig, ClearConfig } from "../utils/config";
 
 const authProvider: AuthProvider = {
   // called when the user attempts to log in
@@ -22,6 +23,11 @@ const authProvider: AuthProvider = {
     console.log("login ");
     let options: Options = {
       method: "POST",
+      credentials: GetConfig().corsCredentials as RequestCredentials,
+      headers: new Headers({
+        Accept: "application/json",
+        "Content-Type": "application/json",
+      }),
       body: JSON.stringify(
         Object.assign(
           {
@@ -51,14 +57,15 @@ const authProvider: AuthProvider = {
     if (!base_url) {
       // there is some kind of bug with base_url being present in the form, but not submitted
       // ref: https://github.com/etkecc/synapse-admin/issues/14
-      localStorage.removeItem("base_url")
+      localStorage.removeItem("base_url");
       throw new Error("Homeserver URL is required.");
     }
     base_url = base_url.replace(/\/+$/g, "");
     localStorage.setItem("base_url", base_url);
 
-    const decoded_base_url = window.decodeURIComponent(base_url);
-    let login_api_url = decoded_base_url + (accessToken ? "/_matrix/client/v3/account/whoami" : "/_matrix/client/v3/login");
+    const decoded_base_url = decodeURLComponent(base_url);
+    const login_api_url =
+      decoded_base_url + (accessToken ? "/_matrix/client/v3/account/whoami" : "/_matrix/client/v3/login");
 
     let response;
 
@@ -67,7 +74,7 @@ const authProvider: AuthProvider = {
         // this a login with an already obtained access token, let's just validate it
         options = {
           headers: new Headers({
-            Accept: 'application/json',
+            Accept: "application/json",
             Authorization: `Bearer ${accessToken}`,
           }),
         };
@@ -80,21 +87,25 @@ const authProvider: AuthProvider = {
       localStorage.setItem("access_token", accessToken ? accessToken : json.access_token);
       localStorage.setItem("device_id", json.device_id);
       localStorage.setItem("login_type", accessToken ? "accessToken" : "credentials");
-      await FetchConfig();
 
-      return Promise.resolve({redirectTo: "/"});
+      await FetchConfig();
+      const config = GetConfig();
+      let pageToRedirectTo = "/";
+
+      if (config && config.etkeccAdmin) {
+        pageToRedirectTo = "/server_status";
+      }
+
+      return Promise.resolve({ redirectTo: pageToRedirectTo });
     } catch (err) {
       const error = err as HttpError;
       const errorStatus = error.status;
       const errorBody = error.body as MatrixError;
-      const errMsg = !!errorBody?.errcode ? displayError(errorBody.errcode, errorStatus, errorBody.error) : displayError("M_INVALID", errorStatus, error.message);
+      const errMsg = errorBody?.errcode
+        ? displayError(errorBody.errcode, errorStatus, errorBody.error)
+        : displayError("M_INVALID", errorStatus, error.message);
 
-      return Promise.reject(
-        new HttpError(
-          errMsg,
-          errorStatus,
-        )
-      );
+      return Promise.reject(new HttpError(errMsg, errorStatus));
     }
   },
   getIdentity: async () => {
@@ -143,6 +154,11 @@ const authProvider: AuthProvider = {
 
     const options: Options = {
       method: "POST",
+      credentials: GetConfig().corsCredentials as RequestCredentials,
+      headers: new Headers({
+        Accept: "application/json",
+        "Content-Type": "application/json",
+      }),
       user: {
         authenticated: true,
         token: `Bearer ${access_token}`,
@@ -174,8 +190,6 @@ const authProvider: AuthProvider = {
     const access_token = localStorage.getItem("access_token");
     return typeof access_token === "string" ? Promise.resolve() : Promise.reject();
   },
-  // called when the user navigates to a new location, to check for permissions / roles
-  getPermissions: () => Promise.resolve(),
 };
 
 export default authProvider;

src/synapse/dataProvider.ts

@@ -13,13 +13,18 @@ import {
   withLifecycleCallbacks,
 } from "react-admin";
 
-import { returnMXID } from "../utils/mxid";
+import { GetConfig } from "../utils/config";
 import { MatrixError, displayError } from "../utils/error";
+import { returnMXID } from "../utils/mxid";
+
+/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+const CACHED_MANY_REF: Record<string, any> = {};
 
 // Adds the access token to all requests
 const jsonClient = async (url: string, options: Options = {}) => {
   const token = localStorage.getItem("access_token");
   console.log("httpClient " + url);
+  options.credentials = GetConfig().corsCredentials as RequestCredentials;
   if (token !== null) {
     options.user = {
       authenticated: true,
@@ -29,11 +34,11 @@ const jsonClient = async (url: string, options: Options = {}) => {
   try {
     const response = await fetchUtils.fetchJson(url, options);
     return response;
-  } catch (err: any) {
+  } catch (err) {
     const error = err as HttpError;
     const errorStatus = error.status;
     const errorBody = error.body as MatrixError;
-    const errMsg = !!errorBody?.errcode
+    const errMsg = errorBody?.errcode
       ? displayError(errorBody.errcode, errorStatus, errorBody.error)
       : displayError("M_INVALID", errorStatus, error.message);
 
@@ -41,16 +46,11 @@ const jsonClient = async (url: string, options: Options = {}) => {
   }
 };
 
+/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
 const filterUndefined = (obj: Record<string, any>) => {
-  return Object.fromEntries(Object.entries(obj).filter(([key, value]) => value !== undefined));
+  return Object.fromEntries(Object.entries(obj).filter(([_key, value]) => value !== undefined));
 };
 
-interface Action {
-  endpoint: string;
-  method?: string;
-  body?: Record<string, any>;
-}
-
 export interface Room {
   room_id: string;
   name?: string;
@@ -250,9 +250,7 @@ export interface UploadMediaResult {
 }
 
 export interface ExperimentalFeaturesModel {
-  features: {
-    [key: string]: boolean;
-  };
+  features: Record<string, boolean>;
 }
 
 export interface RateLimitsModel {
@@ -262,14 +260,10 @@ export interface RateLimitsModel {
 
 export interface AccountDataModel {
   account_data: {
-    global: {
-      [key: string]: object;
-    },
-    rooms: {
-      [key: string]: object;
+    global: Record<string, object>;
+    rooms: Record<string, object>;
   };
 }
-}
 
 export interface UsernameAvailabilityResult {
   available?: boolean;
@@ -287,7 +281,7 @@ export interface ServerStatusComponent {
     url: string;
     icon: string;
     text: string;
-  }
+  };
 }
 
 export interface ServerStatusResponse {
@@ -298,8 +292,8 @@ export interface ServerStatusResponse {
 }
 
 export interface ServerProcessResponse {
-  locked_at?: string;
-  command?: string;
+  locked_at: string;
+  command: string;
 }
 
 export interface ServerNotification {
@@ -313,6 +307,46 @@ export interface ServerNotificationsResponse {
   notifications: ServerNotification[];
 }
 
+export interface ServerCommand {
+  icon: string;
+  name: string;
+  description: string;
+  args: boolean;
+  with_lock: boolean;
+  additionalArgs?: string;
+}
+
+export type ServerCommandsResponse = Record<string, ServerCommand>;
+
+export interface ScheduledCommand {
+  args: string;
+  command: string;
+  id: string;
+  is_recurring: boolean;
+  scheduled_at: string;
+}
+
+export interface RecurringCommand {
+  args: string;
+  command: string;
+  id: string;
+  scheduled_at: string;
+  time: string;
+}
+
+export interface Payment {
+  amount: number;
+  email: string;
+  is_subscription: boolean;
+  paid_at: string;
+  transaction_id: string;
+}
+
+export interface PaymentsResponse {
+  payments: Payment[];
+  total: number;
+}
+
 export interface SynapseDataProvider extends DataProvider {
   deleteMedia: (params: DeleteMediaParams) => Promise<DeleteMediaResult>;
   purgeRemoteMedia: (params: DeleteMediaParams) => Promise<DeleteMediaResult>;
@@ -323,10 +357,26 @@ export interface SynapseDataProvider extends DataProvider {
   getAccountData: (id: Identifier) => Promise<AccountDataModel>;
   checkUsernameAvailability: (username: string) => Promise<UsernameAvailabilityResult>;
   makeRoomAdmin: (room_id: string, user_id: string) => Promise<{ success: boolean; error?: string; errcode?: string }>;
+  suspendUser: (
+    id: Identifier,
+    suspendValue: boolean
+  ) => Promise<{ success: boolean; error?: string; errcode?: string }>;
+  eraseUser: (id: Identifier) => Promise<{ success: boolean; error?: string; errcode?: string }>;
   getServerRunningProcess: (etkeAdminUrl: string) => Promise<ServerProcessResponse>;
   getServerStatus: (etkeAdminUrl: string) => Promise<ServerStatusResponse>;
   getServerNotifications: (etkeAdminUrl: string) => Promise<ServerNotificationsResponse>;
   deleteServerNotifications: (etkeAdminUrl: string) => Promise<{ success: boolean }>;
+  getServerCommands: (etkeAdminUrl: string) => Promise<ServerCommandsResponse>;
+  getScheduledCommands: (etkeAdminUrl: string) => Promise<ScheduledCommand[]>;
+  getRecurringCommands: (etkeAdminUrl: string) => Promise<RecurringCommand[]>;
+  createScheduledCommand: (etkeAdminUrl: string, command: Partial<ScheduledCommand>) => Promise<ScheduledCommand>;
+  updateScheduledCommand: (etkeAdminUrl: string, command: ScheduledCommand) => Promise<ScheduledCommand>;
+  deleteScheduledCommand: (etkeAdminUrl: string, id: string) => Promise<{ success: boolean }>;
+  createRecurringCommand: (etkeAdminUrl: string, command: Partial<RecurringCommand>) => Promise<RecurringCommand>;
+  updateRecurringCommand: (etkeAdminUrl: string, command: RecurringCommand) => Promise<RecurringCommand>;
+  deleteRecurringCommand: (etkeAdminUrl: string, id: string) => Promise<{ success: boolean }>;
+  getPayments: (etkeAdminUrl: string) => Promise<PaymentsResponse>;
+  getInvoice: (etkeAdminUrl: string, transactionId: string) => Promise<void>;
 }
 
 const resourceMap = {
@@ -673,13 +723,14 @@ const baseDataProvider: SynapseDataProvider = {
     const res = resourceMap[resource];
 
     const endpoint_url = base_url + res.path;
-    const responses = await Promise.all(params.ids.map(id => {
+    const responses = await Promise.all(
+      params.ids.map(id => {
         // edge case: when user is external / federated, homeserver will return error, as querying external users via
         // /_synapse/admin/v2/users is not allowed.
         // That leads to an issue when a user is referenced (e.g., in room state datagrid) - the user cell is just empty.
         // To avoid that, we fake the response with one specific field (name) which is used in the datagrid.
         if (homeserver && resource === "users") {
-        if (!(<string>id).endsWith(homeserver)) {
+          if (!(id as string).endsWith(homeserver)) {
             const json = {
               name: id,
             };
@@ -687,7 +738,8 @@ const baseDataProvider: SynapseDataProvider = {
           }
         }
         return jsonClient(`${endpoint_url}/${encodeURIComponent(id)}`);
-    }));
+      })
+    );
     return {
       data: responses.map(({ json }) => res.map(json)),
       total: responses.length,
@@ -712,12 +764,29 @@ const baseDataProvider: SynapseDataProvider = {
     const res = resourceMap[resource];
 
     const ref = res.reference(params.id);
-    const endpoint_url = `${homeserver}${ref.endpoint}?${new URLSearchParams(filterUndefined(query)).toString()}`;
 
+    const endpoint_url = `${homeserver}${ref.endpoint}?${new URLSearchParams(filterUndefined(query)).toString()}`;
+    const CACHE_KEY = ref.endpoint;
+    let jsonData = [];
+    let total = 0;
+
+    if (CACHED_MANY_REF[CACHE_KEY]) {
+      jsonData = CACHED_MANY_REF[CACHE_KEY]["data"].slice(from, from + perPage);
+      total = CACHED_MANY_REF[CACHE_KEY]["total"];
+    } else {
       const { json } = await jsonClient(endpoint_url);
+      jsonData = json[res.data];
+      total = res.total(json, from, perPage);
+      if (resource === "joined_rooms") {
+        // cache will be applied only for joined_rooms
+        CACHED_MANY_REF[CACHE_KEY] = { data: jsonData, total: total };
+        jsonData = jsonData.slice(from, from + perPage);
+      }
+    }
+
     return {
-      data: json[res.data].map(res.map),
-      total: res.total(json, from, perPage),
+      data: jsonData.map(res.map),
+      total: total,
     };
   },
 
@@ -729,6 +798,7 @@ const baseDataProvider: SynapseDataProvider = {
     const res = resourceMap[resource];
 
     const endpoint_url = homeserver + res.path;
+
     const { json } = await jsonClient(`${endpoint_url}/${encodeURIComponent(params.id)}`, {
       method: "PUT",
       body: JSON.stringify(params.data, filterNullValues),
@@ -930,9 +1000,9 @@ const baseDataProvider: SynapseDataProvider = {
     return json as AccountDataModel;
   },
   setRateLimits: async (id: Identifier, rateLimits: RateLimitsModel) => {
-    const filtered = Object.entries(rateLimits).
-      filter(([key, value]) => value !== null && value !== undefined).
-      reduce((obj, [key, value]) => {
+    const filtered = Object.entries(rateLimits)
+      .filter(([_key, value]) => value !== null && value !== undefined)
+      .reduce((obj, [key, value]) => {
         obj[key] = value;
         return obj;
       }, {});
@@ -941,7 +1011,7 @@ const baseDataProvider: SynapseDataProvider = {
     const endpoint_url = `${base_url}/_synapse/admin/v1/users/${encodeURIComponent(returnMXID(id))}/override_ratelimit`;
     if (Object.keys(filtered).length === 0) {
       await jsonClient(endpoint_url, { method: "DELETE" });
-      return
+      return;
     }
 
     await jsonClient(endpoint_url, { method: "POST", body: JSON.stringify(filtered) });
@@ -964,7 +1034,7 @@ const baseDataProvider: SynapseDataProvider = {
 
     const endpoint_url = `${base_url}/_synapse/admin/v1/rooms/${encodeURIComponent(room_id)}/make_room_admin`;
     try {
-      const { json } = await jsonClient(endpoint_url, { method: "POST", body: JSON.stringify({ user_id }) });
+      await jsonClient(endpoint_url, { method: "POST", body: JSON.stringify({ user_id }) });
       return { success: true };
     } catch (error) {
       if (error instanceof HttpError) {
@@ -973,15 +1043,52 @@ const baseDataProvider: SynapseDataProvider = {
       throw error;
     }
   },
-  getServerRunningProcess: async (runningProcessUrl: string): Promise<ServerProcessResponse> => {
+  suspendUser: async (id: Identifier, suspendValue: boolean) => {
+    const base_url = localStorage.getItem("base_url");
+    const endpoint_url = `${base_url}/_synapse/admin/v1/suspend/${encodeURIComponent(returnMXID(id))}`;
+    try {
+      await jsonClient(endpoint_url, {
+        method: "PUT",
+        body: JSON.stringify({ suspend: suspendValue }),
+      });
+      return { success: true };
+    } catch (error) {
+      if (error instanceof HttpError) {
+        return { success: false, error: error.body.error, errcode: error.body.errcode };
+      }
+      throw error;
+    }
+  },
+  eraseUser: async (id: Identifier) => {
+    const base_url = localStorage.getItem("base_url");
+    const endpoint_url = `${base_url}/_synapse/admin/v1/deactivate/${encodeURIComponent(returnMXID(id))}`;
+    try {
+      await jsonClient(endpoint_url, {
+        method: "POST",
+        body: JSON.stringify({ erase: true }),
+      });
+      return { success: true };
+    } catch (error) {
+      if (error instanceof HttpError) {
+        return { success: false, error: error.body.error, errcode: error.body.errcode };
+      }
+      throw error;
+    }
+  },
+  getServerRunningProcess: async (etkeAdminUrl: string, burstCache = false): Promise<ServerProcessResponse> => {
     const locked_at = "";
     const command = "";
 
-    try {
-      const response = await fetch(`${runningProcessUrl}/lock`, {
-        headers: {
-          "Authorization": `Bearer ${localStorage.getItem("access_token")}`
+    let serverURL = `${etkeAdminUrl}/lock`;
+    if (burstCache) {
+      serverURL += `?time=${new Date().getTime()}`;
     }
+
+    try {
+      const response = await fetch(serverURL, {
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
       });
 
       if (!response.ok) {
@@ -1003,12 +1110,17 @@ const baseDataProvider: SynapseDataProvider = {
 
     return { locked_at, command };
   },
-  getServerStatus: async (serverStatusUrl: string): Promise<ServerStatusResponse> => {
-    try {
-      const response = await fetch(`${serverStatusUrl}/status`, {
-        headers: {
-          "Authorization": `Bearer ${localStorage.getItem("access_token")}`
+  getServerStatus: async (etkeAdminUrl: string, burstCache = false): Promise<ServerStatusResponse> => {
+    let serverURL = `${etkeAdminUrl}/status`;
+    if (burstCache) {
+      serverURL += `?time=${new Date().getTime()}`;
     }
+
+    try {
+      const response = await fetch(serverURL, {
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
       });
       if (!response.ok) {
         console.error(`Error getting server status: ${response.status} ${response.statusText}`);
@@ -1027,12 +1139,20 @@ const baseDataProvider: SynapseDataProvider = {
 
     return { success: false, ok: false, host: "", results: [] };
   },
-  getServerNotifications: async (serverNotificationsUrl: string): Promise<ServerNotificationsResponse> => {
-    try {
-      const response = await fetch(`${serverNotificationsUrl}/notifications`, {
-        headers: {
-          "Authorization": `Bearer ${localStorage.getItem("access_token")}`
+  getServerNotifications: async (
+    serverNotificationsUrl: string,
+    burstCache = false
+  ): Promise<ServerNotificationsResponse> => {
+    let serverURL = `${serverNotificationsUrl}/notifications`;
+    if (burstCache) {
+      serverURL += `?time=${new Date().getTime()}`;
     }
+
+    try {
+      const response = await fetch(serverURL, {
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
       });
       if (!response.ok) {
         console.error(`Error getting server notifications: ${response.status} ${response.statusText}`);
@@ -1061,9 +1181,9 @@ const baseDataProvider: SynapseDataProvider = {
     try {
       const response = await fetch(`${serverNotificationsUrl}/notifications`, {
         headers: {
-          "Authorization": `Bearer ${localStorage.getItem("access_token")}`
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
         },
-        method: "DELETE"
+        method: "DELETE",
       });
       if (!response.ok) {
         console.error(`Error deleting server notifications: ${response.status} ${response.statusText}`);
@@ -1072,7 +1192,7 @@ const baseDataProvider: SynapseDataProvider = {
 
       const status = response.status;
       if (status === 204) {
-        const result = { success: true }
+        const result = { success: true };
         return result;
       }
     } catch (error) {
@@ -1080,7 +1200,359 @@ const baseDataProvider: SynapseDataProvider = {
     }
 
     return { success: false };
+  },
+  getServerCommands: async (serverCommandsUrl: string) => {
+    try {
+      const response = await fetch(`${serverCommandsUrl}/commands`, {
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
+      });
+      if (!response.ok) {
+        console.error(`Error fetching server commands: ${response.status} ${response.statusText}`);
+        return {};
       }
+
+      const status = response.status;
+
+      if (status === 200) {
+        const json = await response.json();
+        return json as ServerCommandsResponse;
+      }
+
+      return {};
+    } catch (error) {
+      console.error("Error fetching server commands:", error);
+    }
+
+    return {};
+  },
+  runServerCommand: async (serverCommandsUrl: string, command: string, additionalArgs: Record<string, any> = {}) => {
+    const endpoint_url = `${serverCommandsUrl}/commands`;
+    const body = {
+      command: command,
+      ...additionalArgs,
+    };
+    const response = await fetch(endpoint_url, {
+      method: "POST",
+      body: JSON.stringify(body),
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+      },
+    });
+
+    if (!response.ok) {
+      console.error(`Error running server command: ${response.status} ${response.statusText}`);
+      return {
+        success: false,
+      };
+    }
+
+    const status = response.status;
+
+    if (status === 204) {
+      return {
+        success: true,
+      };
+    }
+
+    return {
+      success: false,
+    };
+  },
+  getScheduledCommands: async (scheduledCommandsUrl: string) => {
+    try {
+      const response = await fetch(`${scheduledCommandsUrl}/schedules`, {
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
+      });
+      if (!response.ok) {
+        console.error(`Error fetching scheduled commands: ${response.status} ${response.statusText}`);
+        return [];
+      }
+
+      const status = response.status;
+
+      if (status === 200) {
+        const json = await response.json();
+        return json as ScheduledCommand[];
+      }
+
+      return [];
+    } catch (error) {
+      console.error("Error fetching scheduled commands:", error);
+    }
+    return [];
+  },
+  getRecurringCommands: async (recurringCommandsUrl: string) => {
+    try {
+      const response = await fetch(`${recurringCommandsUrl}/recurrings`, {
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
+      });
+      if (!response.ok) {
+        console.error(`Error fetching recurring commands: ${response.status} ${response.statusText}`);
+        return [];
+      }
+
+      const status = response.status;
+
+      if (status === 200) {
+        const json = await response.json();
+        return json as RecurringCommand[];
+      }
+
+      return [];
+    } catch (error) {
+      console.error("Error fetching recurring commands:", error);
+    }
+    return [];
+  },
+  createScheduledCommand: async (scheduledCommandsUrl: string, command: Partial<ScheduledCommand>) => {
+    try {
+      const response = await fetch(`${scheduledCommandsUrl}/schedules`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
+        body: JSON.stringify(command),
+      });
+
+      if (!response.ok) {
+        console.error(`Error creating scheduled command: ${response.status} ${response.statusText}`);
+        throw new Error("Failed to create scheduled command");
+      }
+
+      if (response.status === 204) {
+        return command as ScheduledCommand;
+      }
+
+      const json = await response.json();
+      return json as ScheduledCommand;
+    } catch (error) {
+      console.error("Error creating scheduled command", error);
+      throw error;
+    }
+  },
+  updateScheduledCommand: async (scheduledCommandsUrl: string, command: ScheduledCommand) => {
+    try {
+      // Use the base endpoint without ID and use PUT for upsert
+      const response = await fetch(`${scheduledCommandsUrl}/schedules`, {
+        method: "PUT", // Using PUT on the base endpoint
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
+        body: JSON.stringify(command),
+      });
+
+      if (!response.ok) {
+        const jsonErr = JSON.parse(await response.text());
+        console.error(`Error updating scheduled command: ${response.status} ${response.statusText}`);
+        throw new Error(jsonErr.error);
+      }
+
+      // According to docs, successful response is 204 No Content
+      if (response.status === 204) {
+        // Return the command object we sent since the server doesn't return data
+        return command;
+      }
+
+      // If server does return data (though docs suggest it returns 204)
+      const json = await response.json();
+      console.log("JSON", json);
+      return json as ScheduledCommand;
+    } catch (error) {
+      console.error("Error updating scheduled command", error);
+      throw error;
+    }
+  },
+  deleteScheduledCommand: async (scheduledCommandsUrl: string, id: string) => {
+    try {
+      const response = await fetch(`${scheduledCommandsUrl}/schedules/${id}`, {
+        method: "DELETE",
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
+      });
+
+      if (!response.ok) {
+        console.error(`Error deleting scheduled command: ${response.status} ${response.statusText}`);
+        return { success: false };
+      }
+
+      return { success: true };
+    } catch (error) {
+      console.error("Error deleting scheduled command", error);
+      return { success: false };
+    }
+  },
+  createRecurringCommand: async (recurringCommandsUrl: string, command: Partial<RecurringCommand>) => {
+    try {
+      const response = await fetch(`${recurringCommandsUrl}/recurrings`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
+        body: JSON.stringify(command),
+      });
+
+      if (!response.ok) {
+        console.error(`Error creating recurring command: ${response.status} ${response.statusText}`);
+        throw new Error("Failed to create recurring command");
+      }
+
+      if (response.status === 204) {
+        // Return the command object we sent since the server doesn't return data
+        return command as RecurringCommand;
+      }
+
+      const json = await response.json();
+      return json as RecurringCommand;
+    } catch (error) {
+      console.error("Error creating recurring command", error);
+      throw error;
+    }
+  },
+  updateRecurringCommand: async (recurringCommandsUrl: string, command: RecurringCommand) => {
+    try {
+      const response = await fetch(`${recurringCommandsUrl}/recurrings`, {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
+        body: JSON.stringify(command),
+      });
+
+      if (!response.ok) {
+        console.error(`Error updating recurring command: ${response.status} ${response.statusText}`);
+        throw new Error("Failed to update recurring command");
+      }
+
+      if (response.status === 204) {
+        // Return the command object we sent since the server doesn't return data
+        return command as RecurringCommand;
+      }
+
+      const json = await response.json();
+      return json as RecurringCommand;
+    } catch (error) {
+      console.error("Error updating recurring command", error);
+      throw error;
+    }
+  },
+  deleteRecurringCommand: async (recurringCommandsUrl: string, id: string) => {
+    try {
+      const response = await fetch(`${recurringCommandsUrl}/recurrings/${id}`, {
+        method: "DELETE",
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
+      });
+
+      if (!response.ok) {
+        console.error(`Error deleting recurring command: ${response.status} ${response.statusText}`);
+        return { success: false };
+      }
+
+      return { success: true };
+    } catch (error) {
+      console.error("Error deleting recurring command", error);
+      return { success: false };
+    }
+  },
+  getPayments: async (etkeAdminUrl: string) => {
+    const response = await fetch(`${etkeAdminUrl}/payments`, {
+      headers: {
+        Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+      },
+    });
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch payments: ${response.status} ${response.statusText}`);
+    }
+
+    const status = response.status;
+
+    if (status === 200) {
+      const json = await response.json();
+      return json as PaymentsResponse;
+    }
+
+    if (status === 204) {
+      return { payments: [], total: 0 };
+    }
+
+    throw new Error(`${response.status} ${response.statusText}`); // Handle unexpected status codes
+  },
+  getInvoice: async (etkeAdminUrl: string, transactionId: string) => {
+    try {
+      const response = await fetch(`${etkeAdminUrl}/payments/${transactionId}/invoice`, {
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        },
+      });
+
+      if (!response.ok) {
+        let errorMessage = `Error fetching invoice: ${response.status} ${response.statusText}`;
+
+        // Handle specific error codes
+        switch (response.status) {
+          case 404:
+            errorMessage = "Invoice not found for this transaction";
+            break;
+          case 500:
+            errorMessage = "Server error while generating invoice. Please try again later";
+            break;
+          case 401:
+            errorMessage = "Unauthorized access. Please check your permissions";
+            break;
+          case 403:
+            errorMessage = "Access forbidden. You don't have permission to download this invoice";
+            break;
+          default:
+            errorMessage = `Failed to fetch invoice (${response.status}): ${response.statusText}`;
+        }
+
+        console.error(errorMessage);
+        throw new Error(errorMessage);
+      }
+
+      // Get the file as a blob
+      const blob = await response.blob();
+
+      // Create a download link
+      const url = window.URL.createObjectURL(blob);
+      const link = document.createElement("a");
+      link.href = url;
+
+      // Try to get filename from response headers
+      const contentDisposition = response.headers.get("Content-Disposition");
+      let filename = `invoice_${transactionId}.pdf`;
+
+      if (contentDisposition) {
+        const filenameMatch = contentDisposition.match(/filename="(.+)"/);
+        if (filenameMatch) {
+          filename = filenameMatch[1];
+        }
+      }
+
+      link.download = filename;
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      window.URL.revokeObjectURL(url);
+    } catch (error) {
+      console.error("Error downloading invoice:", error);
+      throw error; // Re-throw to let the UI handle the error
+    }
+  },
 };
 
 const dataProvider = withLifecycleCallbacks(baseDataProvider, [
@@ -1090,28 +1562,43 @@ const dataProvider = withLifecycleCallbacks(baseDataProvider, [
       const avatarFile = params.data.avatar_file?.rawFile;
       const avatarErase = params.data.avatar_erase;
       const rates = params.data.rates;
+      const suspended = params.data.suspended;
+      const previousSuspended = params.previousData?.suspended;
+      const deactivated = params.data.deactivated;
+      const erased = params.data.erased;
 
       if (rates) {
         await dataProvider.setRateLimits(params.id, rates);
         delete params.data.rates;
       }
 
+      if (suspended !== undefined && suspended !== previousSuspended) {
+        await (dataProvider as SynapseDataProvider).suspendUser(params.id, suspended);
+        delete params.data.suspended;
+      }
+
+      if (deactivated !== undefined && erased !== undefined) {
+        await (dataProvider as SynapseDataProvider).eraseUser(params.id);
+        delete params.data.deactivated;
+        delete params.data.erased;
+      }
+
       if (avatarErase) {
         params.data.avatar_url = "";
         return params;
       }
 
       if (avatarFile instanceof File) {
-        const reponse = await dataProvider.uploadMedia({
+        const response = await dataProvider.uploadMedia({
           file: avatarFile,
           filename: params.data.avatar_file.title,
           content_type: params.data.avatar_file.rawFile.type,
         });
-        params.data.avatar_url = reponse.content_uri;
+        params.data.avatar_url = response.content_uri;
       }
       return params;
     },
-    beforeDelete: async (params: DeleteParams<any>, dataProvider: DataProvider) => {
+    beforeDelete: async (params: DeleteParams<any>, _dataProvider: DataProvider) => {
       if (params.meta?.deleteMedia) {
         const base_url = localStorage.getItem("base_url");
         const endpoint_url = `${base_url}/_synapse/admin/v1/users/${encodeURIComponent(returnMXID(params.id))}/media`;
@@ -1126,7 +1613,7 @@ const dataProvider = withLifecycleCallbacks(baseDataProvider, [
 
       return params;
     },
-    beforeDeleteMany: async (params: DeleteManyParams<any>, dataProvider: DataProvider) => {
+    beforeDeleteMany: async (params: DeleteManyParams<any>, _dataProvider: DataProvider) => {
       await Promise.all(
         params.ids.map(async id => {
           if (params.meta?.deleteMedia) {

src/synapse/matrix.ts

@@ -1,6 +1,4 @@
-import { Identifier, fetchUtils } from "react-admin";
-
-import { isMXID } from "../utils/mxid";
+import { fetchUtils } from "react-admin";
 
 export const splitMxid = mxid => {
   const re = /^@(?<name>[a-zA-Z0-9._=\-/]+):(?<domain>[a-zA-Z0-9\-.]+\.[a-zA-Z]+)$/;

src/utils/config.ts

@@ -1,5 +1,6 @@
 export interface Config {
   restrictBaseUrl: string | string[];
+  corsCredentials: string;
   asManagedUsers: RegExp[];
   menu: MenuItem[];
   etkeccAdmin?: string;
@@ -16,17 +17,18 @@ export const WellKnownKey = "cc.etke.synapse-admin";
 // current configuration
 let config: Config = {
   restrictBaseUrl: "",
+  corsCredentials: "same-origin",
   asManagedUsers: [],
   menu: [],
-  etkeccAdmin: ""
+  etkeccAdmin: "",
 };
 
 export const FetchConfig = async () => {
   // load config.json and honor vite base url (import.meta.env.BASE_URL)
   // if that url doesn't have a trailing slash - add it
-  let configJSONUrl = "config.json"
+  let configJSONUrl = "config.json";
   if (import.meta.env.BASE_URL) {
-    configJSONUrl = `${import.meta.env.BASE_URL.replace(/\/?$/, '/')}config.json`;
+    configJSONUrl = `${import.meta.env.BASE_URL.replace(/\/?$/, "/")}config.json`;
   }
   try {
     const resp = await fetch(configJSONUrl);
@@ -50,7 +52,10 @@ export const FetchConfig = async () => {
       const resp = await fetch(`${protocol}://${homeserver}/.well-known/matrix/client`);
       const configWK = await resp.json();
       if (!configWK[WellKnownKey]) {
-        console.log(`Loaded ${protocol}://${homeserver}.well-known/matrix/client, but it doesn't contain ${WellKnownKey} key, skipping`, configWK);
+        console.log(
+          `Loaded ${protocol}://${homeserver}.well-known/matrix/client, but it doesn't contain ${WellKnownKey} key, skipping`,
+          configWK
+        );
       } else {
         console.log(`Loaded ${protocol}://${homeserver}.well-known/matrix/client`, configWK);
         LoadConfig(configWK[WellKnownKey]);
@@ -59,16 +64,20 @@ export const FetchConfig = async () => {
       console.log(`${protocol}://${homeserver}/.well-known/matrix/client not found, skipping`, e);
     }
   }
-}
+};
 
 // load config from context
-// we deliberately processing each key separately to avoid overwriting the whole config, loosing some keys, and messing
+// we deliberately processing each key separately to avoid overwriting the whole config, losing some keys, and messing
 // with typescript types
-export const LoadConfig = (context: any) => {
+export const LoadConfig = (context: object) => {
   if (context?.restrictBaseUrl) {
     config.restrictBaseUrl = context.restrictBaseUrl as string | string[];
   }
 
+  if (context?.corsCredentials) {
+    config.corsCredentials = context.corsCredentials;
+  }
+
   if (context?.asManagedUsers) {
     config.asManagedUsers = context.asManagedUsers.map((regex: string) => new RegExp(regex));
   }
@@ -84,13 +93,12 @@ export const LoadConfig = (context: any) => {
   if (context?.etkeccAdmin) {
     config.etkeccAdmin = context.etkeccAdmin;
   }
-}
+};
 
 // get config
 export const GetConfig = (): Config => {
   return config;
-}
-
+};
 
 // clear config
 export const ClearConfig = () => {
@@ -98,4 +106,4 @@ export const ClearConfig = () => {
   config = {} as Config;
   // session
   localStorage.clear();
-}
+};

src/utils/date.ts

@@ -26,3 +26,29 @@ export const dateFormatter = (v: string | number | Date | undefined | null): str
   // target format yyyy-MM-ddThh:mm
   return `${year}-${month}-${day}T${hour}:${minute}`;
 };
+
+// assuming date is in format "2025-02-26 20:52:00" where no timezone is specified
+export const getTimeSince = (dateToCompare: string) => {
+  const nowUTC = new Date().getTime();
+  if (!dateToCompare.includes("Z")) {
+    dateToCompare = dateToCompare + "Z";
+  }
+  const past = new Date(dateToCompare);
+
+  const pastUTC = past.getTime();
+  const diffInMs = nowUTC - pastUTC;
+
+  const diffInMinutes = Math.floor(diffInMs / (1000 * 60));
+
+  if (diffInMinutes < 1) return "a couple of seconds";
+  if (diffInMinutes === 1) return "1 minute";
+  if (diffInMinutes < 60) return `${diffInMinutes} minutes`;
+  if (diffInMinutes < 120) return "1 hour";
+  if (diffInMinutes < 24 * 60) return `${Math.floor(diffInMinutes / 60)} hours`;
+  if (diffInMinutes < 48 * 60) return "1 day";
+  if (diffInMinutes < 7 * 24 * 60) return `${Math.floor(diffInMinutes / (24 * 60))} days`;
+  if (diffInMinutes < 14 * 24 * 60) return "1 week";
+  if (diffInMinutes < 30 * 24 * 60) return `${Math.floor(diffInMinutes / (7 * 24 * 60))} weeks`;
+  if (diffInMinutes < 60 * 24 * 60) return "1 month";
+  return `${Math.floor(diffInMinutes / (30 * 24 * 60))} months`;
+};

src/utils/decodeURLComponent.ts

@@ -0,0 +1,15 @@
+/**
+ * Decode a URI component, and if it fails, return the original string.
+ * @param str The string to decode.
+ * @returns The decoded string, or the original string if decoding fails.
+ * @example decodeURIComponent("Hello%20World") // "Hello World"
+ */
+const decodeURLComponent = (str: string): string => {
+  try {
+    return decodeURIComponent(str);
+  } catch {
+    return str;
+  }
+};
+
+export default decodeURLComponent;

src/utils/error.ts

@@ -1,4 +1,4 @@
-export type MatrixError = {
+export interface MatrixError {
   errcode: string;
   error: string;
 }

src/utils/fetchMedia.ts

@@ -1,8 +1,8 @@
-export const getServerAndMediaIdFromMxcUrl = (mxcUrl: string): { serverName: string, mediaId: string } => {
-    const re = /^mxc:\/\/([^/]+)\/(\w+)/;
+export const getServerAndMediaIdFromMxcUrl = (mxcUrl: string): { serverName: string; mediaId: string } => {
+  const re = /^mxc:\/\/([^/]+)\/([\w-]+)$/;
   const ret = re.exec(mxcUrl);
   if (ret == null) {
-      throw new Error("Invalid mxcUrl");
+    return { serverName: "", mediaId: "" };
   }
   const serverName = ret[1];
   const mediaId = ret[2];
@@ -17,7 +17,8 @@ export const fetchAuthenticatedMedia = async (mxcUrl: string, type: MediaType):
 
   const { serverName, mediaId } = getServerAndMediaIdFromMxcUrl(mxcUrl);
   if (!serverName || !mediaId) {
-    throw new Error("Invalid mxcUrl");
+    console.error("Invalid mxcUrl", mxcUrl, "serverName:", serverName, "mediaId:", mediaId);
+    return new Response(null, { status: 400, statusText: "Invalid mxcUrl" });
   }
 
   let url = "";

src/utils/icons.ts

@@ -1,8 +1,13 @@
-import AnnouncementIcon from '@mui/icons-material/Announcement';
-import EngineeringIcon from '@mui/icons-material/Engineering';
-import HelpCenterIcon from '@mui/icons-material/HelpCenter';
-import SupportAgentIcon from '@mui/icons-material/SupportAgent';
-import OpenInNewIcon from '@mui/icons-material/OpenInNew';
+import AnnouncementIcon from "@mui/icons-material/Announcement";
+import EngineeringIcon from "@mui/icons-material/Engineering";
+import HelpCenterIcon from "@mui/icons-material/HelpCenter";
+import OpenInNewIcon from "@mui/icons-material/OpenInNew";
+import PieChartIcon from "@mui/icons-material/PieChart";
+import PriceCheckIcon from "@mui/icons-material/PriceCheck";
+import RestartAltIcon from "@mui/icons-material/RestartAlt";
+import RouterIcon from "@mui/icons-material/Router";
+import SupportAgentIcon from "@mui/icons-material/SupportAgent";
+import UpgradeIcon from "@mui/icons-material/Upgrade";
 
 export const Icons = {
   Announcement: AnnouncementIcon,
@@ -10,6 +15,11 @@ export const Icons = {
   HelpCenter: HelpCenterIcon,
   SupportAgent: SupportAgentIcon,
   Default: OpenInNewIcon,
+  PieChart: PieChartIcon,
+  Upgrade: UpgradeIcon,
+  Router: RouterIcon,
+  PriceCheck: PriceCheckIcon,
+  RestartAlt: RestartAltIcon,
   // Add more icons as needed
 };
 

src/utils/mxid.ts

@@ -1,4 +1,5 @@
 import { Identifier } from "ra-core";
+
 import { GetConfig } from "../utils/config";
 
 const mxidPattern = /^@[^@:]+:[^@:]+$/;
@@ -56,6 +57,6 @@ export function returnMXID(input: string | Identifier): string {
   }
 
   // If input is not a valid MXID, assume it's a localpart and construct the MXID
-  const localpart = typeof input === 'string' && inputStr.startsWith('@') ? inputStr.slice(1) : inputStr;
+  const localpart = typeof input === "string" && inputStr.startsWith("@") ? inputStr.slice(1) : inputStr;
   return `@${localpart}:${homeserver}`;
 }

vite.config.ts

@@ -1,7 +1,6 @@
-import { vitePluginVersionMark } from "vite-plugin-version-mark";
-
 import react from "@vitejs/plugin-react";
 import { defineConfig } from "vite";
+import { vitePluginVersionMark } from "vite-plugin-version-mark";
 
 export default defineConfig({
   base: "./",
@@ -16,7 +15,7 @@ export default defineConfig({
       ifMeta: false,
       ifLog: false,
       ifGlobal: true,
-      outputFile: (version) => ({
+      outputFile: version => ({
         path: "manifest.json",
         content: JSON.stringify({
           name: "Synapse Admin",
@@ -24,20 +23,23 @@ export default defineConfig({
           description: "Synapse Admin is an admin console for synapse Matrix homeserver with additional features.",
           categories: ["productivity", "utilities"],
           orientation: "landscape",
-          icons: [{
+          icons: [
+            {
               src: "favicon.ico",
               sizes: "32x32",
-            type: "image/x-icon"
-          },{
+              type: "image/x-icon",
+            },
+            {
               src: "images/logo.webp",
               sizes: "512x512",
               type: "image/webp",
-            purpose: "any maskable"
-          }],
+              purpose: "any maskable",
+            },
+          ],
           start_url: ".",
           display: "standalone",
           theme_color: "#000000",
-          background_color: "#ffffff"
+          background_color: "#ffffff",
         }),
       }),
     }),