108 changed files with 5593 additions and 10947 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1 +0,0 @@
-/testdata
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@ -1,33 +0,0 @@
-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 }}
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -0,0 +1 @@
+liberapay: etkecc
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -0,0 +1,19 @@
+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
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@ -0,0 +1,115 @@
+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
--- a/.yarn/releases/yarn-4.1.1.cjs
+++ b/.yarn/releases/yarn-4.1.1.cjs
--- a/.yarn/releases/yarn-4.4.1.cjs
+++ b/.yarn/releases/yarn-4.4.1.cjs
--- a/12
+++ b/12
@ -1,11 +1,5 @@
-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 --from=builder /src/dist /app
+
+COPY ./dist /app
--- a/Dockerfile.old
+++ b/Dockerfile.old
@ -1,5 +0,0 @@
-FROM ghcr.io/static-web-server/static-web-server:2
-
-ENV SERVER_ROOT=/app
-
-COPY ./dist /app
--- a/README.md
+++ b/README.md
@ -21,13 +21,11 @@

 * [Fork differences](#fork-differences)
  * [Changes](#changes)
-    * [exclusive for etke.cc customers](#exclusive-for-etkecc-customers)
  * [Development](#development)
  * [Support](#support)
 * [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)
@ -55,13 +53,11 @@ 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 [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 Docker container on [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

-_the list will be updated as new changes are added_
-
 The following changes are already implemented:

 * 🛑 [Prevent admins from deleting themselves](https://github.com/etkecc/synapse-admin/pull/1)
@ -101,52 +97,26 @@ The following changes are already implemented:
 * 🛑 [Prevent accidental user overwrites](https://github.com/etkecc/synapse-admin/pull/139)
 * 🔍 [Allow providing login form details via GET params](https://github.com/etkecc/synapse-admin/pull/140)
 * 🎨 [Add preferred theme colors to login page and footer](https://github.com/etkecc/synapse-admin/pull/155)
-* 🛡️ [Add "Assign Admin" button to the rooms](https://github.com/etkecc/synapse-admin/pull/156)
+* 🔰 [Add "Assign Admin" button to the rooms](https://github.com/etkecc/synapse-admin/pull/156)
 * 🖼️ [Add rooms' avatars](https://github.com/etkecc/synapse-admin/pull/158)
-* 🏷️ [User Badges](https://github.com/etkecc/synapse-admin/pull/160)
-* 🔄 [Allow prefilling any fields on the login form via GET params](https://github.com/etkecc/synapse-admin/pull/181)
-* 🎞️ [Add "Media" tab for rooms](https://github.com/etkecc/synapse-admin/pull/196)
-* 📞 [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)
-* 🧾 [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)
+* 🤖 [User Badges](https://github.com/etkecc/synapse-admin/pull/160)

-#### exclusive for [etke.cc](https://etke.cc) customers
-
-We at [etke.cc](https://etke.cc) attempting to develop everything open-source, but some things are too specific to be used by anyone else.
-The following list contains such features - they are only available for [etke.cc](https://etke.cc) customers.
-
-* 📊 [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)
+_the list will be updated as new changes are added_

 ### Development

 `just run-dev` to start the development stack (depending on your system speed, you may want to re-run this command if
   user creation fails)

-This command initializes the development environment (local Synapse server, Element Web client app, and Postgres DB),
+This command initializes the development environment (local Synapse server and Postgres DB),
 and launches the app in a dev mode at `http://localhost:5173`

-After that open [http://localhost:5173](http://localhost:5173?username=admin&password=admin&server=http://localhost:8008) in your browser,
-login using the following credentials:
+After that open `http://localhost:5173` in your browser, login using the following credentials:

 * Login: admin
 * Password: admin
 * Homeserver URL: http://localhost:8008

-Element Web runs on http://localhost:8080
-
 ### Support

 If you have any questions or need help, feel free to join the [community room](https://matrix.to/#/#synapse-admin:etke.cc) or create an issue on GitHub.
@ -178,9 +148,13 @@ services:

 ### Prefilling login form

-You can prefill all fields on the login page using GET parameters.
+You can prefill `username` and `homeserver` fields on the login page using GET parameters, example:

-[Documentation](./docs/prefill-login-form.md)
+```
+https://matrix.example.com/synapse-admin/?username=admin&server=matrix.example.com
+```
+
+That way `username` and `homeserver` fields will be pre-filled with `admin` and `https://matrix.example.com` respectively.


 ### Restricting available homeserver
@ -189,12 +163,6 @@ 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,
@ -278,7 +246,6 @@ 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"
@ -307,7 +274,7 @@ Example for Traefik:
 ```yml
 services:
  traefik:
-    image: traefik:v3
+    image: traefik:mimolette
    restart: unless-stopped
    ports:
      - 80:80
@ -320,12 +287,11 @@ services:
    restart: unless-stopped
    labels:
      - "traefik.enable=true"
-      - "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"
+      - "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"
 ```

 ## Development
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@ -1,6 +1,6 @@
 services:
  synapse:
-    image: ghcr.io/element-hq/synapse:develop
+    image: ghcr.io/element-hq/synapse:latest
    entrypoint: python
    command: "-m synapse.app.homeserver -c /config/homeserver.yaml"
    ports:
@ -18,17 +18,3 @@ services:
      POSTGRES_PASSWORD: synapse
      POSTGRES_DB: synapse
      POSTGRES_INITDB_ARGS: "--lc-collate C --lc-ctype C --encoding UTF8"
-
-  element:
-    image: docker.io/vectorim/element-web:latest
-    depends_on:
-      synapse:
-        condition: service_healthy
-        restart: true
-    ports:
-    - "8080:8080"
-    volumes:
-    - ./testdata/element/nginx.conf:/etc/nginx/nginx.conf:ro
-    - /dev/null:/etc/nginx/conf.d/default.conf:ro
-    - ./testdata/element/config.json:/app/config.json:ro
-
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -5,7 +5,6 @@ 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:
--- a/docs/README.md
+++ b/docs/README.md
@ -1,44 +0,0 @@
-# Documentation
-
-Synapse Admin documentation is under construction right now, so PRs are greatly appreciated!
-
-Table of contents:
-<!-- vim-markdown-toc GFM -->
-
-* [Configuration](#configuration)
-* [Features](#features)
-* [Deployment](#deployment)
-
-<!-- vim-markdown-toc -->
-
-## Configuration
-
-[Full configuration documentation](./config.md)
-
-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)
-
-## Features
-
-* [User Badges](./user-badges.md)
-* [Prefilling the Login Form](./prefill-login-form.md)
-
-for [etke.cc](https://etke.cc) customers only:
-
-> **Note:** The following features are only available for etke.cc customers. Due to specifics of the implementation,
-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
-
-* [Serving Synapse Admin behind a reverse proxy](./reverse-proxy.md)
--- a/docs/config.md
+++ b/docs/config.md
@ -28,12 +28,6 @@ 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$`
--- a/docs/cors-credentials.md
+++ b/docs/cors-credentials.md
@ -1,35 +0,0 @@
-# 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"
-  }
-}
-```
--- a/docs/prefill-login-form.md
+++ b/docs/prefill-login-form.md
@ -1,48 +0,0 @@
-# Prefilling the Login Form
-
-In some cases you may wish to prefill/preset the login form fields when sharing a link to a Synapse Admin instance.
-This can be done by adding the following query parameters to the URL:
-
-* `username` - The username to prefill in the username field.
-* `server` - The server to prefill in the homeserver url field.
-
-The following query params will work only if the Synapse Admin is loaded from `localhost` or `127.0.0.1`:
-
-* `password` - The password to prefill in the password field (credentials auth). **NEVER** use this in production.
-* `accessToken` - The access token to prefill in the access token field (access token auth). **NEVER** use this in production.
-
-> **WARNING**: Never use the `password` or `accessToken` query parameters in production as they can be easily extracted
-from the URL. These are only meant for development purposes and local environments.
-
-
-## Examples
-
-### Production
-
-```bash
-https://admin.etke.cc?username=admin&server=https://matrix.example.com
-```
-
-This will open `Credentials` (username/password) login form with the username field prefilled with `admin` and the
-Homeserver URL field prefilled with `https://matrix.example.com`.
-
-### Development and Local environments
-
-**With Password**
-
-```bash
-http://localhost:8080?username=admin&server=https://matrix.example.com&password=secret
-```
-
-This will open `Credentials` (username/password) login form with the username field prefilled with `admin`, the
-Homeserver URL field prefilled with `https://matrix.example.com` and the password field prefilled with `secret`.
-
-
-**With Access Token**
-
-```bash
-http://localhost:8080?server=https://matrix.example.com&accessToken=secret
-```
-
-This will open `Access Token` login form with the Homeserver URL field prefilled with `https://matrix.example.com` and
-the access token field prefilled with `secret`.
--- a/docs/restrict-hs.md
+++ b/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 running at `matrix.example.com`) and
+`example.com` (with Synapse runing 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.

--- a/jest.config.ts
+++ b/jest.config.ts
@ -2,31 +2,12 @@ import type { JestConfigWithTsJest } from "ts-jest";

 const config: JestConfigWithTsJest = {
  preset: "ts-jest",
-  testEnvironment: "jest-fixed-jsdom",
+  testEnvironment: "jsdom",
  collectCoverage: true,
  coveragePathIgnorePatterns: ["node_modules", "dist"],
  coverageDirectory: "<rootDir>/coverage/",
  coverageReporters: ["html", "text", "text-summary", "cobertura"],
  extensionsToTreatAsEsm: [".ts", ".tsx"],
  setupFilesAfterEnv: ["<rootDir>/src/jest.setup.ts"],
-  transform: {
-    "^.+\\.(js|jsx|ts|tsx)$": [
-      "ts-jest",
-      {
-        diagnostics: {
-          ignoreCodes: [1343],
-        },
-        astTransformers: {
-          before: [
-            {
-              path: "ts-jest-mock-import-meta",
-              options: { metaObjectReplacement: { env: { BASE_URL: "/" } } },
-            },
-          ],
-        },
-      },
-    ],
-  },
-  transformIgnorePatterns: [],
 };
 export default config;
--- a/5
+++ b/5
@ -6,9 +6,6 @@ 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
@ -19,8 +16,6 @@ run-dev:
    @docker-compose -f docker-compose-dev.yml up -d postgres
    @echo "Starting Synapse..."
    @docker-compose -f docker-compose-dev.yml up -d synapse
-    @echo "Starting Element Web..."
-    @docker-compose -f docker-compose-dev.yml up -d element
    @echo "Ensure admin user is registered..."
    @docker-compose -f docker-compose-dev.yml exec synapse register_new_matrix_user --admin -u admin -p admin -c /config/homeserver.yaml http://localhost:8008 || true
    @echo "Starting the app..."
--- a/package.json
+++ b/package.json
@ -1,100 +1,79 @@
 {
  "name": "synapse-admin",
-  "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"
-  ],
+  "version": "0.10.3",
+  "description": "Admin GUI for the Matrix.org server Synapse",
  "type": "module",
  "author": "etke.cc (originally by Awesome Technologies Innovationslabor GmbH)",
  "license": "Apache-2.0",
-  "homepage": "https://github.com/etkecc/synapse-admin#readme",
+  "homepage": ".",
  "repository": {
    "type": "git",
-    "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"
+    "url": "https://github.com/etkecc/synapse-admin"
  },
  "devDependencies": {
-    "@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/js": "^9.13.0",
+    "@testing-library/dom": "^10.0.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.0.0",
+    "@testing-library/user-event": "^14.5.2",
+    "@types/jest": "^29.5.14",
+    "@types/lodash": "^4.17.13",
+    "@types/node": "^22.9.3",
+    "@types/papaparse": "^5.3.15",
+    "@types/react": "^18.3.12",
+    "@typescript-eslint/eslint-plugin": "^8.14.0",
+    "@typescript-eslint/parser": "^8.15.0",
+    "@vitejs/plugin-react": "^4.3.3",
+    "eslint": "^9.15.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.31.0",
    "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-prettier": "^5.2.1",
    "eslint-plugin-unused-imports": "^4.1.4",
-    "jest": "^30.0.5",
-    "jest-environment-jsdom": "^30.0.5",
+    "eslint-plugin-yaml": "^1.0.3",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
    "jest-fetch-mock": "^3.0.3",
-    "prettier": "^3.6.2",
-    "react-test-renderer": "^19.1.1",
-    "ts-jest": "^29.4.1",
+    "prettier": "^3.3.3",
+    "react-test-renderer": "^18.3.1",
+    "ts-jest": "^29.2.5",
    "ts-node": "^10.9.2",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.39.1",
-    "vite": "^7.1.2",
-    "vite-plugin-version-mark": "^0.1.4"
+    "typescript": "^5.7.2",
+    "typescript-eslint": "^8.15.0",
+    "vite": "^5.4.11",
+    "vite-plugin-version-mark": "^0.1.2"
  },
  "dependencies": {
-    "@bicstone/ra-language-japanese": "^5.10.0",
-    "@emotion/react": "^11.14.0",
-    "@emotion/styled": "^11.14.1",
+    "@emotion/react": "^11.13.5",
+    "@emotion/styled": "^11.13.5",
    "@haleos/ra-language-german": "^1.0.0",
    "@haxqer/ra-language-chinese": "^4.16.2",
-    "@mui/icons-material": "^7.3.1",
-    "@mui/material": "^7.3.1",
-    "@mui/utils": "^7.1.0",
-    "@tanstack/react-query": "^5.84.2",
+    "@mui/icons-material": "^6.1.8",
+    "@mui/material": "^6.1.8",
+    "@mui/utils": "^5.16.6",
+    "@tanstack/react-query": "^5.61.3",
    "history": "^5.3.0",
-    "jest-fixed-jsdom": "^0.0.9",
    "lodash": "^4.17.21",
-    "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.10.1",
+    "papaparse": "^5.4.1",
+    "ra-core": "^5.3.4",
+    "ra-i18n-polyglot": "^5.3.4",
+    "ra-language-english": "^5.3.4",
+    "ra-language-farsi": "^5.0.0",
+    "ra-language-french": "^5.4.0",
    "ra-language-italian": "^3.13.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"
+    "ra-language-russian": "^4.14.2",
+    "react": "^18.3.1",
+    "react-admin": "^5.4.0",
+    "react-dom": "^18.3.1",
+    "react-hook-form": "^7.53.2",
+    "react-is": "^18.3.1",
+    "react-router": "^6.26.2",
+    "react-router-dom": "^6.28.0"
  },
  "scripts": {
    "start": "vite serve",
    "build": "vite build",
-    "lint": "ESLINT_USE_FLAT_CONFIG=false eslint --ignore-path .gitignore --ignore-pattern testdata/ --ext .ts,.tsx .",
+    "lint": "ESLINT_USE_FLAT_CONFIG=false eslint --ignore-path .gitignore --ignore-pattern testdata/ --ext .ts,.tsx,.yml,.yaml .",
    "fix": "yarn lint --fix",
    "test": "yarn jest",
    "test:watch": "yarn jest --watch"
@ -107,13 +86,15 @@
      "import",
      "prettier",
      "unused-imports",
-      "@typescript-eslint"
+      "@typescript-eslint",
+      "yaml"
    ],
    "extends": [
      "eslint:recommended",
      "plugin:@typescript-eslint/recommended",
      "plugin:@typescript-eslint/stylistic",
-      "plugin:import/typescript"
+      "plugin:import/typescript",
+      "plugin:yaml/legacy"
    ],
    "parser": "@typescript-eslint/parser",
    "parserOptions": {
@ -122,18 +103,6 @@
    "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",
        {
@ -164,7 +133,8 @@
            ]
          ]
        }
-      ]
+      ],
+      "unused-imports/no-unused-imports-ts": 2
    }
  },
  "prettier": {
--- a/screenshots/etke.cc/billing/page.webp
+++ b/screenshots/etke.cc/billing/page.webp
--- a/screenshots/etke.cc/server-actions/page.webp
+++ b/screenshots/etke.cc/server-actions/page.webp
--- a/screenshots/etke.cc/server-commands/panel.webp
+++ b/screenshots/etke.cc/server-commands/panel.webp
--- a/screenshots/etke.cc/server-notifications/badge.webp
+++ b/screenshots/etke.cc/server-notifications/badge.webp
--- a/screenshots/etke.cc/server-notifications/page.webp
+++ b/screenshots/etke.cc/server-notifications/page.webp
--- a/screenshots/etke.cc/server-status/indicator-sidebar.webp
+++ b/screenshots/etke.cc/server-status/indicator-sidebar.webp
--- a/screenshots/etke.cc/server-status/indicator.webp
+++ b/screenshots/etke.cc/server-status/indicator.webp
--- a/screenshots/etke.cc/server-status/page.webp
+++ b/screenshots/etke.cc/server-status/page.webp
--- a/src/App.test.tsx
+++ b/src/App.test.tsx
@ -1,32 +1,12 @@
 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(
-      <BrowserRouter>
-        <App />
-      </BrowserRouter>
-    );
-
+    render(<App />);
    await screen.findAllByText("Welcome to Synapse Admin");
  });
 });
--- a/src/App.tsx
+++ b/src/App.tsx
@ -1,23 +1,16 @@
-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 { createContext, useContext } from "react";
 import { Route } from "react-router-dom";

 import AdminLayout from "./components/AdminLayout";
-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 UserImport from "./components/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";
@ -30,6 +23,8 @@ 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 { Config } from "./utils/config";

 // TODO: Can we use lazy loading together with browser locale?
 const messages = {
@ -37,7 +32,6 @@ const messages = {
  en: englishMessages,
  fr: frenchMessages,
  it: italianMessages,
-  ja: japaneseMessages,
  ru: russianMessages,
  zh: chineseMessages,
 };
@ -49,10 +43,9 @@ 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: "Chinese (简体中文)" },
+    { locale: "fa", name: "Persian(فارسی)" },
+    { locale: "ru", name: "Russian(Русский)" },
+    { locale: "zh", name: "简体中文" },
  ]
 );

@ -63,7 +56,6 @@ export const App = () => (
    <Admin
      disableTelemetry
      requireAuth
-      title="Synapse Admin"
      layout={AdminLayout}
      loginPage={LoginPage}
      authProvider={authProvider}
@ -72,15 +64,6 @@ 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} />
@ -103,4 +86,8 @@ export const App = () => (
  </QueryClientProvider>
 );

+export const AppContext = createContext({});
+
+export const useAppContext = () => useContext(AppContext) as Config;
+
 export default App;
--- a/src/Context.tsx
+++ b/src/Context.tsx
@ -1,7 +0,0 @@
-import { createContext, useContext } from "react";
-
-import { Config } from "./utils/config";
-
-export const AppContext = createContext<Config>({} as Config);
-
-export const useAppContext = () => useContext(AppContext) as Config;
--- a/src/components/AdminLayout.tsx
+++ b/src/components/AdminLayout.tsx
@ -1,29 +1,9 @@
-import ManageHistoryIcon from "@mui/icons-material/ManageHistory";
-import PaymentIcon from "@mui/icons-material/Payment";
-import { useEffect, useState, Suspense } from "react";
-import {
-  CheckForApplicationUpdate,
-  AppBar,
-  TitlePortal,
-  InspectorButton,
-  Confirm,
-  Layout,
-  Logout,
-  Menu,
-  useLogout,
-  UserMenu,
-  useStore,
-  useLocaleState,
-} from "react-admin";
-
-import Footer from "./Footer";
+import { CheckForApplicationUpdate, AppBar, TitlePortal, InspectorButton, Confirm, Layout, Logout, Menu, useLogout, UserMenu } from "react-admin";
 import { LoginMethod } from "../pages/LoginPage";
-import { MenuItem, GetConfig, ClearConfig } from "../utils/config";
+import { useEffect, useState, Suspense } from "react";
 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";
+import { MenuItem, GetConfig, ClearConfig } from "../utils/config";
+import Footer from "./Footer";

 const AdminUserMenu = () => {
  const [open, setOpen] = useState(false);
@ -66,114 +46,55 @@ const AdminUserMenu = () => {
 };

 const AdminAppBar = () => {
-  return (
-    <AppBar userMenu={<AdminUserMenu />}>
-      <TitlePortal />
-      <ServerStatusBadge />
-      <ServerNotificationsBadge />
-      <InspectorButton />
-    </AppBar>
-  );
+  return (<AppBar userMenu={<AdminUserMenu />}>
+    <TitlePortal />
+    <InspectorButton />
+  </AppBar>);
 };

-const AdminMenu = props => {
+const AdminMenu = (props) => {
  const [menu, setMenu] = useState([] as MenuItem[]);
-  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: [],
-  });
+  useEffect(() => setMenu(GetConfig().menu), []);

  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) => {
-          const { url, icon, label } = item;
-          /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-          const IconComponent = Icons[icon] as React.ComponentType<any> | undefined;
+      {menu.map((item, index) => {
+        const { url, icon, label } = item;
+        const IconComponent = Icons[icon] as React.ComponentType<any> | undefined;

-          return (
-            <Suspense key={index}>
-              <Menu.Item
-                to={url}
-                target="_blank"
-                primaryText={label}
-                leftIcon={IconComponent ? <IconComponent /> : <DefaultIcon />}
-                onClick={props.onMenuClick}
-              />
-            </Suspense>
-          );
-        })}
+        return (
+          <Suspense key={index}>
+            <Menu.Item
+              to={url}
+              target="_blank"
+              primaryText={label}
+              leftIcon={IconComponent ? <IconComponent /> : <DefaultIcon />}
+              onClick={props.onMenuClick}
+            />
+          </Suspense>
+        );
+      })}
    </Menu>
  );
 };

 export const AdminLayout = ({ children }) => {
-  // 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",
-          },
-        }}
-      >
-        {children}
-        <CheckForApplicationUpdate />
-      </Layout>
-      <Footer />
-    </>
-  );
+  return <>
+    <Layout appBar={AdminAppBar} menu={AdminMenu} sx={{
+      ['& .RaLayout-appFrame']: {
+        minHeight: '90vh',
+        height: '90vh',
+      },
+      ['& .RaLayout-content']: {
+        marginBottom: '3rem',
+      },
+    }}>
+      {children}
+      <CheckForApplicationUpdate />
+    </Layout>
+    <Footer />
+  </>
 };

 export default AdminLayout;
--- a/src/components/AvatarField.test.tsx
+++ b/src/components/AvatarField.test.tsx
@ -1,7 +1,6 @@
 import { render, screen, waitFor } from "@testing-library/react";
-import { act } from "react";
 import { RecordContextProvider } from "react-admin";
-
+import { act } from "react";
 import AvatarField from "./AvatarField";

 describe("AvatarField", () => {
@ -9,7 +8,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;

--- a/src/components/AvatarField.tsx
+++ b/src/components/AvatarField.tsx
@ -1,8 +1,7 @@
-import { Avatar, AvatarProps, Badge, Tooltip } from "@mui/material";
 import { get } from "lodash";
-import { useState, useEffect, useCallback } from "react";
+import { Avatar, AvatarProps, Badge, Tooltip } from "@mui/material";
 import { FieldProps, useRecordContext, useTranslate } from "react-admin";
-
+import { useState, useEffect, useCallback } from "react";
 import { fetchAuthenticatedMedia } from "../utils/fetchMedia";
 import { isMXID, isASManaged } from "../utils/mxid";

@ -97,15 +96,12 @@ 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}>
-      {letter}
-    </Avatar>
-  );
+  return (<Avatar alt={alt} classes={classes} sizes={sizes} src={src} sx={sx} variant={variant}>
+          {letter}
+          </Avatar>);
 };

 export default AvatarField;
--- a/src/components/DeleteRoomButton.tsx
+++ b/src/components/DeleteRoomButton.tsx
@ -1,19 +1,9 @@
-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,
-  useNotify,
-  useRedirect,
-  NotificationType,
-  useDeleteMany,
-  Identifier,
-  useUnselectAll,
-} from "react-admin";
+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";

 interface DeleteRoomButtonProps {
  selectedIds: Identifier[];
@ -23,7 +13,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);
@ -38,7 +28,7 @@ const DeleteRoomButton: React.FC<DeleteRoomButtonProps> = props => {
  const handleDialogOpen = () => setOpen(true);
  const handleDialogClose = () => setOpen(false);

-  const handleDelete = (values: { block: boolean }) => {
+  const handleDelete = (values: {block: boolean}) => {
    deleteMany(
      resourceName,
      { ids: recordIds, meta: values },
@ -49,7 +39,8 @@ 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 }),
      }
    );
  };
--- a/src/components/DeleteUserButton.tsx
+++ b/src/components/DeleteUserButton.tsx
@ -1,19 +1,9 @@
-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,
-  useNotify,
-  useRedirect,
-  NotificationType,
-  useDeleteMany,
-  Identifier,
-  useUnselectAll,
-} from "react-admin";
+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";

 interface DeleteUserButtonProps {
  selectedIds: Identifier[];
@ -23,7 +13,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);
@ -39,7 +29,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 },
@ -49,13 +39,14 @@ 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 }),
      }
    );
  };
--- a/src/components/DeviceRemoveButton.tsx
+++ b/src/components/DeviceRemoveButton.tsx
@ -1,5 +1,4 @@
 import { DeleteWithConfirmButton, DeleteWithConfirmButtonProps, useRecordContext } from "react-admin";
-
 import { isASManaged } from "../utils/mxid";

 export const DeviceRemoveButton = (props: DeleteWithConfirmButtonProps) => {
--- a/src/components/ExperimentalFeatures.tsx
+++ b/src/components/ExperimentalFeatures.tsx
@ -1,20 +1,15 @@
-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",
+    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] ?? "";
@ -25,33 +20,34 @@ const ExperimentalFeatureRow = (props: {
    props.updateFeature(featureKey, event.target.checked);
  };

-  return (
-    <Stack
+  return <Stack
      direction="row"
      spacing={2}
      alignItems="start"
      sx={{
-        padding: 2,
+          padding: 2,
      }}
-    >
-      <Switch checked={checked} onChange={handleChange} />
-      <Stack>
-        <Typography
+  >
+    <Switch checked={checked} onChange={handleChange} />
+    <Stack>
+      <Typography
          variant="subtitle1"
          sx={{
-            fontWeight: "medium",
-            color: "text.primary",
+              fontWeight: "medium",
+              color: "text.primary"
          }}
-        >
+      >
          {featureKey}
-        </Typography>
-        <Typography variant="body2" color="text.secondary">
+      </Typography>
+      <Typography
+          variant="body2"
+          color="text.secondary"
+      >
          {featureDescription}
-        </Typography>
-      </Stack>
+      </Typography>
    </Stack>
-  );
-};
+  </Stack>
+}

 export const ExperimentalFeaturesList = () => {
  const record = useRecordContext();
@ -66,35 +62,36 @@ export const ExperimentalFeaturesList = () => {
    const fetchFeatures = async () => {
      const features = await dataProvider.getFeatures(record.id);
      setFeatures(features);
-    };
+    }

    fetchFeatures();
  }, []);

  const updateFeature = async (feature_name: string, feature_value: boolean) => {
-    const updatedFeatures = { ...features, [feature_name]: feature_value } as ExperimentalFeaturesModel;
+    const updatedFeatures = {...features, [feature_name]: feature_value} as ExperimentalFeaturesModel;
    setFeatures(updatedFeatures);
-    await dataProvider.updateFeatures(record.id, updatedFeatures);
+    const reponse = await dataProvider.updateFeatures(record.id, updatedFeatures);
    notify("ra.notification.updated", {
-      messageArgs: { smart_count: 1 },
-      type: "success",
+        messageArgs: { smart_count: 1 },
+        type: "success",
    });
  };

-  return (
-    <>
-      <Stack direction="column" spacing={1}>
-        {Object.keys(features).map((featureKey: string) => (
-          <ExperimentalFeatureRow
-            key={featureKey}
-            featureKey={featureKey}
-            featureValue={features[featureKey]}
-            updateFeature={updateFeature}
-          />
-        ))}
-      </Stack>
-    </>
-  );
-};
+  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;
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@ -1,6 +1,6 @@
-import { Avatar, Box, Link } from "@mui/material";
-import { useTheme } from "@mui/material/styles";
+import { Avatar, Box, Link, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
+import { useTheme } from "@mui/material/styles";

 const Footer = () => {
  const [version, setVersion] = useState<string | null>(null);
@ -13,46 +13,36 @@ const Footer = () => {
    }
  }, []);

-  return (
-    <Box
-      component="footer"
-      sx={{
-        position: "fixed",
-        zIndex: 100,
-        bottom: 0,
-        width: "100%",
-        bgcolor: theme.palette.background.default,
-        color: theme.palette.text.primary,
-        borderTop: "1px solid",
-        borderColor: theme.palette.divider,
-        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" }}
-      />
+  return (<Box
+    component="footer"
+    sx={{
+      position: 'fixed',
+      zIndex: 100,
+      bottom: 0,
+      width: '100%',
+      bgcolor: theme.palette.background.default,
+      color: theme.palette.text.primary,
+      borderTop: '1px solid',
+      borderColor: theme.palette.divider,
+      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" }} />
      <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"
-      >
+        by
+      <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>
-    </Box>
+      <Link sx={{ fontWeight: 'bold' }} href="https://matrix.to/#/#synapse-admin:etke.cc" target="_blank">#synapse-admin:etke.cc</Link>
+  </Box>
  );
 };

--- a/src/components/LoginFormBox.tsx
+++ b/src/components/LoginFormBox.tsx
@ -1,58 +1,59 @@
-import { Box } from "@mui/material";
 import { styled } from "@mui/material/styles";
+import { Box } from "@mui/material";

 const LoginFormBox = styled(Box)(({ theme }) => ({
-  display: "flex",
-  flexDirection: "column",
-  minHeight: "calc(100vh - 1rem)",
-  alignItems: "center",
-  justifyContent: "flex-start",
-  background: "url(./images/floating-cogs.svg)",
-  backgroundColor: theme.palette.mode === "dark" ? theme.palette.background.default : theme.palette.background.paper,
-  backgroundRepeat: "no-repeat",
-  backgroundSize: "cover",
+    display: "flex",
+    flexDirection: "column",
+    minHeight: "calc(100vh - 1rem)",
+    alignItems: "center",
+    justifyContent: "flex-start",
+    background: "url(./images/floating-cogs.svg)",
+    backgroundColor: theme.palette.mode === 'dark' ? theme.palette.background.default : theme.palette.background.paper,
+    backgroundRepeat: "no-repeat",
+    backgroundSize: "cover",

-  [`& .card`]: {
-    width: "30rem",
-    marginTop: "6rem",
-    marginBottom: "6rem",
-  },
-  [`& .avatar`]: {
-    margin: "1rem",
-    display: "flex",
-    justifyContent: "center",
-  },
-  [`& .icon`]: {
-    backgroundColor: theme.palette.grey[500],
-  },
-  [`& .hint`]: {
-    marginTop: "1em",
-    marginBottom: "1em",
-    display: "flex",
-    justifyContent: "center",
-    color: theme.palette.grey[600],
-  },
-  [`& .form`]: {
-    padding: "0 1rem 1rem 1rem",
-  },
-  [`& .select`]: {
-    marginBottom: "2rem",
-  },
-  [`& .actions`]: {
-    padding: "0 1rem 1rem 1rem",
-  },
-  [`& .serverVersion`]: {
-    color: theme.palette.grey[500],
-    fontFamily: "Roboto, Helvetica, Arial, sans-serif",
-    marginLeft: "0.5rem",
-  },
-  [`& .matrixVersions`]: {
-    color: theme.palette.grey[500],
-    fontFamily: "Roboto, Helvetica, Arial, sans-serif",
-    fontSize: "0.8rem",
-    marginBottom: "1rem",
-    marginLeft: "0.5rem",
-  },
-}));
+    [`& .card`]: {
+      width: "30rem",
+      marginTop: "6rem",
+      marginBottom: "6rem",
+    },
+    [`& .avatar`]: {
+      margin: "1rem",
+      display: "flex",
+      justifyContent: "center",
+    },
+    [`& .icon`]: {
+      backgroundColor: theme.palette.grey[500],
+    },
+    [`& .hint`]: {
+      marginTop: "1em",
+      marginBottom: "1em",
+      display: "flex",
+      justifyContent: "center",
+      color: theme.palette.grey[600],
+    },
+    [`& .form`]: {
+      padding: "0 1rem 1rem 1rem",
+    },
+    [`& .select`]: {
+      marginBottom: "2rem",
+    },
+    [`& .actions`]: {
+      padding: "0 1rem 1rem 1rem",
+    },
+    [`& .serverVersion`]: {
+      color: theme.palette.grey[500],
+      fontFamily: "Roboto, Helvetica, Arial, sans-serif",
+      marginLeft: "0.5rem",
+    },
+    [`& .matrixVersions`]: {
+      color: theme.palette.grey[500],
+      fontFamily: "Roboto, Helvetica, Arial, sans-serif",
+      fontSize: "0.8rem",
+      marginBottom: "1rem",
+      marginLeft: "0.5rem",
+    },
+  }
+));

 export default LoginFormBox;
--- a/src/components/ServerNotices.tsx
+++ b/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,6 +20,7 @@ import {
  useTranslate,
  useUnselectAll,
 } from "react-admin";
+import { useMutation } from "@tanstack/react-query";

 const ServerNoticeDialog = ({ open, onClose, onSubmit }) => {
  const translate = useTranslate();
@ -103,7 +104,7 @@ export const ServerNoticeBulkButton = () => {
  const dataProvider = useDataProvider();

  const { mutate: sendNotices, isPending } = useMutation({
-    mutationFn: data =>
+    mutationFn: (data) =>
      dataProvider.createMany("servernotices", {
        ids: selectedIds,
        data: data,
--- a/src/components/UserAccountData.tsx
+++ b/src/components/UserAccountData.tsx
@ -1,68 +0,0 @@
-import ArrowDownwardIcon from "@mui/icons-material/ArrowDownward";
-import { Typography, Box, Stack, Accordion, AccordionSummary, AccordionDetails } from "@mui/material";
-import { useEffect, useState } from "react";
-import { useDataProvider, useRecordContext, useTranslate } from "react-admin";
-
-import { SynapseDataProvider } from "../synapse/dataProvider";
-
-const UserAccountData = () => {
-  const dataProvider = useDataProvider() as SynapseDataProvider;
-  const record = useRecordContext();
-  const translate = useTranslate();
-  const [globalAccountData, setGlobalAccountData] = useState({});
-  const [roomsAccountData, setRoomsAccountData] = useState({});
-
-  if (!record) {
-    return null;
-  }
-
-  useEffect(() => {
-    const fetchAccountData = async () => {
-      const accountData = await dataProvider.getAccountData(record.id);
-      setGlobalAccountData(accountData.account_data.global);
-      setRoomsAccountData(accountData.account_data.rooms);
-    };
-    fetchAccountData();
-  }, []);
-
-  if (Object.keys(globalAccountData).length === 0 && Object.keys(roomsAccountData).length === 0) {
-    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" component="div">
-          <Box>
-            <Accordion>
-              <AccordionSummary expandIcon={<ArrowDownwardIcon />}>
-                <Typography variant="h6">{translate("resources.users.account_data.global")}</Typography>
-              </AccordionSummary>
-              <AccordionDetails>
-                <Box sx={{ whiteSpace: "pre-wrap" }}>{JSON.stringify(globalAccountData, null, 4)}</Box>
-              </AccordionDetails>
-            </Accordion>
-            <Accordion>
-              <AccordionSummary expandIcon={<ArrowDownwardIcon />}>
-                <Typography variant="h6">{translate("resources.users.account_data.rooms")}</Typography>
-              </AccordionSummary>
-              <AccordionDetails>
-                <Box sx={{ whiteSpace: "pre-wrap" }}>{JSON.stringify(roomsAccountData, null, 4)}</Box>
-              </AccordionDetails>
-            </Accordion>
-          </Box>
-        </Typography>
-      </Stack>
-    </>
-  );
-};
-
-export default UserAccountData;
--- a/src/components/UserImport.tsx
+++ b/src/components/UserImport.tsx
@ -0,0 +1,575 @@
+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;
--- a/src/components/UserRateLimits.tsx
+++ b/src/components/UserRateLimits.tsx
@ -1,18 +1,10 @@
 import { Stack, Typography } from "@mui/material";
-import { TextField } from "@mui/material";
 import { useEffect, useState } from "react";
-import { useDataProvider, useRecordContext, useTranslate } from "react-admin";
+import { useDataProvider, useNotify, useRecordContext, useTranslate } from "react-admin";
+import { TextField } from "@mui/material";
 import { useFormContext } from "react-hook-form";

-const RateLimitRow = ({
-  limit,
-  value,
-  updateRateLimit,
-}: {
-  limit: string;
-  value: object;
-  updateRateLimit: (limit: string, value: integer | null) => void;
-}) => {
+const RateLimitRow = ({ limit, value, updateRateLimit }: { limit: string, value: any, updateRateLimit: (limit: string, value: any) => void }) => {
  const translate = useTranslate();

  const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@ -24,35 +16,39 @@ const RateLimitRow = ({
    updateRateLimit(limit, value);
  };

-  return (
-    <Stack
-      spacing={1}
-      alignItems="start"
-      sx={{
+  return <Stack
+    spacing={1}
+    alignItems="start"
+    sx={{
        padding: 2,
+    }}
+  >
+    <TextField
+      id="outlined-number"
+      type="number"
+      value={value}
+      onChange={handleChange}
+      slotProps={{
+        inputLabel: {
+          shrink: true,
+        },
      }}
-    >
-      <TextField
-        type="number"
-        value={value}
-        onChange={handleChange}
-        slotProps={{
-          inputLabel: {
-            shrink: true,
-          },
-        }}
-        label={translate(`resources.users.limits.${limit}`)}
-      />
-      <Stack>
-        <Typography variant="body2" color="text.secondary">
-          {translate(`resources.users.limits.${limit}_text`)}
-        </Typography>
-      </Stack>
+      label={translate(`resources.users.limits.${limit}`)}
+    />
+    <Stack>
+      <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();
@ -66,31 +62,36 @@ const UserRateLimits = () => {
  }

  useEffect(() => {
-    const fetchRateLimits = async () => {
-      const rateLimits = await dataProvider.getRateLimits(record.id);
-      if (Object.keys(rateLimits).length > 0) {
-        setRateLimits(rateLimits);
+      const fetchRateLimits = async () => {
+          const rateLimits = await dataProvider.getRateLimits(record.id);
+          if (Object.keys(rateLimits).length > 0) {
+            setRateLimits(rateLimits);
+          }
      }
-    };

-    fetchRateLimits();
+      fetchRateLimits();
  }, []);

-  const updateRateLimit = async (limit: string, value: integer | null) => {
-    const updatedRateLimits = { ...rateLimits, [limit]: value };
+  const updateRateLimit = async (limit: string, value: any) => {
+    let 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} />
-        ))}
-      </Stack>
-    </>
-  );
+  return <>
+    <Stack
+      direction="column"
+    >
+      {Object.keys(rateLimits).map((limit: string) =>
+        <RateLimitRow
+          key={limit}
+          limit={limit}
+          value={rateLimits[limit]}
+          updateRateLimit={updateRateLimit}
+        />
+      )}
+    </Stack>
+  </>
 };

 export default UserRateLimits;
--- a/src/components/etke.cc/BillingPage.tsx
+++ b/src/components/etke.cc/BillingPage.tsx
@ -1,214 +0,0 @@
-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;
--- a/src/components/etke.cc/CurrentlyRunningCommand.tsx
+++ b/src/components/etke.cc/CurrentlyRunningCommand.tsx
@ -1,37 +0,0 @@
-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;
--- a/src/components/etke.cc/README.md
+++ b/src/components/etke.cc/README.md
@ -1,74 +0,0 @@
-# etke.cc-specific components
-
-This directory contains [etke.cc](https://etke.cc)-specific components, unusable for any other purposes and/or configuration.
-
-We at [etke.cc](https://etke.cc) attempting to develop everything open-source, but some things are too specific to be used by anyone else. This directory contains such components - they are only available for [etke.cc](https://etke.cc) customers.
-
-Due to the specifics mentioned above, these components are documented here rather than in the [docs](../../../docs/README.md), plus they are not supported as part of the Synapse Admin open-source project (i.e.: no issues, no PRs, no support, no requests, etc.).
-
-## Components
-
-### Server Status icon
-
-![Server Status icon](../../../screenshots/etke.cc/server-status/indicator.webp)
-
-In the application bar the new monitoring icon is displayed that shows the current server status, and has the following color dot (and tooltip indicators):
-
-* 🟢 (green) - the server is up and running, everything is fine, no issues detected
-* 🟡 (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)
-
-When you click on the [Server Status icon](#server-status-icon) in the application bar, you will be redirected to the
-Server Status page. This page contains the following information:
-
-* Overall server status (up/updating/has issues)
-* 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)
-
-In the application bar the new notifications icon is displayed that shows the number of unread (not removed) notifications
-
-### Server Notifications page
-
-![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.
--- a/src/components/etke.cc/ServerActionsPage.tsx
+++ b/src/components/etke.cc/ServerActionsPage.tsx
@ -1,51 +0,0 @@
-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;
--- a/src/components/etke.cc/ServerCommandsPanel.tsx
+++ b/src/components/etke.cc/ServerCommandsPanel.tsx
@ -1,210 +0,0 @@
-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;
--- a/src/components/etke.cc/ServerNotificationsBadge.tsx
+++ b/src/components/etke.cc/ServerNotificationsBadge.tsx
@ -1,245 +0,0 @@
-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 { 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 [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,
-      command !== ""
-    );
-    const serverNotifications = [...notificationsResponse.notifications];
-    serverNotifications.reverse();
-    setServerNotifications({
-      ...notificationsResponse,
-      notifications: serverNotifications,
-      success: notificationsResponse.success,
-    });
-  };
-
-  const deleteServerNotifications = async () => {
-    const deleteResponse = await dataProvider.deleteServerNotifications(etkeccAdmin);
-    if (deleteResponse.success) {
-      setServerNotifications({
-        notifications: [],
-        success: true,
-      });
-    }
-  };
-
-  useEffect(() => {
-    let serverNotificationsInterval: NodeJS.Timeout | null = null;
-    let timeoutId: NodeJS.Timeout | null = null;
-
-    if (etkeccAdmin) {
-      fetchNotifications();
-      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, command, locked_at]);
-
-  return { success, notifications, deleteServerNotifications };
-};
-
-export const ServerNotificationsBadge = () => {
-  const navigate = useNavigate();
-  const { success, notifications, deleteServerNotifications } = useServerNotifications();
-  const theme = useTheme();
-
-  // Modify menu state to work with Popper
-  const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
-  const open = Boolean(anchorEl);
-
-  const handleOpen = (event: React.MouseEvent<HTMLElement>) => {
-    setAnchorEl(anchorEl ? null : event.currentTarget);
-  };
-
-  const handleClose = () => {
-    setAnchorEl(null);
-  };
-
-  const handleSeeAllNotifications = () => {
-    handleClose();
-    navigate("/server_notifications");
-  };
-
-  const handleClearAllNotifications = async () => {
-    deleteServerNotifications();
-    handleClose();
-  };
-
-  if (!success) {
-    return null;
-  }
-
-  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 && (
-            <Badge badgeContent={notifications.length} color="error">
-              <NotificationsIcon />
-            </Badge>
-          )) || <NotificationsIcon />}
-        </Tooltip>
-      </IconButton>
-      <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
-              },
-            }}
-          >
-            {!notifications || notifications.length === 0 ? (
-              <Typography sx={{ p: 1 }} variant="body2">
-                No new notifications
-              </Typography>
-            ) : (
-              <List sx={{ p: 0 }} dense={true}>
-                <ListSubheader
-                  sx={{
-                    display: "flex",
-                    justifyContent: "space-between",
-                    alignItems: "center",
-                    fontWeight: "bold",
-                  }}
-                >
-                  <Typography variant="h6">Notifications</Typography>
-                  <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 : index}>
-                      <ListItem
-                        onClick={() => handleSeeAllNotifications()}
-                        sx={{
-                          display: "flex",
-                          flexDirection: "column",
-                          alignItems: "flex-start",
-                          overflow: "hidden",
-                          "&:hover": {
-                            backgroundColor: "action.hover",
-                            cursor: "pointer",
-                          },
-                        }}
-                      >
-                        <ListItemText
-                          primary={
-                            <Typography
-                              variant="body2"
-                              sx={{
-                                overflow: "hidden",
-                                textOverflow: "ellipsis",
-                              }}
-                              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"
-                    onClick={() => handleClearAllNotifications()}
-                    size="small"
-                    color="error"
-                    sx={{
-                      pl: 0,
-                      pt: 1,
-                      verticalAlign: "middle",
-                    }}
-                  >
-                    <DeleteIcon fontSize="small" sx={{ mr: 1 }} />
-                    Clear all
-                  </Button>
-                </ListItem>
-              </List>
-            )}
-          </Paper>
-        </ClickAwayListener>
-      </Popper>
-    </Box>
-  );
-};
--- a/src/components/etke.cc/ServerNotificationsPage.tsx
+++ b/src/components/etke.cc/ServerNotificationsPage.tsx
@ -1,66 +0,0 @@
-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.replace(" ", "T") + "Z");
-  return <Tooltip title={dateFromDateString.toLocaleString()}>{<span>{getTimeSince(date) + " ago"}</span>}</Tooltip>;
-};
-
-const ServerNotificationsPage = () => {
-  const { etkeccAdmin } = useAppContext();
-  const [serverNotifications, setServerNotifications] = useStore<ServerNotificationsResponse>("serverNotifications", {
-    notifications: [],
-    success: false,
-  });
-
-  const notifications = serverNotifications.notifications;
-
-  return (
-    <Stack spacing={3} mt={3}>
-      <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 () => {
-              await dataProvider.deleteServerNotifications(etkeccAdmin);
-              setServerNotifications({
-                notifications: [],
-                success: true,
-              });
-            }}
-          >
-            <DeleteIcon fontSize="small" sx={{ mr: 1 }} /> Clear
-          </Button>
-        </Box>
-      </Stack>
-
-      {notifications.length === 0 ? (
-        <Paper sx={{ p: 2 }}>
-          <Typography>No new notifications.</Typography>
-        </Paper>
-      ) : (
-        notifications.map((notification, index) => (
-          <Paper key={notification.event_id ? notification.event_id : index} sx={{ p: 2 }}>
-            <Stack spacing={1}>
-              <Typography variant="subtitle1" fontWeight="bold" color="text.secondary">
-                <DisplayTime date={notification.sent_at} />
-              </Typography>
-              <Typography dangerouslySetInnerHTML={{ __html: notification.output }} />
-            </Stack>
-          </Paper>
-        ))
-      )}
-    </Stack>
-  );
-};
-
-export default ServerNotificationsPage;
--- a/src/components/etke.cc/ServerStatusBadge.tsx
+++ b/src/components/etke.cc/ServerStatusBadge.tsx
@ -1,241 +0,0 @@
-import MonitorHeartIcon from "@mui/icons-material/MonitorHeart";
-import { Avatar, Badge, Box, Theme, Tooltip } from "@mui/material";
-import { BadgeProps } from "@mui/material/Badge";
-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;
-  theme?: Theme;
-}
-
-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",
-      top: 0,
-      left: 0,
-      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)",
-      opacity: 1,
-    },
-    "100%": {
-      transform: "scale(2.4)",
-      opacity: 0,
-    },
-  },
-}));
-
-// every 5 minutes
-const SERVER_STATUS_INTERVAL_TIME = 5 * 60 * 1000;
-// every 5 seconds
-const SERVER_CURRENT_PROCCESS_INTERVAL_TIME = 5 * 1000;
-
-const useServerStatus = () => {
-  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, command !== "");
-    setServerStatus({
-      ok: serverStatus.ok,
-      success: serverStatus.success,
-      host: serverStatus.host,
-      results: serverStatus.results,
-    });
-  };
-
-  useEffect(() => {
-    let serverStatusInterval: NodeJS.Timeout | null = null;
-    let timeoutId: NodeJS.Timeout | null = null;
-
-    if (etkeccAdmin) {
-      checkServerStatus();
-      timeoutId = setTimeout(() => {
-        // start the interval after 10 seconds to avoid too many requests
-        serverStatusInterval = setInterval(checkServerStatus, SERVER_STATUS_INTERVAL_TIME);
-      }, 10000);
-    } else {
-      setServerStatus({ ok: false, success: false, host: "", results: [] });
-    }
-
-    return () => {
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-      }
-      if (serverStatusInterval) {
-        clearInterval(serverStatusInterval);
-      }
-    };
-  }, [etkeccAdmin, command]);
-
-  return { isOkay, successCheck };
-};
-
-const useCurrentServerProcess = () => {
-  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,
-      command !== ""
-    );
-    setServerProcess({
-      ...serverProcess,
-      command: serverProcess.command,
-      locked_at: serverProcess.locked_at,
-    });
-  };
-
-  useEffect(() => {
-    let serverCheckInterval: NodeJS.Timeout | null = null;
-    let timeoutId: NodeJS.Timeout | null = null;
-
-    if (etkeccAdmin) {
-      checkServerRunningProcess();
-      timeoutId = setTimeout(() => {
-        serverCheckInterval = setInterval(checkServerRunningProcess, SERVER_CURRENT_PROCCESS_INTERVAL_TIME);
-      }, 5000);
-    } else {
-      setServerProcess({ command: "", locked_at: "" });
-    }
-
-    return () => {
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-      }
-      if (serverCheckInterval) {
-        clearInterval(serverCheckInterval);
-      }
-    };
-  }, [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 navigate = useNavigate();
-
-  if (!successCheck) {
-    return null;
-  }
-
-  const handleServerStatusClick = () => {
-    navigate("/server_status");
-  };
-
-  let tooltipText = "Click to view Server Status";
-
-  if (command && locked_at) {
-    tooltipText = `Running: ${command}; ${tooltipText}`;
-  }
-
-  return (
-    <Button onClick={handleServerStatusClick} size="medium" sx={{ minWidth: "auto", ".MuiButton-startIcon": { m: 0 } }}>
-      <Tooltip title={tooltipText} sx={{ cursor: "pointer" }}>
-        <Box>
-          <ServerStatusStyledBadge
-            inSidebar={false}
-            command={command || ""}
-            locked_at={locked_at || ""}
-            isOkay={isOkay}
-            isLoaded={successCheck}
-          />
-        </Box>
-      </Tooltip>
-    </Button>
-  );
-};
-
-export default ServerStatusBadge;
--- a/src/components/etke.cc/ServerStatusPage.tsx
+++ b/src/components/etke.cc/ServerStatusPage.tsx
@ -1,146 +0,0 @@
-import CheckIcon from "@mui/icons-material/Check";
-import CloseIcon from "@mui/icons-material/Close";
-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 StatusChip = ({
-  isOkay,
-  size = "medium",
-  command,
-}: {
-  isOkay: boolean;
-  size?: "small" | "medium";
-  command?: string;
-}) => {
-  let label = "OK";
-  let icon = <CheckIcon />;
-  let color: ChipProps["color"] = "success";
-  if (!isOkay) {
-    label = "Error";
-    icon = <CloseIcon />;
-    color = "error";
-  }
-
-  if (command) {
-    label = command;
-    color = "warning";
-    icon = <EngineeringIcon />;
-  }
-
-  return <Chip icon={icon} label={label} color={color} variant="outlined" size={size} />;
-};
-
-const ServerComponentText = ({ text }: { text: string }) => {
-  return <Typography variant="body1" dangerouslySetInnerHTML={{ __html: text }} />;
-};
-
-const ServerStatusPage = () => {
-  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 successCheck = serverStatus.success;
-  const isOkay = serverStatus.ok;
-  const host = serverStatus.host;
-  const results = serverStatus.results;
-
-  const groupedResults: Record<string, ServerStatusComponent[]> = {};
-  for (const result of results) {
-    if (!groupedResults[result.category]) {
-      groupedResults[result.category] = [];
-    }
-    groupedResults[result.category].push(result);
-  }
-
-  if (!successCheck) {
-    return (
-      <Paper elevation={3} sx={{ p: 3, mt: 3 }}>
-        <Stack direction="row" spacing={2} alignItems="center">
-          <Typography color="info">Fetching real-time server health... Just a moment!</Typography>
-        </Stack>
-      </Paper>
-    );
-  }
-
-  return (
-    <Stack spacing={3} mt={3}>
-      <Stack spacing={1} direction="row" alignItems="center">
-        <Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
-          <Typography variant="h4">Status:</Typography>
-          <StatusChip isOkay={isOkay} command={command} />
-        </Box>
-        <Typography variant="h5" color="primary" fontWeight="medium">
-          {host}
-        </Typography>
-      </Stack>
-
-      <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>
-        .
-      </Typography>
-
-      <Stack spacing={2} direction="row">
-        {Object.keys(groupedResults).map((category, _idx) => (
-          <Box key={`category_${category}`} sx={{ flex: 1 }}>
-            <Typography variant="h5" mb={1}>
-              {category}
-            </Typography>
-            <Paper elevation={2} sx={{ p: 3 }}>
-              <Stack spacing={1} divider={<Divider />}>
-                {groupedResults[category].map((result, idx) => (
-                  <Box key={`${category}_${idx}`}>
-                    <Stack spacing={2}>
-                      <Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
-                        <StatusChip isOkay={result.ok} size="small" />
-                        {result.label.url ? (
-                          <Link href={result.label.url} target="_blank" rel="noopener noreferrer">
-                            <ServerComponentText text={result.label.text} />
-                          </Link>
-                        ) : (
-                          <ServerComponentText text={result.label.text} />
-                        )}
-                      </Box>
-                      {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>
-                      )}
-                    </Stack>
-                  </Box>
-                ))}
-              </Stack>
-            </Paper>
-          </Box>
-        ))}
-      </Stack>
-    </Stack>
-  );
-};
-
-export default ServerStatusPage;
--- a/src/components/etke.cc/hooks/useServerCommands.ts
+++ b/src/components/etke.cc/hooks/useServerCommands.ts
@ -1,29 +0,0 @@
-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 };
-};
--- a/src/components/etke.cc/schedules/components/recurring/RecurringCommandEdit.tsx
+++ b/src/components/etke.cc/schedules/components/recurring/RecurringCommandEdit.tsx
@ -1,182 +0,0 @@
-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;
--- a/src/components/etke.cc/schedules/components/recurring/RecurringCommandsList.tsx
+++ b/src/components/etke.cc/schedules/components/recurring/RecurringCommandsList.tsx
@ -1,63 +0,0 @@
-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;
--- a/src/components/etke.cc/schedules/components/recurring/RecurringDeleteButton.tsx
+++ b/src/components/etke.cc/schedules/components/recurring/RecurringDeleteButton.tsx
@ -1,65 +0,0 @@
-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;
--- a/src/components/etke.cc/schedules/components/scheduled/ScheduledCommandEdit.tsx
+++ b/src/components/etke.cc/schedules/components/scheduled/ScheduledCommandEdit.tsx
@ -1,139 +0,0 @@
-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;
--- a/src/components/etke.cc/schedules/components/scheduled/ScheduledCommandShow.tsx
+++ b/src/components/etke.cc/schedules/components/scheduled/ScheduledCommandShow.tsx
@ -1,86 +0,0 @@
-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;
--- a/src/components/etke.cc/schedules/components/scheduled/ScheduledCommandsList.tsx
+++ b/src/components/etke.cc/schedules/components/scheduled/ScheduledCommandsList.tsx
@ -1,71 +0,0 @@
-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;
--- a/src/components/etke.cc/schedules/components/scheduled/ScheduledDeleteButton.tsx
+++ b/src/components/etke.cc/schedules/components/scheduled/ScheduledDeleteButton.tsx
@ -1,65 +0,0 @@
-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;
--- a/src/components/etke.cc/schedules/hooks/useRecurringCommands.tsx
+++ b/src/components/etke.cc/schedules/hooks/useRecurringCommands.tsx
@ -1,15 +0,0 @@
-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 };
-};
--- a/src/components/etke.cc/schedules/hooks/useScheduledCommands.tsx
+++ b/src/components/etke.cc/schedules/hooks/useScheduledCommands.tsx
@ -1,15 +0,0 @@
-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 };
-};
--- a/src/components/media.tsx
+++ b/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 { Box, Dialog, DialogContent, DialogContentText, DialogTitle, Tooltip } from "@mui/material";
+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 { 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 { DeleteMediaParams, SynapseDataProvider } from "../synapse/dataProvider";
 import { dateParser } from "../utils/date";
-import decodeURLComponent from "../utils/decodeURLComponent";
+import { DeleteMediaParams, SynapseDataProvider } from "../synapse/dataProvider";
 import { fetchAuthenticatedMedia } from "../utils/fetchMedia";

 const DeleteMediaDialog = ({ open, onClose, onSubmit }) => {
@ -54,9 +54,24 @@ 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>
@ -109,79 +124,6 @@ export const DeleteMediaButton = (props: ButtonProps) => {
  );
 };

-const PurgeRemoteMediaDialog = ({ open, onClose, onSubmit }) => {
-  const translate = useTranslate();
-
-  const PurgeRemoteMediaToolbar = (props: ToolbarProps) => (
-    <Toolbar {...props}>
-      <SaveButton label="purge_remote_media.action.send" icon={<DeleteSweepIcon />} />
-      <Button label="ra.action.cancel" onClick={onClose}>
-        <IconCancel />
-      </Button>
-    </Toolbar>
-  );
-
-  return (
-    <Dialog open={open} onClose={onClose}>
-      <DialogTitle>{translate("purge_remote_media.action.send")}</DialogTitle>
-      <DialogContent>
-        <DialogContentText>{translate("purge_remote_media.helper.send")}</DialogContentText>
-        <SimpleForm toolbar={<PurgeRemoteMediaToolbar />} onSubmit={onSubmit}>
-          <DateTimeInput
-            source="before_ts"
-            label="purge_remote_media.fields.before_ts"
-            defaultValue={0}
-            parse={dateParser}
-          />
-        </SimpleForm>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export const PurgeRemoteMediaButton = (props: ButtonProps) => {
-  const [open, setOpen] = useState(false);
-  const notify = useNotify();
-  const dataProvider = useDataProvider<SynapseDataProvider>();
-  const { mutate: purgeRemoteMedia, isPending } = useMutation({
-    mutationFn: (values: DeleteMediaParams) => dataProvider.purgeRemoteMedia(values),
-    onSuccess: () => {
-      notify("purge_remote_media.action.send_success");
-      closeDialog();
-    },
-    onError: () => {
-      notify("purge_remote_media.action.send_failure", {
-        type: "error",
-      });
-    },
-  });
-
-  const openDialog = () => setOpen(true);
-  const closeDialog = () => setOpen(false);
-
-  return (
-    <>
-      <Button
-        {...props}
-        label="purge_remote_media.action.send"
-        onClick={openDialog}
-        disabled={isPending}
-        sx={{
-          "&:hover": {
-            // Reset on mouse devices
-            "@media (hover: none)": {
-              backgroundColor: "transparent",
-            },
-          },
-        }}
-      >
-        <DeleteSweepIcon />
-      </Button>
-      <PurgeRemoteMediaDialog open={open} onClose={closeDialog} onSubmit={purgeRemoteMedia} />
-    </>
-  );
-};
-
 export const ProtectMediaButton = (props: ButtonProps) => {
  const record = useRecordContext();
  const translate = useTranslate();
@ -372,7 +314,6 @@ export const QuarantineMediaButton = (props: ButtonProps) => {
 export const ViewMediaButton = ({ mxcURL, label, uploadName, mimetype }) => {
  const translate = useTranslate();
  const [loading, setLoading] = useState(false);
-  const notify = useNotify();
  const isImage = mimetype && mimetype.startsWith("image/");

  const openFileInNewTab = (blobURL: string) => {
@ -393,31 +334,18 @@ 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) => {
    setLoading(true);
    const response = await fetchAuthenticatedMedia(mxcURL, "original");
-
-    if (response.ok) {
-      const blob = await response.blob();
-      const blobURL = URL.createObjectURL(blob);
-      if (preview) {
-        openFileInNewTab(blobURL);
-      } else {
-        downloadFile(blobURL);
-      }
+    const blob = await response.blob();
+    const blobURL = URL.createObjectURL(blob);
+    if (preview) {
+      openFileInNewTab(blobURL);
    } else {
-      const body = await response.json();
-      notify("resources.room_media.action.error", {
-        messageArgs: {
-          errcode: body.errcode,
-          errstatus: response.status,
-          error: body.error,
-        },
-        type: "error",
-      });
+      downloadFile(blobURL);
    }
    setLoading(false);
  };
@ -443,7 +371,7 @@ export const ViewMediaButton = ({ mxcURL, label, uploadName, mimetype }) => {
          onClick={() => handleFile(false)}
          style={{ minWidth: 0, padding: 0, marginRight: 8 }}
        >
-          {loading ? <DownloadingIcon /> : <DownloadIcon />}
+        {loading ? <DownloadingIcon /> : <DownloadIcon />}
        </Button>
        <span>{label}</span>
      </Box>
@ -463,18 +391,10 @@ export const MediaIDField = ({ source }) => {
    return null;
  }

-  let uploadName = mediaID;
-  if (get(record, "upload_name")) {
-    uploadName = decodeURLComponent(get(record, "upload_name")?.toString());
-  }
+  const uploadName = decodeURIComponent(get(record, "upload_name")?.toString());
+  const mxcURL = `mxc://${homeserver}/${mediaID}`;

-  let mxcURL = mediaID;
-  if (!mediaID.startsWith(`mxc://${homeserver}`)) {
-    // this is user's media, where mediaID doesn't have the mxc://home_server/ prefix as it has in the rooms
-    mxcURL = `mxc://${homeserver}/${mediaID}`;
-  }
-
-  return <ViewMediaButton mxcURL={mxcURL} label={mediaID} uploadName={uploadName} mimetype={record.media_type} />;
+  return <ViewMediaButton mxcURL={mxcURL} label={mediaID} uploadName={uploadName} mimetype={record.media_type}/>;
 };

 export const ReportMediaContent = ({ source }) => {
@ -488,10 +408,7 @@ export const ReportMediaContent = ({ source }) => {
    return null;
  }

-  let uploadName = "";
-  if (get(record, "event_json.content.body")) {
-    uploadName = decodeURLComponent(get(record, "event_json.content.body")?.toString());
-  }
+  const uploadName = decodeURIComponent(get(record, "event_json.content.body")?.toString());

-  return <ViewMediaButton mxcURL={mxcURL} label={mxcURL} uploadName={uploadName} mimetype={record.media_type} />;
+  return <ViewMediaButton mxcURL={mxcURL} label={mxcURL} uploadName={uploadName} mimetype={record.media_type}/>;
 };
--- a/src/components/user-import/ConflictModeCard.tsx
+++ b/src/components/user-import/ConflictModeCard.tsx
@ -1,50 +0,0 @@
-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;
--- a/src/components/user-import/ErrorsCard.tsx
+++ b/src/components/user-import/ErrorsCard.tsx
@ -1,36 +0,0 @@
-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;
--- a/src/components/user-import/ResultsCard.tsx
+++ b/src/components/user-import/ResultsCard.tsx
@ -1,95 +0,0 @@
-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;
--- a/src/components/user-import/StartImportCard.tsx
+++ b/src/components/user-import/StartImportCard.tsx
@ -1,50 +0,0 @@
-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;
--- a/src/components/user-import/StatsCard.tsx
+++ b/src/components/user-import/StatsCard.tsx
@ -1,100 +0,0 @@
-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;
--- a/src/components/user-import/UploadCard.tsx
+++ b/src/components/user-import/UploadCard.tsx
@ -1,44 +0,0 @@
-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;
--- a/src/components/user-import/UserImport.tsx
+++ b/src/components/user-import/UserImport.tsx
@ -1,69 +0,0 @@
-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;
--- a/src/components/user-import/types.ts
+++ b/src/components/user-import/types.ts
@ -1,47 +0,0 @@
-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;
-}
--- a/src/components/user-import/useImportFile.tsx
+++ b/src/components/user-import/useImportFile.tsx
@ -1,377 +0,0 @@
-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;
--- a/src/i18n/de.ts
+++ b/src/i18n/de.ts
@ -12,14 +12,9 @@ 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,
@ -29,15 +24,13 @@ 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,
@ -55,15 +48,14 @@ 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",
      },
    },
    users: {
      invalid_user_id: "Lokaler Anteil der Matrix Benutzer-ID ohne Homeserver.",
-      tabs: { sso: "SSO", experimental: "Experimentell", limits: "Rate Limits", account_data: "Kontodaten" },
+      tabs: { sso: "SSO", experimental: "Experimentell", limits: "Rate Limits" },
    },
    rooms: {
      details: "Raumdetails",
@ -72,7 +64,6 @@ const de: SynapseTranslationMessages = {
        members: "Mitglieder",
        detail: "Details",
        permission: "Berechtigungen",
-        media: "Medien",
      },
    },
    reports: { tabs: { basic: "Allgemein", detail: "Details" } },
@ -92,7 +83,7 @@ const de: SynapseTranslationMessages = {
    goToPdf: "Gehe zum PDF",
    cards: {
      importstats: {
-        header: "Geparste Benutzer für den Import",
+        header: "Benutzer importieren",
        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",
@ -155,20 +146,6 @@ const de: SynapseTranslationMessages = {
      send: "Diese API löscht die lokalen Medien von der Festplatte des eigenen Servers. Dies umfasst alle lokalen Miniaturbilder und Kopien von Medien. Diese API wirkt sich nicht auf Medien aus, die sich in externen Medien-Repositories befinden.",
    },
  },
-  purge_remote_media: {
-    name: "Externe Medien",
-    fields: {
-      before_ts: "letzter Zugriff vor",
-    },
-    action: {
-      send: "Externe Medien löschen",
-      send_success: "Die Anfrage zum Löschen externer Medien wurde gesendet.",
-      send_failure: "Bei der Anfrage zum Löschen externer Medien ist ein Fehler aufgetreten.",
-    },
-    helper: {
-      send: "Diese API löscht den externen Medien-Cache von der Festplatte Ihres eigenen Servers. Dazu gehören alle lokalen Thumbnails und Kopien heruntergeladener Medien. Diese API beeinflusst nicht die Medien, die in das eigene Medienarchiv des Servers hochgeladen wurden.",
-    },
-  },
  resources: {
    users: {
      name: "Benutzer",
@ -182,13 +159,11 @@ const de: SynapseTranslationMessages = {
        is_guest: "Gast",
        admin: "Server Administrator",
        locked: "Gesperrt",
-        suspended: "Suspendiert",
        deactivated: "Deaktiviert",
        erased: "Gelöscht",
        guests: "Zeige Gäste",
        show_deactivated: "Zeige deaktivierte Benutzer",
        show_locked: "Zeige gesperrte Benutzer",
-        show_suspended: "Zeige suspendierte Benutzer",
        user_id: "Suche Benutzer",
        displayname: "Anzeigename",
        password: "Passwort",
@ -204,16 +179,10 @@ 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.",
        erase: "DSGVO konformes Löschen der Benutzerdaten.",
-        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_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",
@ -233,8 +202,7 @@ 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",
      },
@ -243,12 +211,7 @@ const de: SynapseTranslationMessages = {
        messages_per_second_text: "Die Anzahl der Aktionen, die in einer Sekunde durchgeführt werden können.",
        burst_count: "Burst-Anzahl",
        burst_count_text: "Die Anzahl der Aktionen, die vor der Begrenzung durchgeführt werden können.",
-      },
-      account_data: {
-        title: "Kontodaten",
-        global: "Globale",
-        rooms: "Räume",
-      },
+      }
    },
    rooms: {
      name: "Raum |||| Räume",
@ -311,11 +274,10 @@ 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: {
@ -467,18 +429,6 @@ const de: SynapseTranslationMessages = {
        sender: "Absender",
      },
    },
-    room_media: {
-      name: "Medien",
-      fields: {
-        media_id: "Medien ID",
-      },
-      helper: {
-        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}",
-      },
-    },
    room_directory: {
      name: "Raumverzeichnis",
      fields: {
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@ -1,13 +1,3 @@
-// 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 ".";
@ -28,8 +18,7 @@ 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 +29,6 @@ const en: SynapseTranslationMessages = {
        sso: "SSO",
        experimental: "Experimental",
        limits: "Rate Limits",
-        account_data: "Account Data",
      },
    },
    rooms: {
@ -50,8 +38,7 @@ const en: SynapseTranslationMessages = {
        members: "Members",
        detail: "Details",
        permission: "Permissions",
-        media: "Media",
-      },
+      }
    },
    reports: { tabs: { basic: "Basic", detail: "Details" } },
  },
@ -69,7 +56,7 @@ const en: SynapseTranslationMessages = {
    goToPdf: "Go to PDF",
    cards: {
      importstats: {
-        header: "Parsed users for import",
+        header: "Import users",
        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",
@ -132,20 +119,6 @@ const en: SynapseTranslationMessages = {
      send: "This API deletes the local media from the disk of your own server. This includes any local thumbnails and copies of media downloaded. This API will not affect media that has been uploaded to external media repositories.",
    },
  },
-  purge_remote_media: {
-    name: "Remote Media",
-    fields: {
-      before_ts: "last access before",
-    },
-    action: {
-      send: "Purge remote media",
-      send_success: "Purge remote media request has been sent.",
-      send_failure: "An error has occurred with the purge remote media request.",
-    },
-    helper: {
-      send: "This API purges the remote media cache from the disk of your own server. This includes any local thumbnails and copies of media downloaded. This API will not affect media that has been uploaded to the server's own media repository.",
-    },
-  },
  resources: {
    users: {
      name: "User |||| Users",
@ -159,13 +132,11 @@ const en: SynapseTranslationMessages = {
        is_guest: "Guest",
        admin: "Server Administrator",
        locked: "Locked",
-        suspended: "Suspended",
        deactivated: "Deactivated",
        erased: "Erased",
        guests: "Show guests",
        show_deactivated: "Show deactivated users",
        show_locked: "Show locked users",
-        show_suspended: "Show suspended users",
        user_id: "Search user",
        displayname: "Displayname",
        password: "Password",
@ -181,15 +152,10 @@ 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: "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: "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_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",
@ -218,12 +184,7 @@ const en: SynapseTranslationMessages = {
        messages_per_second_text: "The number of actions that can be performed in a second.",
        burst_count: "Burst count",
        burst_count_text: "How many actions that can be performed before being limited.",
-      },
-      account_data: {
-        title: "Account Data",
-        global: "Global",
-        rooms: "Rooms",
-      },
+      }
    },
    rooms: {
      name: "Room |||| Rooms",
@ -286,11 +247,10 @@ 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: {
@ -441,18 +401,6 @@ const en: SynapseTranslationMessages = {
        sender: "Sender",
      },
    },
-    room_media: {
-      name: "Media",
-      fields: {
-        media_id: "Media ID",
-      },
-      helper: {
-        info: "This is a list of media that has been uploaded to the room. It is not possible to delete media that has been uploaded to external media repositories.",
-      },
-      action: {
-        error: "%{errcode} (%{errstatus}) %{error}",
-      },
-    },
    room_directory: {
      name: "Room directory",
      fields: {
@ -495,23 +443,5 @@ 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;
--- a/src/i18n/fa.ts
+++ b/src/i18n/fa.ts
@ -17,15 +17,14 @@ const fa: SynapseTranslationMessages = {
      access_token: "توکن دسترسی",
      logout_acces_token_dialog: {
        title: "شما در حال استفاده از یک نشانه دسترسی ماتریکس موجود هستید.",
-        content:
-          "آیا می‌خواهید این جلسه (که می‌تواند در جای دیگر، مانند یک کلاینت ماتریکس استفاده شود) را نابود کنید یا فقط از پنل مدیریت خارج شوید؟",
+        content: "آیا می‌خواهید این جلسه (که می‌تواند در جای دیگر، مانند یک کلاینت ماتریکس استفاده شود) را نابود کنید یا فقط از پنل مدیریت خارج شوید؟",
        confirm: "نابودی جلسه",
        cancel: "فقط خروج از پنل مدیریت",
      },
    },
    users: {
      invalid_user_id: "بخش محلی یک شناسه کاربری ماتریکس بدون سرور خانگی.",
-      tabs: { sso: "SSO", experimental: "تجربی", limits: "محدودیت ها", account_data: "داده های کاربر" },
+      tabs: { sso: "SSO", experimental: "تجربی", limits: "محدودیت ها" },
    },
    rooms: {
      tabs: {
@ -33,7 +32,6 @@ const fa: SynapseTranslationMessages = {
        members: "اعضا",
        detail: "جزئیات",
        permission: "مجوزها",
-        media: "رسانه ها",
      },
    },
    reports: { tabs: { basic: "اصلی", detail: "جزئیات" } },
@ -52,7 +50,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",
@ -115,20 +113,6 @@ const fa: SynapseTranslationMessages = {
      send: "این API رسانه های محلی را از دیسک سرور خود حذف می کند. این شامل هر تصویر کوچک محلی و کپی از رسانه دانلود شده است. این API بر رسانه‌هایی که در مخازن رسانه خارجی آپلود شده‌اند تأثیری نخواهد گذاشت.",
    },
  },
-  purge_remote_media: {
-    name: "رسانه‌های از راه دور",
-    fields: {
-      before_ts: "آخرین دسترسی قبل از",
-    },
-    action: {
-      send: "پاک کردن رسانه‌های از راه دور",
-      send_success: "درخواست پاک کردن رسانه‌های از راه دور ارسال شد.",
-      send_failure: "درخواست برای پاک کردن رسانه‌های از راه دور با خطا مواجه شد.",
-    },
-    helper: {
-      send: "این API کش رسانه‌های از راه دور را از دیسک سرور شما پاک می‌کند. این شامل هر گونه بندانگشتی محلی و نسخه‌های رسانه‌های دانلود شده می‌شود. این API بر رسانه‌های آپلود شده به مخزن رسانه سرور تأثیری نخواهد داشت.",
-    },
-  },
  resources: {
    users: {
      name: "کاربر |||| کاربران",
@ -142,12 +126,9 @@ const fa: SynapseTranslationMessages = {
        is_guest: "مهمان",
        admin: "مدیر سرور",
        deactivated: "غیرفعال",
-        locked: "قفل شده",
-        suspended: "معلق",
        guests: "نمایش مهمانان",
        show_deactivated: "نمایش کاربران غیرفعال شده",
        show_locked: "نمایش کاربران قفل شده",
-        show_suspended: "نمایش کاربران معلق",
        user_id: "جستجوی کاربر",
        displayname: "نام نمایشی",
        password: "رمز عبور",
@ -162,16 +143,11 @@ 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: "نام کاربری موجود",
@ -191,8 +167,7 @@ const fa: SynapseTranslationMessages = {
        redact_events: "تنقيح جميع الأحداث المرسلة من قبل المستخدم (-s)",
        generate_password: "توليد رمز عبور",
        overwrite_title: "هشدار!",
-        overwrite_content:
-          "این نام کاربری قبلا استفاده شده است. آیا مطمئن هستید که می خواهید کاربر موجود را بازنویسی کنید؟",
+        overwrite_content: "این نام کاربری قبلا استفاده شده است. آیا مطمئن هستید که می خواهید کاربر موجود را بازنویسی کنید؟",
        overwrite_cancel: "انصراف",
        overwrite_confirm: "بازنویسی",
      },
@ -201,12 +176,7 @@ const fa: SynapseTranslationMessages = {
        messages_per_second_text: "تعداد عملیاتی که می تواند در یک ثانیه انجام شود.",
        burst_count: "تعداد پیچیدگی",
        burst_count_text: "تعداد عملیاتی که می تواند قبل از محدودیت انجام شود.",
-      },
-      account_data: {
-        title: "داده های کاربر",
-        global: "عمومی",
-        rooms: "اتاق ها",
-      },
+      }
    },
    rooms: {
      name: "اتاق |||| اتاق ها",
@ -269,11 +239,10 @@ const fa: SynapseTranslationMessages = {
          assign_admin: "مدیر انتخاب کنید",
          title: "مدیر اتاق %{roomName} را انتخاب کنید",
          confirm: "مدیر انتخاب کنید",
-          content:
-            "کامل MXID کاربری را وارد کنید که به عنوان مدیر تنظیم شود.\nهشدار: برای این کار، اتاق باید حداقل یک اعضای محلی به عنوان مدیر داشته باشد.",
+          content: "کامل MXID کاربری را وارد کنید که به عنوان مدیر تنظیم شود.\nهشدار: برای این کار، اتاق باید حداقل یک اعضای محلی به عنوان مدیر داشته باشد.",
          success: "کاربر به عنوان مدیر اتاق تنظیم شد.",
          failure: "کاربر به عنوان مدیر اتاق تنظیم نشد. %{errMsg}",
-        },
+        }
      },
    },
    reports: {
@ -411,18 +380,6 @@ const fa: SynapseTranslationMessages = {
        sender: "فرستنده",
      },
    },
-    room_media: {
-      name: "رسانه ها",
-      fields: {
-        media_id: "شناسه رسانه",
-      },
-      helper: {
-        info: "این یک لیست از رسانه ها است که در اتاق بارگذاری شده است. نمی توان رسانه ها را حذف کرد که در اتاق های خارجی بارگذاری شده اند.",
-      },
-      action: {
-        error: "%{errcode} (%{errstatus}) %{error}",
-      },
-    },
    room_directory: {
      name: "راهنمای اتاق",
      fields: {
--- a/src/i18n/fr.ts
+++ b/src/i18n/fr.ts
@ -17,20 +17,14 @@ 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" },
    },
    rooms: {
      tabs: {
@ -38,7 +32,6 @@ const fr: SynapseTranslationMessages = {
        members: "Membres",
        detail: "Détails",
        permission: "Permissions",
-        media: "Médias",
      },
    },
    reports: { tabs: { basic: "Informations de base", detail: "Détails" } },
@ -58,7 +51,7 @@ const fr: SynapseTranslationMessages = {
    goToPdf: "Voir le PDF",
    cards: {
      importstats: {
-        header: "Utilisateurs analysés pour l'import",
+        header: "Importer des utilisateurs",
        users_total:
          "%{smart_count} utilisateur dans le fichier CSV |||| %{smart_count} utilisateurs dans le fichier CSV",
        guest_count: "%{smart_count} visiteur |||| %{smart_count} visiteurs",
@ -123,20 +116,6 @@ const fr: SynapseTranslationMessages = {
      send: "Cette API supprime les médias locaux du disque de votre propre serveur. Cela inclut toutes les vignettes locales et les copies des médias téléchargés. Cette API n'affectera pas les médias qui ont été téléversés dans des dépôts de médias externes.",
    },
  },
-  purge_remote_media: {
-    name: "Médias distants",
-    fields: {
-      before_ts: "dernier accès avant",
-    },
-    action: {
-      send: "Purger les médias distants",
-      send_success: "La demande de purge des médias distants a été envoyée.",
-      send_failure: "Une erreur est survenue lors de la demande de purge des médias distants.",
-    },
-    helper: {
-      send: "Cette API purge le cache des médias distants du disque de votre propre serveur. Cela inclut toutes les vignettes locales et les copies des médias téléchargés. Cette API n'affectera pas les médias qui ont été téléchargés dans le dépôt de médias du serveur.",
-    },
-  },
  resources: {
    users: {
      name: "Utilisateur |||| Utilisateurs",
@ -150,12 +129,10 @@ const fr: SynapseTranslationMessages = {
        is_guest: "Visiteur",
        admin: "Administrateur du serveur",
        locked: "Verrouillé",
-        suspended: "Suspendu",
        deactivated: "Désactivé",
        guests: "Afficher les visiteurs",
        show_deactivated: "Afficher les utilisateurs désactivés",
        show_locked: "Afficher les utilisateurs verrouillés",
-        show_suspended: "Afficher les utilisateurs suspendus",
        user_id: "Rechercher un utilisateur",
        displayname: "Nom d'affichage",
        password: "Mot de passe",
@ -170,15 +147,10 @@ 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",
-        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_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",
@ -198,8 +170,7 @@ 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",
      },
@ -208,12 +179,7 @@ const fr: SynapseTranslationMessages = {
        messages_per_second_text: "Le nombre d'actions que l'utilisateur peut effectuer par seconde.",
        burst_count: "Compteur de pics",
        burst_count_text: "Le nombre d'actions que l'utilisateur peut effectuer avant d'être limité.",
-      },
-      account_data: {
-        title: "Données du compte",
-        global: "Globales",
-        rooms: "Salons",
-      },
+      }
    },
    rooms: {
      name: "Salon |||| Salons",
@ -276,11 +242,10 @@ 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: {
@ -418,18 +383,6 @@ const fr: SynapseTranslationMessages = {
        sender: "Expéditeur",
      },
    },
-    room_media: {
-      name: "Médias",
-      fields: {
-        media_id: "Identifiant du média",
-      },
-      helper: {
-        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}",
-      },
-    },
    room_directory: {
      name: "Répertoire des salons",
      fields: {
--- a/src/i18n/index.d.ts
+++ b/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; };
    };
    rooms: {
      details?: string; // TODO: fa, fr, it, zh
@ -31,7 +31,6 @@ interface SynapseTranslationMessages extends TranslationMessages {
        members: string;
        detail: string;
        permission: string;
-        media: string;
      };
    };
    reports: { tabs: { basic: string; detail: string } };
@ -112,20 +111,6 @@ interface SynapseTranslationMessages extends TranslationMessages {
      send: string;
    };
  };
-  purge_remote_media: {
-    name: string;
-    fields: {
-      before_ts: string;
-    };
-    action: {
-      send: string;
-      send_success: string;
-      send_failure: string;
-    };
-    helper: {
-      send: string;
-    };
-  };
  resources: {
    users: {
      name: string;
@ -139,13 +124,11 @@ interface SynapseTranslationMessages extends TranslationMessages {
        is_guest: string;
        admin: string;
        locked?: string; // TODO: fa, zh
-        suspended: string;
        deactivated: string;
        erased?: string; // TODO: fa, fr, it, zh
        guests: string;
        show_deactivated: string;
        show_locked?: string; // TODO: de, fa, fr, it, zh
-        show_suspended: string;
        user_id: string;
        displayname: string;
        password: string;
@ -161,12 +144,8 @@ 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;
@ -191,18 +170,13 @@ interface SynapseTranslationMessages extends TranslationMessages {
        support: string;
        regular: string;
        system_managed: string;
-      };
+      }
      limits: {
        messages_per_second: string;
        messages_per_second_text: string;
        burst_count: string;
        burst_count_text: string;
      };
-      account_data: {
-        title: string;
-        global: string;
-        rooms: string;
-      };
    };
    rooms: {
      name: string;
@ -255,7 +229,7 @@ interface SynapseTranslationMessages extends TranslationMessages {
          content: string;
          fields: {
            block: string;
-          };
+          },
          success: string;
          failure: string;
        };
@ -419,18 +393,6 @@ interface SynapseTranslationMessages extends TranslationMessages {
        sender: string;
      };
    };
-    room_media?: {
-      name: string;
-      fields: {
-        media_id: string;
-      };
-      helper: {
-        info: string;
-      };
-      action: {
-        error: string;
-      };
-    };
    room_directory?: {
      name: string;
      fields: {
@ -476,22 +438,4 @@ 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;
-    };
-  };
 }
--- a/src/i18n/it.ts
+++ b/src/i18n/it.ts
@ -17,15 +17,14 @@ 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",
      },
    },
    users: {
      invalid_user_id: "ID utente non valido su questo homeserver.",
-      tabs: { sso: "SSO", experimental: "Sperimentale", limits: "Limiti", account_data: "Dati del profilo" },
+      tabs: { sso: "SSO", experimental: "Sperimentale", limits: "Limiti" },
    },
    rooms: {
      tabs: {
@ -33,7 +32,6 @@ const it: SynapseTranslationMessages = {
        members: "Membro",
        detail: "Dettagli",
        permission: "Permessi",
-        media: "Media",
      },
    },
    reports: { tabs: { basic: "Semplice", detail: "Dettagli" } },
@ -52,7 +50,7 @@ const it: SynapseTranslationMessages = {
    goToPdf: "Vai al PDF",
    cards: {
      importstats: {
-        header: "Utenti analizzati per l'importazione",
+        header: "Importa utenti",
        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",
@ -115,20 +113,6 @@ const it: SynapseTranslationMessages = {
      send: "Questa API cancella i media locali dal disco del tuo server. Questo include anche ogni miniatura e copia del media scaricato. Questa API non inciderà sui media che sono stati caricati nei repository esterni.",
    },
  },
-  purge_remote_media: {
-    name: "Media Remoti",
-    fields: {
-      before_ts: "ultimo accesso prima di",
-    },
-    action: {
-      send: "Elimina media remoti",
-      send_success: "La richiesta per eliminare i media remoti è stata inviata.",
-      send_failure: "Si è verificato un errore con la richiesta di eliminazione dei media remoti.",
-    },
-    helper: {
-      send: "Questa API elimina la cache dei media remoti dal disco del tuo server. Questo include qualsiasi miniatura locale e copie di media scaricati. Questa API non influirà sui media che sono stati caricati nel repository multimediale del server.",
-    },
-  },
  resources: {
    users: {
      name: "Utente |||| Utenti",
@ -142,12 +126,10 @@ const it: SynapseTranslationMessages = {
        is_guest: "Ospite",
        admin: "Amministratore",
        locked: "Bloccato",
-        suspended: "Sospeso",
        deactivated: "Disattivato",
        guests: "Mostra gli ospiti",
        show_deactivated: "Mostra gli utenti disattivati",
        show_locked: "Mostra gli utenti bloccati",
-        show_suspended: "Mostra gli utenti sospesi",
        user_id: "Cerca utente",
        displayname: "Nickname",
        password: "Password",
@ -163,15 +145,10 @@ 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",
-        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_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",
@ -191,8 +168,7 @@ 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",
      },
@ -201,12 +177,7 @@ const it: SynapseTranslationMessages = {
        messages_per_second_text: "Il numero di azioni che l'utente può eseguire al secondo.",
        burst_count: "Burst-conteggio",
        burst_count_text: "Il numero di azioni che l'utente può eseguire prima di essere limitato.",
-      },
-      account_data: {
-        title: "Dati del profilo",
-        global: "Globale",
-        rooms: "Stanza",
-      },
+      }
    },
    rooms: {
      name: "Stanza |||| Stanze",
@ -234,231 +205,218 @@ const it: SynapseTranslationMessages = {
      helper: {
        /*        forward_extremities:
                  "Forward extremities are the leaf events at the end of a Directed acyclic graph (DAG) in a room, aka events that have no children. The more exist in a room, the more state resolution that Synapse needs to perform (hint: it's an expensive operation). While Synapse has code to prevent too many of these existing at one time in a room, bugs can sometimes make them crop up again. If a room has >10 forward extremities, it's worth checking which room is the culprit and potentially removing them using the SQL queries mentioned in #1760.", */
-      },
-      enums: {
+        },
+        enums: {
        join_rules: {
-          public: "Pubblica",
-          knock: "Bussa",
-          invite: "Invita",
-          private: "Privata",
-        },
-        guest_access: {
-          can_join: "Gli utenti ospiti possono entrare",
-          forbidden: "Gli utenti ospiti non possono entrare",
-        },
-        history_visibility: {
-          invited: "Dall'invito",
-          joined: "Dall'entrata",
-          shared: "Dalla condivisione",
-          world_readable: "Chiunque",
-        },
-        unencrypted: "Non criptata",
+        public: "Pubblica",
+        knock: "Bussa",
+        invite: "Invita",
+        private: "Privata",
      },
-      action: {
-        erase: {
-          title: "Cancella stanza",
-          content:
-            "Sei sicuro di voler eliminare questa stanza? Questa azione è definitiva. Tutti i messaggi e i media condivisi in questa stanza verranno eliminati dal server!",
-        },
-        make_admin: {
-          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.",
-          success: "L'utente è stato designato come amministratore della stanza.",
-          failure: "L'utente non può essere designato come amministratore della stanza. %{errMsg}",
-        },
+      guest_access: {
+        can_join: "Gli utenti ospiti possono entrare",
+        forbidden: "Gli utenti ospiti non possono entrare",
      },
+      history_visibility: {
+        invited: "Dall'invito",
+        joined: "Dall'entrata",
+        shared: "Dalla condivisione",
+        world_readable: "Chiunque",
+      },
+      unencrypted: "Non criptata",
    },
-    reports: {
-      name: "Evento segnalato |||| Eventi segnalati",
-      fields: {
-        id: "ID",
-        received_ts: "Orario del report",
-        user_id: "richiedente",
-        name: "nome della stanza",
-        score: "punteggio",
-        reason: "ragione",
-        event_id: "ID dell'evento",
-        event_json: {
-          origin: "server di origine",
-          origin_server_ts: "ora dell'invio",
-          type: "tipo di evento",
-          content: {
-            msgtype: "tipo di contenuto",
-            body: "contenuto",
-            format: "formato",
-            formatted_body: "contenuto formattato",
-            algorithm: "algoritmo",
-          },
-        },
-      },
-    },
-    connections: {
-      name: "Connessioni",
-      fields: {
-        last_seen: "Data",
-        ip: "Indirizzo IP",
-        user_agent: "agente utente",
-      },
-    },
-    devices: {
-      name: "Dispositivo |||| Dispositivi",
-      fields: {
-        device_id: "ID del dispositivo",
-        display_name: "Nome del dispositivo",
-        last_seen_ts: "Timestamp",
-        last_seen_ip: "Indirizzo IP",
-      },
-      action: {
-        erase: {
-          title: "Rimozione del dispositivo %{id}",
-          content: 'Sei sicuro di voler rimuovere il dispositivo "%{name}"?',
-          success: "Dispositivo rimosso con successo.",
-          failure: "C'è stato un errore.",
-        },
-      },
-    },
-    users_media: {
-      name: "Media",
-      fields: {
-        media_id: "ID del media",
-        media_length: "Peso del file (in Byte)",
-        media_type: "Tipo",
-        upload_name: "Nome del file",
-        quarantined_by: "In quarantena da",
-        safe_from_quarantine: "Protetto dalla quarantena",
-        created_ts: "Creato",
-        last_access_ts: "Ultimo accesso",
-      },
-    },
-    protect_media: {
-      action: {
-        create: "Non protetto, proteggi",
-        delete: "Protetto, rimuovi protezione",
-        none: "In quarantena",
-        send_success: "Stato della protezione cambiato con successo.",
-        send_failure: "C'è stato un errore.",
-      },
-    },
-    quarantine_media: {
-      action: {
-        name: "Quarantina",
-        create: "Aggiungi alla quarantena",
-        delete: "In quarantena, rimuovi dalla quarantena",
-        none: "Protetto dalla quarantena",
-        send_success: "Stato della quarantena cambiato con successo.",
-        send_failure: "C'è stato un errore.",
-      },
-    },
-    pushers: {
-      name: "Pusher |||| Pusher",
-      fields: {
-        app: "App",
-        app_display_name: "Nome dell'app",
-        app_id: "ID dell'app",
-        device_display_name: "Nome del dispositivo",
-        kind: "Tipo",
-        lang: "Lingua",
-        profile_tag: "Tag del profilo",
-        pushkey: "Pushkey",
-        data: { url: "URL" },
-      },
-    },
-    servernotices: {
-      name: "Avvisi del server",
-      send: "Invia avvisi",
-      fields: {
-        body: "Messaggio",
-      },
-      action: {
-        send: "Invia nota",
-        send_success: "Avviso inviato con successo.",
-        send_failure: "C'è stato un errore.",
-      },
-      helper: {
-        send: 'Invia un avviso dal server agli utenti selezionati. La feature "Avvisi del server" è stata attivata sul server.',
-      },
-    },
-    user_media_statistics: {
-      name: "Media degli utenti",
-      fields: {
-        media_count: "Numero media",
-        media_length: "Lunghezza media",
-      },
-    },
-    forward_extremities: {
-      name: "Invia estremità",
-      fields: {
-        id: "Event ID",
-        received_ts: "Timestamp",
-        depth: "Profondità",
-        state_group: "State group",
-      },
-    },
-    room_state: {
-      name: "Eventi di stato",
-      fields: {
-        type: "Tipo",
-        content: "Contenuto",
-        origin_server_ts: "Ora dell'invio",
-        sender: "Mittente",
-      },
-    },
-    room_media: {
-      name: "Media",
-      fields: {
-        media_id: "ID Media",
-      },
-      helper: {
-        info: "Questo è un elenco dei media caricati nella stanza. Non è possibile eliminare i media caricati su repository esterni.",
-      },
-      action: {
-        error: "%{errcode} (%{errstatus}) %{error}",
-      },
-    },
-    room_directory: {
-      name: "Elenco delle stanze",
-      fields: {
-        world_readable: "gli utenti ospite possono vedere senza entrare",
-        guest_can_join: "gli utenti ospite possono entrare",
-      },
-      action: {
-        title: "Cancella stanza dall'elenco |||| Cancella %{smart_count} stanze dall'elenco",
+    action: {
+      erase: {
+        title: "Cancella stanza",
        content:
-          "Sei sicuro di voler rimuovere questa stanza dall'elenco? |||| Sei sicuro di voler rimuovere %{smart_count} stanze dall'elenco?",
-        erase: "Rimuovi dall'elenco",
-        create: "Crea",
-        send_success: "Stanza creata con successo.",
-        send_failure: "C'è stato un errore.",
+          "Sei sicuro di voler eliminare questa stanza? Questa azione è definitiva. Tutti i messaggi e i media condivisi in questa stanza verranno eliminati dal server!",
+      },
+      make_admin: {
+        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.",
+        success: "L'utente è stato designato come amministratore della stanza.",
+        failure: "L'utente non può essere designato come amministratore della stanza. %{errMsg}",
+      }
+    },
+  },
+  reports: {
+    name: "Evento segnalato |||| Eventi segnalati",
+    fields: {
+      id: "ID",
+      received_ts: "Orario del report",
+      user_id: "richiedente",
+      name: "nome della stanza",
+      score: "punteggio",
+      reason: "ragione",
+      event_id: "ID dell'evento",
+      event_json: {
+        origin: "server di origine",
+        origin_server_ts: "ora dell'invio",
+        type: "tipo di evento",
+        content: {
+          msgtype: "tipo di contenuto",
+          body: "contenuto",
+          format: "formato",
+          formatted_body: "contenuto formattato",
+          algorithm: "algoritmo",
+        },
      },
    },
-    destinations: {
-      name: "Federazione",
-      fields: {
-        destination: "Destinazione",
-        failure_ts: "Timestamp dell'errore",
-        retry_last_ts: "Tentativo ultimo timestamp",
-        retry_interval: "Intervallo dei tentativi",
-        last_successful_stream_ordering: "Ultimo flusso riuscito con successo",
-        stream_ordering: "Flusso",
-      },
-      action: { reconnect: "Riconnetti" },
+  },
+  connections: {
+    name: "Connessioni",
+    fields: {
+      last_seen: "Data",
+      ip: "Indirizzo IP",
+      user_agent: "agente utente",
    },
-    registration_tokens: {
-      name: "Token di registrazione",
-      fields: {
-        token: "Token",
-        valid: "Token valido",
-        uses_allowed: "Usi permessi",
-        pending: "In attesa",
-        completed: "Completato",
-        expiry_time: "Data della scadenza",
-        length: "Lunghezza",
-      },
-      helper: { length: "Lunghezza del token se non viene dato alcun token." },
+  },
+  devices: {
+    name: "Dispositivo |||| Dispositivi",
+    fields: {
+      device_id: "ID del dispositivo",
+      display_name: "Nome del dispositivo",
+      last_seen_ts: "Timestamp",
+      last_seen_ip: "Indirizzo IP",
    },
+    action: {
+      erase: {
+        title: "Rimozione del dispositivo %{id}",
+        content: 'Sei sicuro di voler rimuovere il dispositivo "%{name}"?',
+        success: "Dispositivo rimosso con successo.",
+        failure: "C'è stato un errore.",
+      },
+    },
+  },
+  users_media: {
+    name: "Media",
+    fields: {
+      media_id: "ID del media",
+      media_length: "Peso del file (in Byte)",
+      media_type: "Tipo",
+      upload_name: "Nome del file",
+      quarantined_by: "In quarantena da",
+      safe_from_quarantine: "Protetto dalla quarantena",
+      created_ts: "Creato",
+      last_access_ts: "Ultimo accesso",
+    },
+  },
+  protect_media: {
+    action: {
+      create: "Non protetto, proteggi",
+      delete: "Protetto, rimuovi protezione",
+      none: "In quarantena",
+      send_success: "Stato della protezione cambiato con successo.",
+      send_failure: "C'è stato un errore.",
+    },
+  },
+  quarantine_media: {
+    action: {
+      name: "Quarantina",
+      create: "Aggiungi alla quarantena",
+      delete: "In quarantena, rimuovi dalla quarantena",
+      none: "Protetto dalla quarantena",
+      send_success: "Stato della quarantena cambiato con successo.",
+      send_failure: "C'è stato un errore.",
+    },
+  },
+  pushers: {
+    name: "Pusher |||| Pusher",
+    fields: {
+      app: "App",
+      app_display_name: "Nome dell'app",
+      app_id: "ID dell'app",
+      device_display_name: "Nome del dispositivo",
+      kind: "Tipo",
+      lang: "Lingua",
+      profile_tag: "Tag del profilo",
+      pushkey: "Pushkey",
+      data: { url: "URL" },
+    },
+  },
+  servernotices: {
+    name: "Avvisi del server",
+    send: "Invia avvisi",
+    fields: {
+      body: "Messaggio",
+    },
+    action: {
+      send: "Invia nota",
+      send_success: "Avviso inviato con successo.",
+      send_failure: "C'è stato un errore.",
+    },
+    helper: {
+      send: 'Invia un avviso dal server agli utenti selezionati. La feature "Avvisi del server" è stata attivata sul server.',
+    },
+  },
+  user_media_statistics: {
+    name: "Media degli utenti",
+    fields: {
+      media_count: "Numero media",
+      media_length: "Lunghezza media",
+    },
+  },
+  forward_extremities: {
+    name: "Invia estremità",
+    fields: {
+      id: "Event ID",
+      received_ts: "Timestamp",
+      depth: "Profondità",
+      state_group: "State group",
+    },
+  },
+  room_state: {
+    name: "Eventi di stato",
+    fields: {
+      type: "Tipo",
+      content: "Contenuto",
+      origin_server_ts: "Ora dell'invio",
+      sender: "Mittente",
+    },
+  },
+  room_directory: {
+    name: "Elenco delle stanze",
+    fields: {
+      world_readable: "gli utenti ospite possono vedere senza entrare",
+      guest_can_join: "gli utenti ospite possono entrare",
+    },
+    action: {
+      title: "Cancella stanza dall'elenco |||| Cancella %{smart_count} stanze dall'elenco",
+      content:
+        "Sei sicuro di voler rimuovere questa stanza dall'elenco? |||| Sei sicuro di voler rimuovere %{smart_count} stanze dall'elenco?",
+      erase: "Rimuovi dall'elenco",
+      create: "Crea",
+      send_success: "Stanza creata con successo.",
+      send_failure: "C'è stato un errore.",
+    },
+  },
+  destinations: {
+    name: "Federazione",
+    fields: {
+      destination: "Destinazione",
+      failure_ts: "Timestamp dell'errore",
+      retry_last_ts: "Tentativo ultimo timestamp",
+      retry_interval: "Intervallo dei tentativi",
+      last_successful_stream_ordering: "Ultimo flusso riuscito con successo",
+      stream_ordering: "Flusso",
+    },
+    action: { reconnect: "Riconnetti" },
+  },
+  registration_tokens: {
+    name: "Token di registrazione",
+    fields: {
+      token: "Token",
+      valid: "Token valido",
+      uses_allowed: "Usi permessi",
+      pending: "In attesa",
+      completed: "Completato",
+      expiry_time: "Data della scadenza",
+      length: "Lunghezza",
+    },
+    helper: { length: "Lunghezza del token se non viene dato alcun token." },
+  },
  },
 };
 export default it;
--- a/src/i18n/ja.ts
+++ b/src/i18n/ja.ts
@ -1,519 +0,0 @@
-// 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;
--- a/src/i18n/ru.ts
+++ b/src/i18n/ru.ts
@ -11,10 +11,6 @@ const fixedRussianMessages = {
      no_filtered_results: "Нет результатов",
      clear_filters: "Все фильтры сбросить",
    },
-    action: {
-      ...russianMessages.ra.action,
-      select_all_button: "Выбрать все",
-    },
    page: {
      ...russianMessages.ra.page,
      empty: "Пусто",
@ -23,12 +19,13 @@ const fixedRussianMessages = {
    },
    message: {
      ...russianMessages.ra.message,
-      access_denied: "У вас нет прав доступа к этой странице.",
-      authentication_error: "Сервер аутентификации вернул ошибку и не смог проверить ваши учетные данные.",
-      select_all_limit_reached: "Слишком много элементов для выбора. Были выбраны только первые %{max} элементов.",
+      access_denied:
+        "У вас нет прав доступа к этой странице.",
+      authentication_error:
+        "Сервер аутентификации вернул ошибку и не смог проверить ваши учетные данные.",
    },
  },
-};
+}

 const ru: SynapseTranslationMessages = {
  ...fixedRussianMessages,
@ -46,20 +43,14 @@ 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: "Ограничения" },
    },
    rooms: {
      details: "Данные комнаты",
@ -68,7 +59,6 @@ const ru: SynapseTranslationMessages = {
        members: "Участники",
        detail: "Подробности",
        permission: "Права доступа",
-        media: "Медиа",
      },
    },
    reports: { tabs: { basic: "Основные", detail: "Подробности" } },
@ -87,7 +77,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} гостей",
@ -159,20 +149,6 @@ const ru: SynapseTranslationMessages = {
      Данный API не затрагивает файлы, загруженные во внешние хранилища.",
    },
  },
-  purge_remote_media: {
-    name: "Внешние медиа",
-    fields: {
-      before_ts: "последний доступ до",
-    },
-    action: {
-      send: "Очистить внешние медиа",
-      send_success: "Запрос на очистку внешних медиа был отправлен.",
-      send_failure: "Произошла ошибка при запросе очистки внешних медиа.",
-    },
-    helper: {
-      send: "Этот API очищает кэш внешних медиа с диска вашего сервера. Это включает любые локальные миниатюры и копии загруженных медиа. Этот API не повлияет на медиа, которые были загружены в собственное медиа-хранилище сервера.",
-    },
-  },
  resources: {
    users: {
      name: "Пользователь |||| Пользователи",
@ -186,13 +162,11 @@ const ru: SynapseTranslationMessages = {
        is_guest: "Гость",
        admin: "Администратор сервера",
        locked: "Заблокирован",
-        suspended: "Приостановлен",
        deactivated: "Деактивирован",
        erased: "Удалён",
        guests: "Показывать гостей",
        show_deactivated: "Показывать деактивированных",
        show_locked: "Показывать заблокированных",
-        show_suspended: "Показывать приостановленных",
        user_id: "Поиск пользователя",
        displayname: "Отображаемое имя",
        password: "Пароль",
@ -208,16 +182,10 @@ const ru: SynapseTranslationMessages = {
      },
      helper: {
        password: "Смена пароля завершит все сессии пользователя.",
-        password_required_for_reactivation: "Вы должны предоставить пароль для реактивации учётной записи.",
        create_password: "Сгенерировать надёжный и безопасный пароль, используя кнопку ниже.",
        deactivate: "Вы должны предоставить пароль для реактивации учётной записи.",
-        suspend:
-          "Приостановка учётной записи означает, что пользователь не сможет войти в свою учётную запись, пока она не будет снова активирована.",
        erase: "Пометить пользователя как удалённого в соответствии с GDPR",
-        admin: "Администратор сервера имеет полный контроль над сервером и его пользователями.",
-        lock: "Предотвращает использование пользователем сервера. Это неразрушающее действие, которое может быть отменено.",
-        erase_text:
-          "Это означает, что сообщения, отправленные пользователем (-ами), будут по-прежнему видны всем, кто находился в комнате в момент их отправки, но будут скрыты от пользователей, присоединившихся к комнате после этого.",
+        erase_text: "Это означает, что сообщения, отправленные пользователем (-ами), будут по-прежнему видны всем, кто находился в комнате в момент их отправки, но будут скрыты от пользователей, присоединившихся к комнате после этого.",
        erase_admin_error: "Удаление собственного пользователя запрещено.",
        modify_managed_user_error: "Изменение пользователя, управляемого системой, не допускается.",
        username_available: "Имя пользователя доступно",
@ -237,8 +205,7 @@ const ru: SynapseTranslationMessages = {
        redact_events: "Удаление всех событий, отправленных пользователем (-ами)",
        generate_password: "Сгенерировать пароль",
        overwrite_title: "Предупреждение!",
-        overwrite_content:
-          "Это имя пользователя уже занято. Вы уверены, что хотите перезаписать существующего пользователя?",
+        overwrite_content: "Это имя пользователя уже занято. Вы уверены, что хотите перезаписать существующего пользователя?",
        overwrite_cancel: "Отмена",
        overwrite_confirm: "Перезаписать",
      },
@ -247,12 +214,7 @@ const ru: SynapseTranslationMessages = {
        messages_per_second_text: "Количество действий, которые могут быть выполнены в секунду.",
        burst_count: "Burst-счётчик",
        burst_count_text: "Количество действий, которые могут быть выполнены до ограничения.",
-      },
-      account_data: {
-        title: "Данные пользователя",
-        global: "Глобальные",
-        rooms: "Комнаты",
-      },
+      }
    },
    rooms: {
      name: "Комната |||| Комнаты",
@ -318,11 +280,10 @@ const ru: SynapseTranslationMessages = {
          assign_admin: "Назначить администратора",
          title: "Назначить администратора комнате %{roomName}",
          confirm: "Назначить администратора",
-          content:
-            "Введите полную MXID пользователя, которого нужно назначить администратором.\nПредупреждение: для этого должен быть назначен хотя бы один локальный участник в качестве администратора.",
+          content: "Введите полную MXID пользователя, которого нужно назначить администратором.\nПредупреждение: для этого должен быть назначен хотя бы один локальный участник в качестве администратора.",
          success: "Пользователь назначен администратором комнаты.",
          failure: "Пользователь не может быть назначен администратором комнаты. %{errMsg}",
-        },
+        }
      },
    },
    reports: {
@ -473,18 +434,6 @@ const ru: SynapseTranslationMessages = {
        sender: "Отправитель",
      },
    },
-    room_media: {
-      name: "Медиа",
-      fields: {
-        media_id: "ID медиа",
-      },
-      helper: {
-        info: "Это список медиа, которые были загружены в комнату. Невозможно удалить медиа, которые были загружены в внешние медиа-репозитории.",
-      },
-      action: {
-        error: "%{errcode} (%{errstatus}) %{error}",
-      },
-    },
    room_directory: {
      name: "Каталог комнат",
      fields: {
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@ -11,14 +11,9 @@ const fixedChineseMessages = {
      no_filtered_results: "没有结果",
      clear_filters: "清除所有过滤器",
    },
-    auth: {
-      ...chineseMessages.ra.auth,
-      email: "邮箱",
-    },
    action: {
      ...chineseMessages.ra.action,
-      update_application: "更新应用",
-      select_all_button: "全部选择",
+      update_application: "Anwendung aktualisieren",
    },
    page: {
      ...chineseMessages.ra.page,
@ -27,13 +22,13 @@ const fixedChineseMessages = {
    },
    message: {
      ...chineseMessages.ra.message,
-      access_denied: "您没有访问此页面的权限。",
-      authentication_error: "身份验证服务器返回错误，无法验证您的凭据。",
-      select_all_limit_reached: "选择的元素太多。只选择了前 %{max} 个元素。",
-      placeholder_data_warning: "网络问题：数据刷新失败。",
+      access_denied:
+        "您没有访问此页面的权限。",
+      authentication_error:
+        "身份验证服务器返回错误，无法验证您的凭据。",
    },
  },
-};
+}

 const zh: SynapseTranslationMessages = {
  ...fixedChineseMessages,
@ -57,7 +52,7 @@ const zh: SynapseTranslationMessages = {
    },
    users: {
      invalid_user_id: "必须要是一个有效的 Matrix 用户 ID ，例如 @user_id:homeserver",
-      tabs: { sso: "SSO", experimental: "实验性", limits: "限制", account_data: "账户数据" },
+      tabs: { sso: "SSO", experimental: "实验性", limits: "限制" },
    },
    rooms: {
      tabs: {
@ -65,7 +60,6 @@ const zh: SynapseTranslationMessages = {
        members: "成员",
        detail: "细节",
        permission: "权限",
-        media: "媒体",
      },
    },
    reports: { tabs: { basic: "基本", detail: "细节" } },
@ -84,7 +78,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} 管理员",
@ -147,20 +141,6 @@ const zh: SynapseTranslationMessages = {
      send: "这个API会删除您硬盘上的本地媒体。包含了任何的本地缓存和下载的媒体备份。这个API不会影响上传到外部媒体存储库上的媒体文件。",
    },
  },
-  purge_remote_media: {
-    name: "远程媒体",
-    fields: {
-      before_ts: "最后访问于之前",
-    },
-    action: {
-      send: "清除远程媒体",
-      send_success: "远程媒体清除请求已发送。",
-      send_failure: "发生错误，远程媒体清除请求未成功。",
-    },
-    helper: {
-      send: "此API清除您服务器磁盘上的远程媒体缓存。这包括任何本地缩略图和下载的媒体副本。此API不会影响已经上传到服务器媒体存储库的媒体。",
-    },
-  },
  resources: {
    users: {
      name: "用户",
@ -173,13 +153,10 @@ const zh: SynapseTranslationMessages = {
        name: "用户名",
        is_guest: "访客",
        admin: "服务器管理员",
-        locked: "锁定",
        deactivated: "被禁用",
-        suspended: "被锁定",
        guests: "显示访客",
        show_deactivated: "显示被禁用的账户",
        show_locked: "显示被锁定的账户",
-        show_suspended: "显示被锁定的账户",
        user_id: "搜索用户",
        displayname: "显示名字",
        password: "密码",
@ -193,15 +170,10 @@ const zh: SynapseTranslationMessages = {
      },
      helper: {
        password: "更改密码会使用户注销所有会话。",
-        password_required_for_reactivation: "您必须提供一串密码来激活账户。",
        create_password: "使用下面的按钮生成一个强大和安全的密码。",
        deactivate: "您必须提供一串密码来激活账户。",
-        suspend: "您必须提供一串密码来暂停账户。",
        erase: "将用户标记为根据 GDPR 的要求抹除了",
-        admin: "服务器管理员对服务器和其用户有完全的控制权。",
-        lock: "阻止用户使用服务器。这是一个非破坏性的操作，可以被撤销。",
-        erase_text:
-          "这意味着用户发送的信息对于发送信息时在房间内的任何人来说都是可见的，但对于之后加入房间的用户来说则是隐藏的。",
+        erase_text: "这意味着用户发送的信息对于发送信息时在房间内的任何人来说都是可见的，但对于之后加入房间的用户来说则是隐藏的。",
        erase_admin_error: "不允许删除自己的用户",
        modify_managed_user_error: "不允许修改系统管理的用户。",
        username_available: "用户名可用",
@ -230,12 +202,7 @@ const zh: SynapseTranslationMessages = {
        messages_per_second_text: "每秒可以执行的操作数。",
        burst_count: "Burst-计数",
        burst_count_text: "在限制之前可以执行的操作数。",
-      },
-      account_data: {
-        title: "账户数据",
-        global: "全局",
-        rooms: "房间",
-      },
+      }
    },
    rooms: {
      name: "房间",
@ -377,18 +344,6 @@ const zh: SynapseTranslationMessages = {
        media_length: "媒体文件长度",
      },
    },
-    room_media: {
-      name: "媒体",
-      fields: {
-        media_id: "媒体ID",
-      },
-      helper: {
-        info: "这是上传到房间的媒体列表。无法删除上传到外部媒体存储库的媒体。",
-      },
-      action: {
-        error: "%{errcode} (%{errstatus}) %{error}",
-      },
-    },
  },
 };
 export default zh;
--- a/src/index.tsx
+++ b/src/index.tsx
@ -1,16 +1,16 @@
 import React from "react";
+
 import { createRoot } from "react-dom/client";

-import { App } from "./App";
-import { AppContext } from "./Context";
+import {App, AppContext } from "./App";
 import { FetchConfig, GetConfig } from "./utils/config";

 await FetchConfig();

 createRoot(document.getElementById("root")).render(
-  <React.StrictMode>
-    <AppContext.Provider value={GetConfig()}>
-      <App />
-    </AppContext.Provider>
-  </React.StrictMode>
+      <React.StrictMode>
+        <AppContext.Provider value={GetConfig()}>
+          <App />
+        </AppContext.Provider>
+      </React.StrictMode>
 );
--- a/src/pages/LoginPage.test.tsx
+++ b/src/pages/LoginPage.test.tsx
@ -1,12 +1,14 @@
-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";
-import { AppContext } from "../Context";
+import { AppContext } from "../App";
 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 () => {
@ -31,14 +33,7 @@ describe("LoginForm", () => {

  it("renders with single restricted homeserver", () => {
    render(
-      <AppContext.Provider
-        value={{
-          restrictBaseUrl: "https://matrix.example.com",
-          asManagedUsers: [],
-          menu: [],
-          corsCredentials: "include",
-        }}
-      >
+      <AppContext.Provider value={{ restrictBaseUrl: "https://matrix.example.com" }}>
        <AdminContext i18nProvider={i18nProvider}>
          <LoginPage />
        </AdminContext>
@ -61,9 +56,6 @@ describe("LoginForm", () => {
      <AppContext.Provider
        value={{
          restrictBaseUrl: ["https://matrix.example.com", "https://matrix.example.org"],
-          asManagedUsers: [],
-          menu: [],
-          corsCredentials: "include",
        }}
      >
        <AdminContext i18nProvider={i18nProvider}>
--- a/src/pages/LoginPage.tsx
+++ b/src/pages/LoginPage.tsx
@ -1,17 +1,6 @@
-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,
@ -23,14 +12,11 @@ import {
  useTranslate,
  PasswordInput,
  TextInput,
-  SelectInput,
  useLocales,
 } from "react-admin";
 import { useFormContext } from "react-hook-form";
-
-import { useAppContext } from "../Context";
-import Footer from "../components/Footer";
 import LoginFormBox from "../components/LoginFormBox";
+import { useAppContext } from "../App";
 import {
  getServerVersion,
  getSupportedFeatures,
@ -39,6 +25,7 @@ import {
  isValidBaseUrl,
  splitMxid,
 } from "../synapse/matrix";
+import Footer from "../components/Footer";

 export type LoginMethod = "credentials" | "accessToken";

@ -52,42 +39,26 @@ 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 = /\?loginToken=([a-zA-Z0-9_-]+)/.exec(window.location.href);
  const [loginMethod, setLoginMethod] = useState<LoginMethod>("credentials");
-  const [serverVersion, setServerVersion] = useState("");
-  const [matrixVersions, setMatrixVersions] = useState("");
-
-  useEffect(() => {
-    if (base_url) {
-      checkServerInfo(base_url);
-    }
-  }, []);

  useEffect(() => {
    if (!loginToken) {
      return;
    }

-    console.log("SSO token is", loginToken);
+    const ssoToken = loginToken[1];
+    console.log("SSO token is", ssoToken);
    // Prevent further requests
-    const previousUrl = new URL(window.location.toString());
-    previousUrl.searchParams.delete("loginToken");
-    window.history.replaceState({}, "", previousUrl.toString());
+    window.history.replaceState({}, "", window.location.href.replace(loginToken[0], "#").split("#")[0]);
    const baseUrl = localStorage.getItem("sso_base_url");
    localStorage.removeItem("sso_base_url");
    if (baseUrl) {
@ -95,10 +66,10 @@ const LoginPage = () => {
        base_url: baseUrl,
        username: null,
        password: null,
-        loginToken,
+        loginToken: ssoToken,
      };
      console.log("Base URL is:", baseUrl);
-      console.log("SSO Token is:", loginToken);
+      console.log("SSO Token is:", ssoToken);
      console.log("Let's try token login...");
      login(auth).catch(error => {
        alert(
@ -149,110 +120,68 @@ 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 = async () => {
+    const handleUsernameChange = () => {
      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) {
-        const url = await getWellKnownUrl(domain);
-        if (allowAnyBaseUrl || (allowMultipleBaseUrls && restrictBaseUrl.includes(url))) {
-          form.setValue("base_url", url, {
-            shouldValidate: true,
-            shouldDirty: true,
-          });
-          checkServerInfo(url);
-        }
+        getWellKnownUrl(domain).then(url => {
+          if (allowAnyBaseUrl || (allowMultipleBaseUrls && restrictBaseUrl.includes(url)))
+            form.setValue("base_url", 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;
-      }
-
-      // Trigger validation only when user finishes typing/selecting
-      form.trigger("base_url");
-      checkServerInfo(value);
-    };
-
    useEffect(() => {
-      const params = new URLSearchParams(window.location.search);
-      const hostname = window.location.hostname;
-      const username = params.get("username");
-      const password = params.get("password");
-      const accessToken = params.get("accessToken");
-      let serverURL = params.get("server");
+      if (!formData.base_url) {
+        form.setValue("base_url", "");
+      }
+      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]);
+
+    useEffect(() => {
+      const params = new URLSearchParams(window.location.search);
+      const username = params.get("username");
+      let serverURL = params.get("server");
      if (username) {
        form.setValue("username", username);
      }
-
-      if (hostname === "localhost" || hostname === "127.0.0.1") {
-        if (password) {
-          form.setValue("password", password);
-        }
-        if (accessToken) {
-          setLoginMethod("accessToken");
-          form.setValue("accessToken", accessToken);
-        }
-      }
-
      if (serverURL) {
        const isFullUrl = serverURL.match(/^(http|https):\/\//);
        if (!isFullUrl) {
          serverURL = `https://${serverURL}`;
        }
-
-        form.setValue("base_url", serverURL, {
-          shouldValidate: true,
-          shouldDirty: true,
-        });
-
-        checkServerInfo(serverURL);
+        form.setValue("base_url", serverURL);
      }
    }, [window.location.search]);

@ -272,6 +201,7 @@ const LoginPage = () => {
          <>
            <Box>
              <TextInput
+                autoFocus
                source="username"
                label="ra.auth.username"
                autoComplete="username"
@ -305,30 +235,23 @@ const LoginPage = () => {
          </Box>
        )}
        <Box>
-          {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]}
-              onBlur={handleBaseUrlBlurOrChange}
-            />
-          )}
+          <TextInput
+            source="base_url"
+            label="synapseadmin.auth.base_url"
+            select={allowMultipleBaseUrls}
+            autoComplete="url"
+            {...(loading ? { disabled: true } : {})}
+            readOnly={allowSingleBaseUrl}
+            resettable={allowAnyBaseUrl}
+            validate={[required(), validateBaseUrl]}
+          >
+            {allowMultipleBaseUrls &&
+              restrictBaseUrl.map(url => (
+                <MenuItem key={url} value={url}>
+                  {url}
+                </MenuItem>
+              ))}
+          </TextInput>
        </Box>
        <Typography className="serverVersion">{serverVersion}</Typography>
        <Typography className="matrixVersions">{matrixVersions}</Typography>
@ -337,14 +260,14 @@ const LoginPage = () => {
  };

  return (
-    <Form defaultValues={{ base_url: base_url }} onSubmit={handleSubmit} mode="onBlur">
+    <Form defaultValues={{ base_url: base_url }} onSubmit={handleSubmit} mode="onTouched">
      <LoginFormBox>
        <Card className="card">
          <Box className="avatar">
            {loading ? (
              <CircularProgress size={25} thickness={2} />
            ) : (
-              <Avatar sx={{ width: "120px", height: "120px" }} src="./images/logo.webp" />
+              <Avatar sx={{ width: "120px", height: "120px" }} src="./images/logo.webp"/>
            )}
          </Box>
          <Box className="hint">{translate("synapseadmin.auth.welcome")}</Box>
@ -363,35 +286,37 @@ const LoginPage = () => {
              ))}
            </Select>
            <FormDataConsumer>{formDataProps => <UserData {...formDataProps} />}</FormDataConsumer>
-            {loginMethod === "credentials" && (
-              <CardActions className="actions">
-                <Button
-                  variant="contained"
-                  type="submit"
-                  color="primary"
-                  disabled={loading || !supportPassAuth}
-                  fullWidth
-                >
-                  {translate("ra.auth.sign_in")}
-                </Button>
-                <Button
-                  variant="contained"
-                  color="secondary"
-                  onClick={handleSSO}
-                  disabled={loading || ssoBaseUrl === ""}
-                  fullWidth
-                >
-                  {translate("synapseadmin.auth.sso_sign_in")}
-                </Button>
-              </CardActions>
-            )}
-            {loginMethod === "accessToken" && (
-              <CardActions className="actions">
-                <Button variant="contained" type="submit" color="primary" disabled={loading} fullWidth>
-                  {translate("ra.auth.sign_in")}
-                </Button>
-              </CardActions>
-            )}
+            {loginMethod === "credentials" && <CardActions className="actions">
+              <Button
+                variant="contained"
+                type="submit"
+                color="primary"
+                disabled={loading || !supportPassAuth}
+                fullWidth
+              >
+                {translate("ra.auth.sign_in")}
+              </Button>
+              <Button
+                variant="contained"
+                color="secondary"
+                onClick={handleSSO}
+                disabled={loading || ssoBaseUrl === ""}
+                fullWidth
+              >
+                {translate("synapseadmin.auth.sso_sign_in")}
+              </Button>
+            </CardActions>}
+            {loginMethod === "accessToken" && <CardActions className="actions">
+              <Button
+                variant="contained"
+                type="submit"
+                color="primary"
+                disabled={loading}
+                fullWidth
+              >
+                {translate("ra.auth.sign_in")}
+              </Button>
+            </CardActions>}
          </Box>
        </Card>
      </LoginFormBox>
--- a/src/resources/destinations.tsx
+++ b/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 { get } from "lodash";
-import { MouseEvent } from "react";
+import ErrorIcon from '@mui/icons-material/Error';
 import {
  Button,
  Datagrid,
@ -34,6 +34,7 @@ import {
 } from "react-admin";

 import { DATE_FORMAT } from "../utils/date";
+import { get } from "lodash";

 const DestinationPagination = () => <Pagination rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />;

@ -100,51 +101,35 @@ const RetryDateField = (props: DateFieldProps) => {
  return <DateField {...props} />;
 };

+
 const destinationFieldRender = (record: RaRecord) => {
  if (record.retry_last_ts > 0) {
    return (
      <>
-        <ErrorIcon fontSize="inherit" color="error" sx={{ verticalAlign: "middle" }} />
+        <ErrorIcon fontSize="inherit" color="error" sx={{verticalAlign: "middle"}}/>

        {record.destination}
      </>
    );
  }
  return <> {record.destination} </>;
-};
+}

 export const DestinationList = (props: ListProps) => {
+  const record = useRecordContext(props);
  return (
    <List
      {...props}
      filters={destinationFilters}
      pagination={<DestinationPagination />}
      sort={{ field: "destination", order: "ASC" }}
-      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>
--- a/src/resources/registration_tokens.tsx
+++ b/src/resources/registration_tokens.tsx
@ -3,6 +3,7 @@ import {
  BooleanInput,
  Create,
  CreateProps,
+  Datagrid,
  DatagridConfigurable,
  DateField,
  DateTimeInput,
@ -37,20 +38,14 @@ export const RegistrationTokenList = (props: ListProps) => (
    filters={registrationTokenFilters}
    filterDefaultValues={{ valid: true }}
    pagination={false}
-    perPage={50}
+    perPage={500}
  >
    <DatagridConfigurable rowClick="edit">
-      <TextField source="token" sortable={false} label="resources.registration_tokens.fields.token" />
+      <TextField source="token" sortable={false} label="resources.registration_tokens.fields.token"/>
      <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>
 );
--- a/src/resources/reports.tsx
+++ b/src/resources/reports.tsx
@ -2,6 +2,7 @@ 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,
@ -21,8 +22,8 @@ import {
  useTranslate,
 } from "react-admin";

-import { ReportMediaContent } from "../components/media";
 import { DATE_FORMAT } from "../utils/date";
+import { ReportMediaContent } from "../components/media";

 const ReportPagination = () => <Pagination rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />;

@ -89,16 +90,10 @@ const ReportShowActions = () => {
 };

 export const ReportList = (props: ListProps) => (
-  <List {...props} pagination={<ReportPagination />} perPage={50} sort={{ field: "received_ts", order: "DESC" }}>
+  <List {...props} pagination={<ReportPagination />} 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" />
--- a/src/resources/room_directory.tsx
+++ b/src/resources/room_directory.tsx
@ -1,5 +1,4 @@
 import RoomDirectoryIcon from "@mui/icons-material/FolderShared";
-import { useMutation } from "@tanstack/react-query";
 import {
  BooleanField,
  BulkDeleteButton,
@ -26,9 +25,9 @@ import {
  useRefresh,
  useUnselectAll,
 } from "react-admin";
-
-import { MakeAdminBtn } from "./rooms";
+import { useMutation } from "@tanstack/react-query";
 import AvatarField from "../components/AvatarField";
+import { MakeAdminBtn } from "./rooms";
 const RoomDirectoryPagination = () => <Pagination rowsPerPageOptions={[100, 500, 1000, 2000]} />;

 export const RoomDirectoryUnpublishButton = (props: DeleteButtonProps) => {
@ -136,13 +135,17 @@ const RoomDirectoryListActions = () => (
 );

 export const RoomDirectoryList = () => (
-  <List pagination={<RoomDirectoryPagination />} perPage={50} actions={<RoomDirectoryListActions />}>
+  <List pagination={<RoomDirectoryPagination />} perPage={100} actions={<RoomDirectoryListActions />}>
    <DatagridConfigurable
      rowClick={id => "/rooms/" + id + "/show"}
      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" />
--- a/src/resources/rooms.tsx
+++ b/src/resources/rooms.tsx
@ -4,22 +4,15 @@ 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 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,
+  EditButton,
  WrapperField,
  Datagrid,
  DatagridConfigurable,
@ -45,23 +38,26 @@ import {
  useTranslate,
  useListContext,
  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 AvatarField from "../components/AvatarField";
-import DeleteRoomButton from "../components/DeleteRoomButton";
-import { MediaIDField } from "../components/media";
-import { Room } from "../synapse/dataProvider";
 import { DATE_FORMAT } from "../utils/date";
-
+import DeleteRoomButton from "../components/DeleteRoomButton";
+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";
 const RoomPagination = () => <Pagination rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />;

 const RoomTitle = () => {
@ -110,6 +106,7 @@ export const MakeAdminBtn = () => {
    return null;
  }

+
  const ownMXID = localStorage.getItem("user_id") || "";
  const [open, setOpen] = useState(false);
  const [userIdValue, setUserIdValue] = useState(ownMXID);
@ -119,9 +116,13 @@ export const MakeAdminBtn = () => {

  const { mutate, isPending } = useMutation({
    mutationFn: async () => {
-      const result = await dataProvider.makeRoomAdmin(record.room_id, userIdValue);
-      if (!result.success) {
-        throw new Error(result.error);
+      try {
+        const result = await dataProvider.makeRoomAdmin(record.room_id, userIdValue);
+        if (!result.success) {
+          throw new Error(result.error);
+        }
+      } catch (error) {
+        throw error;
      }
    },
    onSuccess: () => {
@ -129,12 +130,12 @@ export const MakeAdminBtn = () => {
      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>) => {
@ -156,16 +157,8 @@ 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
@ -174,36 +167,34 @@ 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>
-            <TextField
-              type="text"
-              variant="filled"
-              value={userIdValue}
-              onChange={handleChange}
-              onKeyDown={handleKeyDown}
-              label={"Matrix ID"}
-            />
-          </>
-        }
+        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"
+            value={userIdValue}
+            onChange={handleChange}
+            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" />
@ -240,16 +231,6 @@ export const RoomShow = (props: ShowProps) => {
          </ReferenceManyField>
        </Tab>

-        <Tab label="synapseadmin.rooms.tabs.media" icon={<PermMediaIcon />} path="media">
-          <Alert severity="warning">{translate("resources.room_media.helper.info")}</Alert>
-          <ReferenceManyField reference="room_media" target="room_id" label={false}>
-            <Datagrid sx={{ width: "100%" }} bulkActionButtons={false}>
-              <MediaIDField source="media_id" />
-              <DeleteButton mutationMode="pessimistic" redirect={false} />
-            </Datagrid>
-          </ReferenceManyField>
-        </Tab>
-
        <Tab label="synapseadmin.rooms.tabs.permission" icon={<VisibilityIcon />} path="permission">
          <BooleanField source="federatable" />
          <BooleanField source="public" />
@ -306,11 +287,7 @@ 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>
@ -375,23 +352,15 @@ export const RoomList = (props: ListProps) => {
      sort={{ field: "name", order: "ASC" }}
      filters={roomFilters}
      actions={<RoomListActions />}
-      perPage={50}
    >
      <DatagridConfigurable
        rowClick="show"
        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"
@ -405,15 +374,7 @@ export const RoomList = (props: ListProps) => {
            }}
          />
        </WrapperField>
-        <FunctionField
-          source="name"
-          sx={{
-            wordBreak: "break-word",
-            overflowWrap: "break-word",
-          }}
-          render={record => record["name"] || record["canonical_alias"] || record["id"]}
-          label="resources.rooms.fields.name"
-        />
+        <FunctionField source="name" 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" />
--- a/src/resources/user_media_statistics.tsx
+++ b/src/resources/user_media_statistics.tsx
@ -1,5 +1,6 @@
 import PermMediaIcon from "@mui/icons-material/PermMedia";
 import {
+  Datagrid,
  DatagridConfigurable,
  ExportButton,
  List,
@ -13,14 +14,13 @@ import {
  useListContext,
 } from "react-admin";

-import { DeleteMediaButton, PurgeRemoteMediaButton } from "../components/media";
+import { DeleteMediaButton } from "../components/media";

 const ListActions = () => {
  const { isLoading, total } = useListContext();
  return (
    <TopToolbar>
      <DeleteMediaButton />
-      <PurgeRemoteMediaButton />
      <ExportButton disabled={isLoading || total === 0} />
    </TopToolbar>
  );
@ -37,7 +37,6 @@ export const UserMediaStatsList = (props: ListProps) => (
    filters={userMediaStatsFilters}
    pagination={<UserMediaStatsPagination />}
    sort={{ field: "media_length", order: "DESC" }}
-    perPage={50}
  >
    <DatagridConfigurable rowClick={id => "/users/" + id + "/media"} bulkActionButtons={false}>
      <TextField source="user_id" label="resources.users.fields.id" />
--- a/src/resources/users.tsx
+++ b/src/resources/users.tsx
@ -1,19 +1,18 @@
 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 ScienceIcon from "@mui/icons-material/Science";
 import SettingsInputComponentIcon from "@mui/icons-material/SettingsInputComponent";
+import ScienceIcon from "@mui/icons-material/Science";
+import LockClockIcon from '@mui/icons-material/LockClock';
 import ViewListIcon from "@mui/icons-material/ViewList";
+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,
@ -51,7 +50,6 @@ import {
  SaveButton,
  CreateButton,
  ExportButton,
-  BulkDeleteButton,
  TopToolbar,
  Toolbar,
  NumberField,
@ -67,23 +65,21 @@ 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 DeviceRemoveButton from "../components/DeviceRemoveButton";
-import ExperimentalFeaturesList from "../components/ExperimentalFeatures";
-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 { 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";

 const choices_medium = [
  { id: "email", name: "resources.users.email" },
@ -115,15 +111,9 @@ 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 />,
-  // 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();
@ -172,39 +162,18 @@ export const UserList = (props: ListProps) => (
  <List
    {...props}
    filters={userFilters}
-    filterDefaultValues={{ guests: false, deactivated: false, locked: false, suspended: false }}
+    filterDefaultValues={{ guests: true, deactivated: false, locked: false }}
    sort={{ field: "name", order: "ASC" }}
    actions={<UserListActions />}
    pagination={<UserPagination />}
-    perPage={50}
  >
    <DatagridConfigurable
-      rowClick={(id: Identifier, resource: string) => `/${resource}/${encodeURIComponent(id)}`}
+      rowClick={(id: Identifier, resource: string) => `/${resource}/${id}`}
      bulkActionButtons={<UserBulkActionButtons />}
    >
-      <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"
-      />
+      <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" />
      <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" />
@ -219,12 +188,13 @@ 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;
@ -237,13 +207,13 @@ const UserEditActions = () => {
    <TopToolbar>
      {!record?.deactivated && <ServerNoticeButton />}
      {record && record.id && (
-        <UserPreventSelfDelete ownUserIsSelected={ownUserIsSelected} asManagedUserIsSelected={asManagedUserIsSelected}>
-          <DeleteUserButton
-            selectedIds={[record?.id]}
-            confirmTitle="resources.users.helper.erase"
-            confirmContent="resources.users.helper.erase_text"
-          />
-        </UserPreventSelfDelete>
+      <UserPreventSelfDelete ownUserIsSelected={ownUserIsSelected} asManagedUserIsSelected={asManagedUserIsSelected}>
+        <DeleteUserButton
+          selectedIds={[record?.id]}
+          confirmTitle="resources.users.helper.erase"
+          confirmContent="resources.users.helper.erase_text"
+        />
+      </UserPreventSelfDelete>
      )}
    </TopToolbar>
  );
@ -258,33 +228,21 @@ 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>
-  );
-  /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+  const [userAvailabilityEl, setUserAvailabilityEl] = useState<React.ReactElement | false>(<Typography component="span"></Typography>);
  const [formData, setFormData] = useState<Record<string, any>>({});
  const [create] = useCreate();

-  const checkAvailability = async (event: React.FocusEvent<HTMLInputElement>) => {
+  const checkAvailability = async(event: React.FocusEvent<HTMLInputElement>) => {
    const username = event.target.value;
    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) {
@ -292,18 +250,12 @@ export const UserCreate = (props: CreateProps) => {
      return;
    }

-    create(
-      "users",
-      { data: data },
-      {
-        onSuccess: (resource: User) => {
-          notify("ra.notification.created", { messageArgs: { smart_count: 1 } });
-          redirect(() => {
-            return `users/${encodeURIComponent(resource.id as string)}`;
-          });
-        },
+    create("users", { data: data }, {
+      onSuccess: (resource: User) => {
+        notify("ra.notification.created", { messageArgs: { smart_count: 1 } });
+        redirect(() => { return `users/${resource.id}` });
      }
-    );
+    });
  };

  const handleConfirm = () => {
@ -316,48 +268,39 @@ export const UserCreate = (props: CreateProps) => {
  };

  const updateUser = () => {
-    create(
-      "users",
-      { data: formData },
-      {
-        onSuccess: (resource: User) => {
-          notify("ra.notification.updated", { messageArgs: { smart_count: 1 } });
-          redirect(() => {
-            return `users/${encodeURIComponent(resource.id as string)}`;
-          });
-        },
+    create("users", { data: formData }, {
+      onSuccess: (resource: User) => {
+        notify("ra.notification.updated", { messageArgs: { smart_count: 1 } });
+        redirect(() => { return `users/${resource.id}` });
      }
-    );
-  };
+    });
+  }

-  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 />
-        <BooleanInput source="admin" />
-        <ArrayInput source="threepids">
-          <SimpleFormIterator disableReordering>
-            <SelectInput source="medium" choices={choices_medium} validate={required()} />
-            <TextInput source="address" validate={validateAddress} />
-          </SimpleFormIterator>
-        </ArrayInput>
-        <ArrayInput source="external_ids" label="synapseadmin.users.tabs.sso">
-          <SimpleFormIterator disableReordering>
-            <TextInput source="auth_provider" validate={required()} />
-            <TextInput source="external_id" label="resources.users.fields.id" validate={required()} />
-          </SimpleFormIterator>
-        </ArrayInput>
-      </SimpleForm>
-      <Confirm
+  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 />
+      <BooleanInput source="admin" />
+      <ArrayInput source="threepids">
+        <SimpleFormIterator disableReordering>
+          <SelectInput source="medium" choices={choices_medium} validate={required()} />
+          <TextInput source="address" validate={validateAddress} />
+        </SimpleFormIterator>
+      </ArrayInput>
+      <ArrayInput source="external_ids" label="synapseadmin.users.tabs.sso">
+        <SimpleFormIterator disableReordering>
+          <TextInput source="auth_provider" validate={required()} />
+          <TextInput source="external_id" label="resources.users.fields.id" validate={required()} />
+        </SimpleFormIterator>
+      </ArrayInput>
+    </SimpleForm>
+    <Confirm
        isOpen={open}
        title="resources.users.action.overwrite_title"
        content="resources.users.action.overwrite_content"
@ -366,8 +309,7 @@ export const UserCreate = (props: CreateProps) => {
        confirm="resources.users.action.overwrite_confirm"
        cancel="resources.users.action.overwrite_cancel"
      />
-    </Create>
-  );
+  </Create>
 };

 const UserTitle = () => {
@ -377,7 +319,7 @@ const UserTitle = () => {
    return null;
  }

-  const username = record ? (record.displayname ? `"${record.displayname}"` : `"${record.name}"`) : "";
+  let username = record ? (record.displayname ? `"${record.displayname}"` : `"${record.name}"`) : ""
  return (
    <span>
      {translate("resources.users.name", {
@ -403,10 +345,7 @@ 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>
@ -427,7 +366,7 @@ const UserBooleanInput = props => {

  return (
    <UserPreventSelfDelete ownUserIsSelected={ownUserIsSelected} asManagedUserIsSelected={asManagedUserIsSelected}>
-      <BooleanInput disabled={ownUserIsSelected || asManagedUserIsSelected} {...props} />
+      <BooleanInput {...props} disabled={ownUserIsSelected || asManagedUserIsSelected} />
    </UserPreventSelfDelete>
  );
 };
@ -435,7 +374,6 @@ 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();
@ -448,37 +386,10 @@ 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}
-        validate={validatePasswordOnReactivation}
-        helperText={passwordHelperText}
-        disabled={asManagedUserIsSelected}
-      />
-      <Button
+      <PasswordInput {...props} helperText={asManagedUserIsSelected ? "resources.users.helper.modify_managed_user_error" : (record ? "resources.users.helper.password" : "resources.users.helper.create_password")} disabled={asManagedUserIsSelected} />
+       <Button
        variant="outlined"
        label="resources.users.action.generate_password"
        onClick={generatePassword}
@ -489,41 +400,15 @@ 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={{
-        meta: {
-          include: ["features"], // Tell your dataProvider to include features
-        },
-      }}
-    >
+    <Edit {...props} title={<UserTitle />} actions={<UserEditActions />} mutationMode="pessimistic" queryOptions={{
+      meta: {
+        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" }} />
@ -533,45 +418,22 @@ export const UserEdit = (props: EditProps) => {
            label="resources.users.fields.avatar"
            accept={{ "image/*": [".png", ".jpg"] }}
          >
-            <ImageField
-              source="src"
-              title="Avatar"
-              sx={{
-                "& img": {
-                  width: "120px !important",
-                  height: "120px !important",
-                  objectFit: "cover !important",
-                  borderRadius: "50% !important",
-                },
-              }}
-            />
+            <ImageField source="src" title="Avatar" sx={{ '& img': {
+              width: "120px !important",
+              height: "120px !important",
+              objectFit: "cover !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" helperText="resources.users.helper.admin" />
-          <UserBooleanInput source="suspended" helperText="resources.users.helper.suspend" />
-          <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} />
+          <BooleanInput source="admin" />
+          <UserBooleanInput source="locked" />
+          <UserBooleanInput source="deactivated" helperText="resources.users.helper.deactivate" />
+          <BooleanInput source="erased" disabled />
+          <DateField source="creation_ts_ms" showTime options={DATE_FORMAT} />
          <TextField source="consent_version" />
        </FormTab>

@ -627,19 +489,16 @@ export const UserEdit = (props: EditProps) => {
            target="user_id"
            label={false}
            pagination={<UserPagination />}
-            perPage={10}
+            perPage={50}
            sort={{ field: "created_ts", order: "DESC" }}
          >
-            <Datagrid sx={{ width: "100%" }} bulkActionButtons={<BulkDeleteButton />}>
+            <Datagrid sx={{ width: "100%" }}>
              <MediaIDField source="media_id" />
              <DateField source="created_ts" showTime options={DATE_FORMAT} />
              <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 => (record.upload_name ? decodeURLComponent(record.upload_name) : "")}
-              />
+              <FunctionField source="upload_name" render={record => decodeURIComponent(record.upload_name)} />
              <TextField source="quarantined_by" />
              <QuarantineMediaButton label="resources.quarantine_media.action.name" />
              <ProtectMediaButton label="resources.users_media.fields.safe_from_quarantine" />
@ -649,46 +508,20 @@ 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}
-            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"
-                  sx={{
-                    wordBreak: "break-word",
-                    overflowWrap: "break-word",
-                  }}
-                />
-              </ReferenceField>
-              <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 reference="joined_rooms" target="user_id" label={false}>
+              <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>
+                <ReferenceField reference="rooms" source="id" label="resources.rooms.fields.joined_members" link={false} sortable={false}>
+                  <TextField source="joined_members" sortable={false} />
+                </ReferenceField>
+                  <MakeAdminBtn />
+              </Datagrid>
          </ReferenceManyField>
        </FormTab>

@ -718,10 +551,6 @@ export const UserEdit = (props: EditProps) => {
        <FormTab label="synapseadmin.users.tabs.limits" icon={<LockClockIcon />} path="limits">
          <UserRateLimits />
        </FormTab>
-
-        <FormTab label="synapseadmin.users.tabs.account_data" icon={<DocumentScannerIcon />} path="accountdata">
-          <UserAccountData />
-        </FormTab>
      </TabbedForm>
    </Edit>
  );
--- a/src/synapse/authProvider.test.ts
+++ b/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();

@ -28,14 +28,13 @@ describe("authProvider", () => {
        password: "secret",
      });

-      expect(ret).toEqual({ redirectTo: "/" });
+      expect(ret).toEqual({redirectTo: "/"});
      expect(fetch).toHaveBeenCalledWith("http://example.com/_matrix/client/v3/login", {
        body: '{"device_id":null,"initial_device_display_name":"Synapse Admin","type":"m.login.password","identifier":{"type":"m.id.user","user":"@user:example.com"},"password":"secret"}',
        headers: new Headers({
          Accept: "application/json",
          "Content-Type": "application/json",
        }),
-        credentials: "same-origin",
        method: "POST",
      });
      expect(localStorage.getItem("base_url")).toEqual("http://example.com");
@ -60,14 +59,13 @@ describe("authProvider", () => {
      loginToken: "login_token",
    });

-    expect(ret).toEqual({ redirectTo: "/" });
+    expect(ret).toEqual({redirectTo: "/"});
    expect(fetch).toHaveBeenCalledWith("https://example.com/_matrix/client/v3/login", {
      body: '{"device_id":null,"initial_device_display_name":"Synapse Admin","type":"m.login.token","token":"login_token"}',
      headers: new Headers({
        Accept: "application/json",
        "Content-Type": "application/json",
      }),
-      credentials: "same-origin",
      method: "POST",
    });
    expect(localStorage.getItem("base_url")).toEqual("https://example.com");
@ -87,11 +85,9 @@ 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();
@ -104,15 +100,11 @@ 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();
    });
  });

--- a/src/synapse/authProvider.ts
+++ b/src/synapse/authProvider.ts
@ -1,9 +1,8 @@
 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
@ -23,11 +22,6 @@ 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(
          {
@ -57,15 +51,14 @@ 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 = decodeURLComponent(base_url);
-    const login_api_url =
-      decoded_base_url + (accessToken ? "/_matrix/client/v3/account/whoami" : "/_matrix/client/v3/login");
+    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");

    let response;

@ -74,7 +67,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}`,
          }),
        };
@ -88,24 +81,24 @@ const authProvider: AuthProvider = {
      localStorage.setItem("device_id", json.device_id);
      localStorage.setItem("login_type", accessToken ? "accessToken" : "credentials");

-      await FetchConfig();
-      const config = GetConfig();
-      let pageToRedirectTo = "/";
-
-      if (config && config.etkeccAdmin) {
-        pageToRedirectTo = "/server_status";
+      // when doing access token auth, config is not fetched, so we need to do it here
+      if (accessToken) {
+        await FetchConfig();
      }

-      return Promise.resolve({ redirectTo: pageToRedirectTo });
-    } catch (err) {
+      return Promise.resolve({redirectTo: "/"});
+    } 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 () => {
@ -154,11 +147,6 @@ 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}`,
@ -181,7 +169,7 @@ const authProvider: AuthProvider = {
    const status = err.status;

    if (status === 401 || status === 403) {
-      return Promise.reject({ message: displayError(errorBody.errcode, status, errorBody.error) });
+      return Promise.reject({message: displayError(errorBody.errcode, status, errorBody.error)});
    }
    return Promise.resolve();
  },
@ -190,6 +178,8 @@ 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;
--- a/src/synapse/dataProvider.ts
+++ b/src/synapse/dataProvider.ts
@ -13,18 +13,13 @@ import {
  withLifecycleCallbacks,
 } from "react-admin";

-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> = {};
+import { MatrixError, displayError } from "../utils/error";

 // 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,
@ -34,11 +29,11 @@ const jsonClient = async (url: string, options: Options = {}) => {
  try {
    const response = await fetchUtils.fetchJson(url, options);
    return response;
-  } catch (err) {
+  } catch (err: any) {
    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);

@ -46,11 +41,16 @@ 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;
@ -138,7 +138,6 @@ export interface User {
  external_ids: ExternalId[];
  user_type?: string;
  locked: boolean;
-  suspended?: boolean;
 }

 interface Device {
@ -250,7 +249,9 @@ export interface UploadMediaResult {
 }

 export interface ExperimentalFeaturesModel {
-  features: Record<string, boolean>;
+  features: {
+    [key: string]: boolean;
+  };
 }

 export interface RateLimitsModel {
@ -258,125 +259,20 @@ export interface RateLimitsModel {
  burst_count?: number;
 }

-export interface AccountDataModel {
-  account_data: {
-    global: Record<string, object>;
-    rooms: Record<string, object>;
-  };
-}
-
 export interface UsernameAvailabilityResult {
  available?: boolean;
  error?: string;
  errcode?: string;
 }

-export interface ServerStatusComponent {
-  ok: boolean;
-  category: string;
-  reason: string;
-  url: string;
-  help: string;
-  label: {
-    url: string;
-    icon: string;
-    text: string;
-  };
-}
-
-export interface ServerStatusResponse {
-  success: boolean;
-  ok: boolean;
-  host: string;
-  results: ServerStatusComponent[];
-}
-
-export interface ServerProcessResponse {
-  locked_at: string;
-  command: string;
-}
-
-export interface ServerNotification {
-  event_id: string;
-  output: string;
-  sent_at: string;
-}
-
-export interface ServerNotificationsResponse {
-  success: boolean;
-  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>;
  uploadMedia: (params: UploadMediaParams) => Promise<UploadMediaResult>;
  updateFeatures: (id: Identifier, features: ExperimentalFeaturesModel) => Promise<void>;
  getRateLimits: (id: Identifier) => Promise<RateLimitsModel>;
  setRateLimits: (id: Identifier, rateLimits: RateLimitsModel) => Promise<void>;
-  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 = {
@ -461,20 +357,6 @@ const resourceMap = {
    data: "members",
    total: json => json.total,
  },
-  room_media: {
-    map: (mediaId: string) => ({
-      id: mediaId.replace("mxc://" + localStorage.getItem("home_server") + "/", ""),
-      media_id: mediaId.replace("mxc://" + localStorage.getItem("home_server") + "/", ""),
-    }),
-    reference: (id: Identifier) => ({
-      endpoint: `/_synapse/admin/v1/room/${id}/media`,
-    }),
-    total: json => json.total,
-    data: "local",
-    delete: (params: DeleteParams) => ({
-      endpoint: `/_synapse/admin/v1/media/${localStorage.getItem("home_server")}/${params.id}`,
-    }),
-  },
  room_state: {
    map: (rs: RoomState) => ({
      ...rs,
@ -666,7 +548,7 @@ function getSearchOrder(order: "ASC" | "DESC") {
 const baseDataProvider: SynapseDataProvider = {
  getList: async (resource, params) => {
    console.log("getList " + resource);
-    const { user_id, name, guests, deactivated, locked, suspended, search_term, destination, valid } = params.filter;
+    const { user_id, name, guests, deactivated, locked, search_term, destination, valid } = params.filter;
    const { page, perPage } = params.pagination as PaginationPayload;
    const { field, order } = params.sort as SortPayload;
    const from = (page - 1) * perPage;
@ -680,7 +562,6 @@ const baseDataProvider: SynapseDataProvider = {
      guests: guests,
      deactivated: deactivated,
      locked: locked,
-      suspended: suspended,
      valid: valid,
      order_by: field,
      dir: getSearchOrder(order),
@ -723,23 +604,21 @@ const baseDataProvider: SynapseDataProvider = {
    const res = resourceMap[resource];

    const endpoint_url = base_url + res.path;
-    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 (!(id as string).endsWith(homeserver)) {
-            const json = {
+    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)) {
+          const json = {
              name: id,
-            };
-            return Promise.resolve({ json });
-          }
+          };
+          return Promise.resolve({ json });
        }
-        return jsonClient(`${endpoint_url}/${encodeURIComponent(id)}`);
-      })
-    );
+      }
+      return jsonClient(`${endpoint_url}/${encodeURIComponent(id)}`);
+    }));
    return {
      data: responses.map(({ json }) => res.map(json)),
      total: responses.length,
@ -764,29 +643,12 @@ 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 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);
-      }
-    }

+    const { json } = await jsonClient(endpoint_url);
    return {
-      data: jsonData.map(res.map),
-      total: total,
+      data: json[res.data].map(res.map),
+      total: res.total(json, from, perPage),
    };
  },

@ -798,7 +660,6 @@ 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),
@ -945,23 +806,6 @@ const baseDataProvider: SynapseDataProvider = {
    return json as DeleteMediaResult;
  },

-  /**
-   * Purge remote media by date
-   *
-   * @link https://element-hq.github.io/synapse/latest/admin_api/media_admin_api.html#purge-remote-media-api
-   *
-   * @param before_ts Unix timestamp in milliseconds. Files that were last used before this timestamp will be deleted. It is the timestamp of last access, not the timestamp when the file was created.
-   * @returns
-   */
-  purgeRemoteMedia: async ({ before_ts }) => {
-    const endpoint = `/_synapse/admin/v1/purge_media_cache?before_ts=${before_ts}`;
-
-    const base_url = localStorage.getItem("base_url");
-    const endpoint_url = base_url + endpoint;
-    const { json } = await jsonClient(endpoint_url, { method: "POST" });
-    return json as DeleteMediaResult;
-  },
-
  uploadMedia: async ({ file, filename, content_type }: UploadMediaParams) => {
    const base_url = localStorage.getItem("base_url");
    const uploadMediaURL = `${base_url}/_matrix/media/v3/upload`;
@ -993,16 +837,10 @@ const baseDataProvider: SynapseDataProvider = {
    const { json } = await jsonClient(endpoint_url);
    return json as RateLimitsModel;
  },
-  getAccountData: async (id: Identifier) => {
-    const base_url = localStorage.getItem("base_url");
-    const endpoint_url = `${base_url}/_synapse/admin/v1/users/${encodeURIComponent(returnMXID(id))}/accountdata`;
-    const { json } = await jsonClient(endpoint_url);
-    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;
      }, {});
@ -1011,7 +849,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) });
@ -1034,7 +872,7 @@ const baseDataProvider: SynapseDataProvider = {

    const endpoint_url = `${base_url}/_synapse/admin/v1/rooms/${encodeURIComponent(room_id)}/make_room_admin`;
    try {
-      await jsonClient(endpoint_url, { method: "POST", body: JSON.stringify({ user_id }) });
+      const { json } = await jsonClient(endpoint_url, { method: "POST", body: JSON.stringify({ user_id }) });
      return { success: true };
    } catch (error) {
      if (error instanceof HttpError) {
@ -1042,517 +880,7 @@ const baseDataProvider: SynapseDataProvider = {
      }
      throw error;
    }
-  },
-  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 = "";
-
-    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) {
-        console.error(`Error getting server running process: ${response.status} ${response.statusText}`);
-        return { locked_at, command };
-      }
-      const status = response.status;
-
-      if (status === 200) {
-        const json = await response.json();
-        return json as { locked_at: string; command: string };
-      }
-      if (status === 204) {
-        return { locked_at, command };
-      }
-    } catch (error) {
-      console.error("Error getting server running process", error);
-    }
-
-    return { locked_at, command };
-  },
-  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}`);
-        return { success: false, ok: false, host: "", results: [] };
-      }
-
-      const status = response.status;
-      if (status === 200) {
-        const json = await response.json();
-        const result = { success: true, ...json } as ServerStatusResponse;
-        return result;
-      }
-    } catch (error) {
-      console.error("Error getting server status", error);
-    }
-
-    return { success: false, ok: false, host: "", results: [] };
-  },
-  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}`);
-        return { success: false, notifications: [] };
-      }
-
-      const status = response.status;
-      if (status === 204) {
-        return { success: true, notifications: [] };
-      }
-
-      if (status === 200) {
-        const json = await response.json();
-        const result = { success: true, notifications: json } as ServerNotificationsResponse;
-        return result;
-      }
-
-      return { success: true, notifications: [] };
-    } catch (error) {
-      console.error("Error getting server notifications", error);
-    }
-
-    return { success: false, notifications: [] };
-  },
-  deleteServerNotifications: async (serverNotificationsUrl: string) => {
-    try {
-      const response = await fetch(`${serverNotificationsUrl}/notifications`, {
-        headers: {
-          Authorization: `Bearer ${localStorage.getItem("access_token")}`,
-        },
-        method: "DELETE",
-      });
-      if (!response.ok) {
-        console.error(`Error deleting server notifications: ${response.status} ${response.statusText}`);
-        return { success: false };
-      }
-
-      const status = response.status;
-      if (status === 204) {
-        const result = { success: true };
-        return result;
-      }
-    } catch (error) {
-      console.error("Error deleting server notifications", error);
-    }
-
-    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, [
@ -1562,43 +890,28 @@ 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 response = await dataProvider.uploadMedia({
+        const reponse = await dataProvider.uploadMedia({
          file: avatarFile,
          filename: params.data.avatar_file.title,
          content_type: params.data.avatar_file.rawFile.type,
        });
-        params.data.avatar_url = response.content_uri;
+        params.data.avatar_url = reponse.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`;
@ -1613,7 +926,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) {
--- a/src/synapse/matrix.ts
+++ b/src/synapse/matrix.ts
@ -1,4 +1,6 @@
-import { fetchUtils } from "react-admin";
+import { Identifier, fetchUtils } from "react-admin";
+
+import { isMXID } from "../utils/mxid";

 export const splitMxid = mxid => {
  const re = /^@(?<name>[a-zA-Z0-9._=\-/]+):(?<domain>[a-zA-Z0-9\-.]+\.[a-zA-Z]+)$/;
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@ -1,9 +1,7 @@
 export interface Config {
  restrictBaseUrl: string | string[];
-  corsCredentials: string;
  asManagedUsers: RegExp[];
  menu: MenuItem[];
-  etkeccAdmin?: string;
 }

 export interface MenuItem {
@ -17,67 +15,45 @@ export const WellKnownKey = "cc.etke.synapse-admin";
 // current configuration
 let config: Config = {
  restrictBaseUrl: "",
-  corsCredentials: "same-origin",
  asManagedUsers: [],
  menu: [],
-  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";
-  if (import.meta.env.BASE_URL) {
-    configJSONUrl = `${import.meta.env.BASE_URL.replace(/\/?$/, "/")}config.json`;
-  }
  try {
-    const resp = await fetch(configJSONUrl);
+    const resp = await fetch("config.json");
    const configJSON = await resp.json();
-    console.log("Loaded", configJSONUrl, configJSON);
+    console.log("Loaded config.json", configJSON);
    LoadConfig(configJSON);
  } catch (e) {
    console.error(e);
  }

-  let protocol = "https";
-  const baseURL = localStorage.getItem("base_url");
-  if (baseURL && baseURL.startsWith("http://")) {
-    protocol = "http";
-  }
-
  // if home_server is set, try to load https://home_server/.well-known/matrix/client
  const homeserver = localStorage.getItem("home_server");
  if (homeserver) {
    try {
-      const resp = await fetch(`${protocol}://${homeserver}/.well-known/matrix/client`);
-      const configWK = await resp.json();
+      const resp = await fetch(`https://${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 https://${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]);
-      }
+          console.log(`Loaded https://${homeserver}.well-known/matrix/client`, configWK);
+            LoadConfig(configWK[WellKnownKey]);
+        }
    } catch (e) {
-      console.log(`${protocol}://${homeserver}/.well-known/matrix/client not found, skipping`, e);
+      console.log(`https://${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, losing some keys, and messing
-// with typescript types
-export const LoadConfig = (context: object) => {
+export const LoadConfig = (context: any) => {
  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));
  }
@ -89,16 +65,13 @@ export const LoadConfig = (context: object) => {
  if (menu.length > 0) {
    config.menu = menu;
  }
-
-  if (context?.etkeccAdmin) {
-    config.etkeccAdmin = context.etkeccAdmin;
-  }
-};
+}

 // get config
 export const GetConfig = (): Config => {
  return config;
-};
+}
+

 // clear config
 export const ClearConfig = () => {
@ -106,4 +79,4 @@ export const ClearConfig = () => {
  config = {} as Config;
  // session
  localStorage.clear();
-};
+}
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@ -26,29 +26,3 @@ 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`;
-};
--- a/src/utils/decodeURLComponent.ts
+++ b/src/utils/decodeURLComponent.ts
@ -1,15 +0,0 @@
-/**
- * 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;
--- a/src/utils/error.ts
+++ b/src/utils/error.ts
@ -1,6 +1,6 @@
-export interface MatrixError {
-  errcode: string;
-  error: string;
+export type MatrixError = {
+	errcode: string;
+	error: string;
 }

-export const displayError = (errcode: string, status: number, message: string) => `${errcode} (${status}): ${message}`;
+export const displayError = (errcode: string, status: number, message: string) => `${errcode} (${status}): ${message}`;
--- a/Show More
+++ b/Show More