fix: cross signing is stable

2021-08-29 12:37:05 +02:00
73 changed files with 2150 additions and 3269 deletions
@@ -18,9 +18,7 @@ variables:
  stage: "build"
  needs: []
  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-    - if: '$CI_COMMIT_BRANCH == "next"'
-    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
  interruptible: true
  image: "rust:latest"
  tags: ["docker"]
@@ -43,8 +41,6 @@ variables:
  script:
    - time cargo build --target $TARGET --release
    - 'mv "target/$TARGET/release/conduit" "conduit-$TARGET"'
-  artifacts:
-    expire_in: never


 build:release:cargo:x86_64-unknown-linux-gnu:
@@ -75,12 +71,12 @@ build:release:cargo:aarch64-unknown-linux-gnu:
  extends: .build-cargo-shared-settings
  variables:
    TARGET: "aarch64-unknown-linux-gnu"
-    NEEDED_PACKAGES: "build-essential gcc-10-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross"
+    NEEDED_PACKAGES: "build-essential gcc-8-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross"
    CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
    CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc
    CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++
-    TARGET_CC: "/usr/bin/aarch64-linux-gnu-gcc-10"
-    TARGET_AR: "/usr/bin/aarch64-linux-gnu-gcc-ar-10"
+    TARGET_CC: "/usr/bin/aarch64-linux-gnu-gcc-8"
+    TARGET_AR: "/usr/bin/aarch64-linux-gnu-gcc-ar-8"
  artifacts:
    name: "conduit-aarch64-unknown-linux-gnu"
    paths:
@@ -110,14 +106,11 @@ build:release:cargo:x86_64-unknown-linux-musl:
  extends: ".build-cargo-shared-settings"
  rules:
    - if: '$CI_COMMIT_BRANCH'
-    - if: '$CI_COMMIT_TAG'
  cache:
    key: "build_cache-$TARGET-debug"
  script:
    - "time cargo build --target $TARGET"
    - 'mv "target/$TARGET/debug/conduit" "conduit-debug-$TARGET"'
-  artifacts:
-    expire_in: 4 weeks

 build:debug:cargo:x86_64-unknown-linux-gnu:
  extends: ".cargo-debug-shared-settings"
@@ -157,9 +150,7 @@ build:debug:cargo:x86_64-unknown-linux-musl:
  stage: "build"
  needs: [ ]
  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-    - if: '$CI_COMMIT_BRANCH == "next"'
-    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
  interruptible: true
  image: "rust:latest"
  tags: ["docker"]
@@ -193,11 +184,11 @@ build:cargo-deb:x86_64-unknown-linux-gnu:
    expose_as: "Debian Package x86_64"


+
 # --------------------------------------------------------------------- #
 #  Create and publish docker image                                      #
 # --------------------------------------------------------------------- #

-# Build a docker image by packaging up the x86_64-unknown-linux-musl binary into an alpine image
 .docker-shared-settings:
  stage: "build docker image"
  needs: []
@@ -214,31 +205,8 @@ build:cargo-deb:x86_64-unknown-linux-gnu:
    - 'echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"$DOCKER_HUB\":{\"username\":\"$DOCKER_HUB_USER\",\"password\":\"$DOCKER_HUB_PASSWORD\"}}}" > /kaniko/.docker/config.json'


-build:docker:next:
-  extends: .docker-shared-settings
-  needs:
-    - "build:release:cargo:x86_64-unknown-linux-musl"
-  script:
-    - >
-      /kaniko/executor
-      $KANIKO_CACHE_ARGS
-      --force
-      --context $CI_PROJECT_DIR
-      --build-arg CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-      --build-arg VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml)
-      --build-arg "GIT_REF=$CI_COMMIT_SHORT_SHA"
-      --dockerfile "$CI_PROJECT_DIR/docker/ci-binaries-packaging.Dockerfile"
-      --destination "$CI_REGISTRY_IMAGE/conduit:next"
-      --destination "$CI_REGISTRY_IMAGE/conduit:next-alpine"
-      --destination "$CI_REGISTRY_IMAGE/conduit:commit-$CI_COMMIT_SHORT_SHA"
-      --destination "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:next"
-      --destination "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:next-alpine"
-      --destination "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:commit-$CI_COMMIT_SHORT_SHA"
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "next"'
-
-
-build:docker:master:
+# Build a docker image by packaging up the x86_64-unknown-linux-musl binary into an alpine image
+build:docker:main:
  extends: .docker-shared-settings
  needs:
    - "build:release:cargo:x86_64-unknown-linux-musl"
@@ -249,35 +217,16 @@ build:docker:master:
      --context $CI_PROJECT_DIR
      --build-arg CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
      --build-arg VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml)
-      --build-arg "GIT_REF=$CI_COMMIT_SHORT_SHA"
+      --build-arg "GIT_REF=$CI_COMMIT_REF_NAME"
      --dockerfile "$CI_PROJECT_DIR/docker/ci-binaries-packaging.Dockerfile"
      --destination "$CI_REGISTRY_IMAGE/conduit:latest"
-      --destination "$CI_REGISTRY_IMAGE/conduit:latest-alpine"
+      --destination "$CI_REGISTRY_IMAGE/conduit:alpine"
+      --destination "$CI_REGISTRY_IMAGE/conduit:commit-$CI_COMMIT_SHORT_SHA"
      --destination "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:latest"
-      --destination "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:latest-alpine"
+      --destination "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:alpine"
+      --destination "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:commit-$CI_COMMIT_SHORT_SHA"
  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-
-
-build:docker:tags:
-  extends: .docker-shared-settings
-  needs:
-    - "build:release:cargo:x86_64-unknown-linux-musl"
-  script:
-    - >
-      /kaniko/executor
-      $KANIKO_CACHE_ARGS
-      --context $CI_PROJECT_DIR
-      --build-arg CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-      --build-arg VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml)
-      --build-arg "GIT_REF=$CI_COMMIT_SHORT_SHA"
-      --dockerfile "$CI_PROJECT_DIR/docker/ci-binaries-packaging.Dockerfile"
-      --destination "$CI_REGISTRY_IMAGE/conduit:$CI_COMMIT_TAG"
-      --destination "$CI_REGISTRY_IMAGE/conduit:$CI_COMMIT_TAG-alpine"
-      --destination "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:$CI_COMMIT_TAG"
-      --destination "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:$CI_COMMIT_TAG-alpine"
-  rules:
-    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'



@@ -341,6 +290,30 @@ test:sytest:
      junit: "$CI_PROJECT_DIR/sytest.xml"


+test:register:element-web-stable:
+  stage: "test"
+  needs:
+    - "build:debug:cargo:x86_64-unknown-linux-gnu"
+  image: "buildkite/puppeteer:latest"
+  tags: [ "docker" ]
+  interruptible: true
+  script:
+    - "CONDUIT_CONFIG=tests/test-config.toml ./conduit-debug-x86_64-unknown-linux-gnu > conduit.log &"
+    - "cd tests/client-element-web/"
+    - "npm install puppeteer"
+    - "node test-element-web-registration.js \"https://app.element.io/\" \"http://localhost:6167\""
+    - "killall --regexp \"conduit\""
+    - "cd ../.."
+    - "cat conduit.log"
+  artifacts:
+    paths:
+      - "tests/client-element-web/*.png"
+      - "*.log"
+    expire_in: 1 week
+    when: always
+  retry: 1
+
+
 # --------------------------------------------------------------------- #
 #  Store binaries as package so they have download urls                 #
 # --------------------------------------------------------------------- #
@@ -354,9 +327,7 @@ publish:package:
    - "build:release:cargo:x86_64-unknown-linux-musl"
    - "build:cargo-deb:x86_64-unknown-linux-gnu"
  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-    - if: '$CI_COMMIT_BRANCH == "next"'
-    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
  image: curlimages/curl:latest
  tags: ["docker"]
  variables:
@@ -4,7 +4,14 @@

 If you run into any problems while setting up an Appservice, write an email to `timo@koesters.xyz`, ask us in `#conduit:matrix.org` or [open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new).

-## Set up the appservice - general instructions
+## Tested appservices
+
+Here are some appservices we tested and that work with Conduit:
+- matrix-appservice-discord
+- mautrix-hangouts
+- mautrix-telegram
+
+## Set up the appservice

 Follow whatever instructions are given by the appservice. This usually includes
 downloading, changing its config (setting domain, homeserver url, port etc.)
@@ -39,48 +46,3 @@ Then you are done. Conduit will send messages to the appservices and the
 appservice can send requests to the homeserver. You don't need to restart
 Conduit, but if it doesn't work, restarting while the appservice is running
 could help.
-
-## Appservice-specific instructions
-
-### Tested appservices
-
-These appservices have been tested and work with Conduit without any extra steps:
-
- [matrix-appservice-discord](https://github.com/Half-Shot/matrix-appservice-discord)
- [mautrix-hangouts](https://github.com/mautrix/hangouts/)
- [mautrix-telegram](https://github.com/mautrix/telegram/)
-
-### [mautrix-signal](https://github.com/mautrix/signal)
-
-There are a few things you need to do, in order for the Signal bridge (at least
-up to version `0.2.0`) to work. How you do this depends on whether you use
-Docker or `virtualenv` to run it. In either case you need to modify
-[portal.py](https://github.com/mautrix/signal/blob/master/mautrix_signal/portal.py).
-Do this **before** following the bridge installation guide.
-
-1. **Create a copy of `portal.py`**. Go to
-   [portal.py](https://github.com/mautrix/signal/blob/master/mautrix_signal/portal.py)
-at [mautrix-signal](https://github.com/mautrix/signal) (make sure you change to
-the correct commit/version of mautrix-signal you're using) and copy its
-content. Create a new `portal.py` on your system and paste the content in.
-2. **Patch the copy**. Exact line numbers may be slightly different, look nearby if they don't match: 
-  - [Line 1020](https://github.com/mautrix/signal/blob/4ea831536f154aba6419d13292479eb383ea3308/mautrix_signal/portal.py#L1020)
-    ```diff
-    --- levels.users[self.main_intent.mxid] = 9001 if is_initial else 100
-    +++ levels.users[self.main_intent.mxid] = 100 if is_initial else 100
-    ```
-  - [Between lines 1041 and 1042](https://github.com/mautrix/signal/blob/4ea831536f154aba6419d13292479eb383ea3308/mautrix_signal/portal.py#L1041-L1042) add a new line:
-    ```diff
-        "type": str(EventType.ROOM_POWER_LEVELS),
-    +++ "state_key": "",
-        "content": power_levels.serialize(),
-    ```
-3. **Deploy the patch**. This is different depending on how you have `mautrix-signal` deployed:
-  - [*If using virtualenv*] Copy your patched `portal.py` to `./lib/python3.7/site-packages/mautrix_signal/portal.py` (the exact version of Python may be different on your system).
-  -  [*If using Docker*] Map the patched `portal.py` into the `mautrix-signal` container:
-    
-    ```yaml
-    volumes:
-      - ./your/path/on/host/portal.py:/usr/lib/python3.9/site-packages/mautrix_signal/portal.py
-    ```
-4. Now continue with the [bridge installation instructions ](https://docs.mau.fi/bridges/index.html) and the general bridge notes above.
@@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "adler32"
 version = "1.2.0"
@@ -198,9 +196,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"

 [[package]]
 name = "cc"
-version = "1.0.70"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
 dependencies = [
 "jobserver",
 ]
@@ -238,7 +236,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"

 [[package]]
 name = "conduit"
-version = "0.2.0"
+version = "0.1.0"
 dependencies = [
 "base64 0.13.0",
 "bytes",
@@ -250,9 +248,10 @@ dependencies = [
 "jsonwebtoken",
 "lru-cache",
 "num_cpus",
- "opentelemetry",
+ "opentelemetry 0.16.0",
 "opentelemetry-jaeger",
 "parking_lot",
+ "pretty_env_logger",
 "rand 0.8.4",
 "regex",
 "reqwest",
@@ -268,14 +267,14 @@ dependencies = [
 "serde_yaml",
 "sled",
 "thiserror",
- "thread_local",
 "threadpool",
 "tokio",
 "tracing",
 "tracing-flame",
+ "tracing-opentelemetry",
 "tracing-subscriber",
 "trust-dns-resolver",
- "webpki 0.22.0",
+ "webpki",
 ]

 [[package]]
@@ -590,6 +589,19 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "env_logger"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "fallible-iterator"
 version = "0.2.0"
@@ -644,9 +656,9 @@ dependencies = [

 [[package]]
 name = "futures"
-version = "0.3.17"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
+checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -659,9 +671,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.17"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
+checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -669,15 +681,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.17"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
+checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"

 [[package]]
 name = "futures-executor"
-version = "0.3.17"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
+checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -686,15 +698,15 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.17"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
+checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"

 [[package]]
 name = "futures-macro"
-version = "0.3.17"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
+checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
 dependencies = [
 "autocfg",
 "proc-macro-hack",
@@ -705,21 +717,21 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.17"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
+checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"

 [[package]]
 name = "futures-task"
-version = "0.3.17"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
+checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"

 [[package]]
 name = "futures-util"
-version = "0.3.17"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
+checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
 dependencies = [
 "autocfg",
 "futures-channel",
@@ -942,6 +954,15 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"

+[[package]]
+name = "humantime"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
+dependencies = [
+ "quick-error",
+]
+
 [[package]]
 name = "hyper"
 version = "0.14.12"
@@ -978,7 +999,7 @@ dependencies = [
 "rustls",
 "tokio",
 "tokio-rustls",
- "webpki 0.21.4",
+ "webpki",
 ]

 [[package]]
@@ -1004,7 +1025,7 @@ dependencies = [
 "gif",
 "jpeg-decoder",
 "num-iter",
- "num-rational",
+ "num-rational 0.3.2",
 "num-traits",
 "png",
 ]
@@ -1181,9 +1202,9 @@ dependencies = [

 [[package]]
 name = "lock_api"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
+checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
 dependencies = [
 "scopeguard",
 ]
@@ -1327,6 +1348,20 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "num"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
+dependencies = [
+ "num-bigint 0.4.0",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational 0.4.0",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.2.6"
@@ -1338,6 +1373,26 @@ dependencies = [
 "num-traits",
 ]

+[[package]]
+name = "num-bigint"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.44"
@@ -1370,6 +1425,18 @@ dependencies = [
 "num-traits",
 ]

+[[package]]
+name = "num-rational"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
+dependencies = [
+ "autocfg",
+ "num-bigint 0.4.0",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.14"
@@ -1407,6 +1474,23 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"

+[[package]]
+name = "opentelemetry"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff27b33e30432e7b9854936693ca103d8591b0501f7ae9f633de48cda3bf2a67"
+dependencies = [
+ "async-trait",
+ "crossbeam-channel",
+ "futures",
+ "js-sys",
+ "lazy_static",
+ "percent-encoding",
+ "pin-project",
+ "rand 0.8.4",
+ "thiserror",
+]
+
 [[package]]
 name = "opentelemetry"
 version = "0.16.0"
@@ -1434,7 +1518,7 @@ checksum = "db22f492873ea037bc267b35a0e8e4fb846340058cb7c864efe3d0bf23684593"
 dependencies = [
 "async-trait",
 "lazy_static",
- "opentelemetry",
+ "opentelemetry 0.16.0",
 "opentelemetry-semantic-conventions",
 "thiserror",
 "thrift",
@@ -1447,7 +1531,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffeac823339e8b0f27b961f4385057bf9f97f2863bc745bd015fd6091f2270e9"
 dependencies = [
- "opentelemetry",
+ "opentelemetry 0.16.0",
 ]

 [[package]]
@@ -1471,9 +1555,9 @@ dependencies = [

 [[package]]
 name = "parking_lot"
-version = "0.11.2"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
 "instant",
 "lock_api",
@@ -1482,9 +1566,9 @@ dependencies = [

 [[package]]
 name = "parking_lot_core"
-version = "0.8.5"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
 dependencies = [
 "cfg-if 1.0.0",
 "instant",
@@ -1607,6 +1691,16 @@ version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"

+[[package]]
+name = "pretty_env_logger"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
+dependencies = [
+ "env_logger",
+ "log",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "1.0.0"
@@ -1631,9 +1725,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"

 [[package]]
 name = "proc-macro2"
-version = "1.0.29"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
 dependencies = [
 "unicode-xid",
 ]
@@ -1967,8 +2061,8 @@ dependencies = [

 [[package]]
 name = "ruma"
-version = "0.4.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+version = "0.3.0"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "assign",
 "js_int",
@@ -1988,8 +2082,8 @@ dependencies = [

 [[package]]
 name = "ruma-api"
-version = "0.18.5"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+version = "0.18.3"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "bytes",
 "http",
@@ -2004,8 +2098,8 @@ dependencies = [

 [[package]]
 name = "ruma-api-macros"
-version = "0.18.5"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+version = "0.18.3"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
@@ -2016,7 +2110,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.4.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "ruma-api",
 "ruma-common",
@@ -2029,8 +2123,8 @@ dependencies = [

 [[package]]
 name = "ruma-client-api"
-version = "0.12.3"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+version = "0.12.2"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "assign",
 "bytes",
@@ -2050,7 +2144,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.6.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "indexmap",
 "js_int",
@@ -2064,8 +2158,8 @@ dependencies = [

 [[package]]
 name = "ruma-events"
-version = "0.24.6"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+version = "0.24.4"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "indoc",
 "js_int",
@@ -2080,8 +2174,8 @@ dependencies = [

 [[package]]
 name = "ruma-events-macros"
-version = "0.24.6"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+version = "0.24.4"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
@@ -2091,8 +2185,8 @@ dependencies = [

 [[package]]
 name = "ruma-federation-api"
-version = "0.3.1"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+version = "0.3.0"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "js_int",
 "ruma-api",
@@ -2107,10 +2201,9 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers"
 version = "0.20.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "paste",
- "percent-encoding",
 "rand 0.8.4",
 "ruma-identifiers-macros",
 "ruma-identifiers-validation",
@@ -2122,7 +2215,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-macros"
 version = "0.20.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "quote",
 "ruma-identifiers-validation",
@@ -2132,7 +2225,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "thiserror",
 ]
@@ -2140,7 +2233,7 @@ dependencies = [
 [[package]]
 name = "ruma-identity-service-api"
 version = "0.3.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "js_int",
 "ruma-api",
@@ -2153,7 +2246,7 @@ dependencies = [
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.3.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "js_int",
 "ruma-api",
@@ -2168,7 +2261,7 @@ dependencies = [
 [[package]]
 name = "ruma-serde"
 version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "bytes",
 "form_urlencoded",
@@ -2182,7 +2275,7 @@ dependencies = [
 [[package]]
 name = "ruma-serde-macros"
 version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
@@ -2193,7 +2286,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.9.0"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "base64 0.13.0",
 "ed25519-dalek",
@@ -2209,11 +2302,12 @@ dependencies = [

 [[package]]
 name = "ruma-state-res"
-version = "0.4.1"
-source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197"
+version = "0.3.0"
+source = "git+https://github.com/DevinR528/ruma?rev=c7860fcb89dbde636e2c83d0636934fb9924f40c#c7860fcb89dbde636e2c83d0636934fb9924f40c"
 dependencies = [
 "itertools 0.10.1",
 "js_int",
+ "maplit",
 "ruma-common",
 "ruma-events",
 "ruma-identifiers",
@@ -2270,7 +2364,7 @@ dependencies = [
 "log",
 "ring",
 "sct",
- "webpki 0.21.4",
+ "webpki",
 ]

 [[package]]
@@ -2331,22 +2425,23 @@ dependencies = [

 [[package]]
 name = "security-framework"
-version = "2.4.2"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"
+checksum = "5b9bd29cdffb8875b04f71c51058f940cf4e390bbfd2ce669c4f22cd70b492a5"
 dependencies = [
 "bitflags",
 "core-foundation",
 "core-foundation-sys",
 "libc",
+ "num",
 "security-framework-sys",
 ]

 [[package]]
 name = "security-framework-sys"
-version = "2.4.2"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
+checksum = "19133a286e494cc3311c165c4676ccb1fd47bed45b55f9d71fbd784ad4cea6f8"
 dependencies = [
 "core-foundation-sys",
 "libc",
@@ -2369,18 +2464,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"

 [[package]]
 name = "serde"
-version = "1.0.130"
+version = "1.0.129"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
+checksum = "d1f72836d2aa753853178eda473a3b9d8e4eefdaf20523b919677e6de489f8f1"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.130"
+version = "1.0.129"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
+checksum = "e57ae87ad533d9a56427558b516d0adac283614e347abf85b0dc0cbbf0a249f3"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2389,9 +2484,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.67"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950"
+checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
 dependencies = [
 "itoa",
 "ryu",
@@ -2472,7 +2567,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b"
 dependencies = [
 "chrono",
- "num-bigint",
+ "num-bigint 0.2.6",
 "num-traits",
 ]

@@ -2676,19 +2771,28 @@ dependencies = [
 ]

 [[package]]
-name = "thiserror"
-version = "1.0.28"
+name = "termcolor"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "283d5230e63df9608ac7d9691adc1dfb6e701225436eb64d0b9a7f0a5a04f6ec"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.28"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa3884228611f5cd3608e2d409bf7dce832e4eb3135e3f11addbd7e41bd68e71"
+checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2791,9 +2895,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

 [[package]]
 name = "tokio"
-version = "1.11.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce"
+checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5"
 dependencies = [
 "autocfg",
 "bytes",
@@ -2827,7 +2931,7 @@ checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
 "rustls",
 "tokio",
- "webpki 0.21.4",
+ "webpki",
 ]

 [[package]]
@@ -2936,6 +3040,19 @@ dependencies = [
 "tracing-core",
 ]

+[[package]]
+name = "tracing-opentelemetry"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c47440f2979c4cd3138922840eec122e3c0ba2148bc290f756bd7fd60fc97fff"
+dependencies = [
+ "opentelemetry 0.15.0",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "tracing-serde"
 version = "0.1.2"
@@ -3031,9 +3148,9 @@ dependencies = [

 [[package]]
 name = "typenum"
-version = "1.14.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
+checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"

 [[package]]
 name = "ubyte"
@@ -3233,16 +3350,6 @@ dependencies = [
 "untrusted",
 ]

-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "weezl"
 version = "0.1.5"
@@ -3277,6 +3384,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -6,7 +6,7 @@ authors = ["timokoesters <timo@koesters.xyz>"]
 homepage = "https://conduit.rs"
 repository = "https://gitlab.com/famedly/conduit"
 readme = "README.md"
-version = "0.2.0"
+version = "0.1.0"
 edition = "2018"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -19,28 +19,28 @@ rocket = { version = "0.5.0-rc.1", features = ["tls"] } # Used to handle request

 # Used for matrix spec type definitions and helpers
 #ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
-ruma = { git = "https://github.com/ruma/ruma", rev = "58cdcae1f9a8f4824bcbec1de1bb13e659c66804", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
-#ruma = { git = "https://github.com/timokoesters/ruma", rev = "50c1db7e0a3a21fc794b0cce3b64285a4c750c71", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
+#ruma = { git = "https://github.com/ruma/ruma", rev = "f5ab038e22421ed338396ece977b6b2844772ced", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
+ruma = { git = "https://github.com/DevinR528/ruma", rev = "c7860fcb89dbde636e2c83d0636934fb9924f40c", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
 #ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }

 # Used for long polling and federation sender, should be the same as rocket::tokio
-tokio = "1.11.0"
+tokio = "1.8.2"
 # Used for storing data permanently
 sled = { version = "0.34.6", features = ["compression", "no_metrics"], optional = true }
 #sled = { git = "https://github.com/spacejam/sled.git", rev = "e4640e0773595229f398438886f19bca6f7326a2", features = ["compression"] }

 # Used for the http request / response body type for Ruma endpoints used with reqwest
-bytes = "1.1.0"
+bytes = "1.0.1"
 # Used for rocket<->ruma conversions
 http = "0.2.4"
 # Used to find data directory for default db path
 directories = "3.0.2"
 # Used for ruma wrapper
-serde_json = { version = "1.0.67", features = ["raw_value"] }
+serde_json = { version = "1.0.64", features = ["raw_value"] }
 # Used for appservice registration files
-serde_yaml = "0.8.20"
+serde_yaml = "0.8.17"
 # Used for pdu definition
-serde = "1.0.130"
+serde = "1.0.126"
 # Used for secure identifiers
 rand = "0.8.4"
 # Used to hash passwords
@@ -50,9 +50,9 @@ reqwest = { version = "0.11.4", default-features = false, features = ["rustls-tl
 # Custom TLS verifier
 rustls = { version = "0.19.1", features = ["dangerous_configuration"] }
 rustls-native-certs = "0.5.0"
-webpki = "0.22.0"
+webpki = "0.21.0"
 # Used for conduit::Error type
-thiserror = "1.0.28"
+thiserror = "1.0.26"
 # Used to generate thumbnails for images
 image = { version = "0.23.14", default-features = false, features = ["jpeg", "png", "gif"] }
 # Used to encode server public key
@@ -67,18 +67,19 @@ regex = "1.5.4"
 jsonwebtoken = "7.2.0"
 # Performance measurements
 tracing = { version = "0.1.26", features = ["release_max_level_warn"] }
-tracing-subscriber = "0.2.20"
+tracing-subscriber = "0.2.19"
+tracing-opentelemetry = "0.14.0"
 tracing-flame = "0.1.0"
 opentelemetry = { version = "0.16.0", features = ["rt-tokio"] }
 opentelemetry-jaeger = { version = "0.15.0", features = ["rt-tokio"] }
+pretty_env_logger = "0.4.0"
 lru-cache = "0.1.2"
 rusqlite = { version = "0.25.3", optional = true, features = ["bundled"] }
-parking_lot = { version = "0.11.2", optional = true }
+parking_lot = { version = "0.11.1", optional = true }
 crossbeam = { version = "0.8.1", optional = true }
 num_cpus = "1.13.0"
 threadpool = "1.8.1"
 heed = { git = "https://github.com/timokoesters/heed.git", rev = "f6f825da7fb2c758867e05ad973ef800a6fe1d5d", optional = true }
-thread_local = "1.1.3"

 [features]
 default = ["conduit_bin", "backend_sqlite"]
@@ -44,7 +44,7 @@ This also allows you to make sure that the file permissions are correctly set up

 In Debian you can use this command to create a Conduit user:

-```bash
+```
 sudo adduser --system conduit --no-create-home
 ```

@@ -107,8 +107,8 @@ port = 6167
 # Max size for uploads
 max_request_size = 20_000_000 # in bytes

-# Enables registration. If set to false, no users can register on this server.
-allow_registration = true
+# Disabling registration means no new users will be able to register on this server
+allow_registration = false

 # Disable encryption, so no new encrypted rooms can be created
 # Note: existing rooms will continue to work
@@ -131,13 +131,13 @@ address = "127.0.0.1" # This makes sure Conduit can only be reached using the re
 As we are using a Conduit specific user we need to allow it to read the config.
 To do that you can run this command on Debian:

-```bash
+```
 sudo chown -R conduit:nogroup /etc/matrix-conduit
 ```

 If you use the default database path you also need to run this:

-```bash
+```
 sudo mkdir -p /var/lib/matrix-conduit/conduit_db
 sudo chown -R conduit:nogroup /var/lib/matrix-conduit/conduit_db
 ```
@@ -151,7 +151,7 @@ This depends on whether you use Apache, Nginx or another web server.

 Create `/etc/apache2/sites-enabled/050-conduit.conf` and copy-and-paste this:

-```apache
+```
 Listen 8448

 <VirtualHost *:443 *:8448>
@@ -162,6 +162,9 @@ AllowEncodedSlashes NoDecode
 ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ nocanon
 ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/

+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/your.server.name/fullchain.pem # EDIT THIS
+SSLCertificateKeyFile /etc/letsencrypt/live/your.server.name/privkey.pem # EDIT THIS
 </VirtualHost>
 ```

@@ -177,7 +180,7 @@ $ sudo systemctl reload apache2
 If you use Nginx and not Apache, add the following server section inside the
 http section of `/etc/nginx/nginx.conf`

-```nginx
+```
 server {
    listen 443 ssl http2;
    listen [::]:443 ssl http2;
@@ -228,15 +231,4 @@ Set it to start automatically when your system boots with:
 $ sudo systemctl enable conduit
 ```

-## How do I know it works?
-
-You can open <https://app.element.io>, enter your homeserver and try to register.
-
-You can also use these commands as a quick health check.
-
-```bash
-$ curl https://your.server.name/_matrix/client/versions
-$ curl https://your.server.name:8448/_matrix/client/versions
-```
-
 If you want to set up an appservice, take a look at the [Appservice Guide](APPSERVICES.md).
@@ -7,29 +7,25 @@
 # Alpine build image to build Conduit's statically compiled binary
 FROM alpine:3.14 as builder

-# Install packages needed for building all crates
-RUN apk add --no-cache \
-        cargo \
-        openssl-dev
-
 # Specifies if the local project is build or if Conduit gets build
 # from the official git repository. Defaults to the git repo.
 ARG LOCAL=false
 # Specifies which revision/commit is build. Defaults to HEAD
 ARG GIT_REF=origin/master

+# Install packages needed for building all crates
+RUN apk add --no-cache \
+        cargo \
+        openssl-dev
+
+
 # Copy project files from current folder
 COPY . .
 # Build it from the copied local files or from the official git repository
 RUN if [[ $LOCAL == "true" ]]; then \
-        mv ./docker/healthcheck.sh . ; \
-        echo "Building from local source..." ; \
        cargo install --path . ; \
    else \
-        echo "Building revision '${GIT_REF}' from online source..." ; \
-        cargo install --git "https://gitlab.com/famedly/conduit.git" --rev ${GIT_REF} ; \
-        echo "Loadings healthcheck script from online source..." ; \
-        wget "https://gitlab.com/famedly/conduit/-/raw/${GIT_REF#origin/}/docker/healthcheck.sh" ; \
+        cargo install --git "https://gitlab.com/famedly/conduit.git" --rev ${GIT_REF}; \
    fi

 ########################## RUNTIME IMAGE ##########################
@@ -68,7 +64,6 @@ EXPOSE 6167
 # /srv/conduit and create data folder for database
 RUN mkdir -p /srv/conduit/.local/share/conduit
 COPY --from=builder /root/.cargo/bin/conduit /srv/conduit/
-COPY --from=builder ./healthcheck.sh /srv/conduit/

 # Add www-data user and group with UID 82, as used by alpine
 # https://git.alpinelinux.org/aports/tree/main/nginx/nginx.pre-install
@@ -87,7 +82,10 @@ RUN apk add --no-cache \
        libgcc

 # Test if Conduit is still alive, uses the same endpoint as Element
-HEALTHCHECK --start-period=5s --interval=60s CMD ./healthcheck.sh
+HEALTHCHECK --start-period=5s \
+    CMD curl --fail -s "http://localhost:$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')/_matrix/client/versions" || \
+        curl -k --fail -s "https://localhost:$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')/_matrix/client/versions" || \
+        exit 1

 # Set user to www-data
 USER www-data
@@ -3,42 +3,90 @@

 #### What is the goal?

-An efficient Matrix homeserver that's easy to set up and just works. You can install
+A fast Matrix homeserver that's easy to set up and just works. You can install
 it on a mini-computer like the Raspberry Pi to host Matrix for your family,
 friends or company.


 #### Can I try it out?

-Yes! You can test our Conduit instance by opening a Matrix client (<https://app.element.io> or Element Android for
-example) and registering on the `conduit.rs` homeserver.
+Yes! Just open a Matrix client (<https://app.element.io> or Element Android for
+example) and register on the `https://conduit.koesters.xyz` homeserver.

-It is hosted on a ODROID HC 2 with 2GB RAM and a SAMSUNG Exynos 5422 CPU, which
-was used in the Samsung Galaxy S5. It joined many big rooms including Matrix
-HQ.
+
+#### What is it built on?
+
+- [Ruma](https://www.ruma.io): Useful structures for endpoint requests and
+  responses that can be (de)serialized
+- [Sled](https://github.com/spacejam/sled): A simple (key, value) database with
+  good performance
+- [Rocket](https://rocket.rs): A flexible web framework


 #### What is the current status?

-As of 2021-09-01, Conduit is Beta, meaning you can join and participate in most
-Matrix rooms, but not all features are supported and you might run into bugs
-from time to time.
+Conduit can already be used chat with other users on Conduit, chat with users
+from other Matrix servers and even to chat with users on other platforms using
+appservices. When chatting with users on the same Conduit server, everything
+should work assuming you use a compatible client.
+
+**You should not join Matrix rooms without asking the admins first.** We do not
+know whether Conduit is safe for general use yet, so you should assume there is
+some chance that it breaks rooms permanently for all participating users. We
+are not aware of such a bug today, but we would like to do more testing.

 There are still a few important features missing:

- E2EE verification over federation
- Outgoing read receipts, typing, presence over federation
+- Database stability (currently you might have to do manual upgrades or even wipe the db for new versions)
+- Edge cases for end-to-end encryption over federation
+- Typing and presence over federation
+- Lots of testing

 Check out the [Conduit 1.0 Release Milestone](https://gitlab.com/famedly/conduit/-/milestones/3).


 #### How can I deploy my own?

-Simple install (this was tested the most): [DEPLOY.md](DEPLOY.md)\
-Debian package: [debian/README.Debian](debian/README.Debian)\
-Docker: [docker/README.md](docker/README.md)
+##### Deploy

-If you want to connect an Appservice to Conduit, take a look at [APPSERVICES.md](APPSERVICES.md).
+Download or compile a Conduit binary, set up the config and call it from somewhere like a systemd script. [Read
+more](DEPLOY.md)
+
+If you want to connect an Appservice to Conduit, take a look at the [Appservice Guide](APPSERVICES.md).
+
+##### Deploy using a Debian package
+
+You need to have the `deb` helper command installed that creates Debian packages from Cargo projects (see [cargo-deb](https://github.com/mmstick/cargo-deb/) for more info):
+
+```shell
+$ cargo install cargo-deb
+```
+
+Then, you can create and install a Debian package at a whim:
+
+```shell
+$ cargo deb
+$ dpkg -i target/debian/matrix-conduit_0.1.0_amd64.deb
+```
+
+This will build, package, install, configure and start Conduit. [Read more](debian/README.Debian).
+
+Note that `cargo deb` supports [cross-compilation](https://github.com/mmstick/cargo-deb/#cross-compilation) too!
+Official Debian packages will follow once Conduit starts to have stable releases.
+
+##### Deploy using Docker
+
+Pull and run the docker image with
+
+``` bash
+docker pull matrixconduit/matrix-conduit:latest
+docker run -d -p 8448:8000 -v ~/conduit.toml:/srv/conduit/conduit.toml -v db:/srv/conduit/.local/share/conduit matrixconduit/matrix-conduit:latest
+```
+
+> <b>Note:</b> You also need to supply a `conduit.toml` config file, you can find an example [here](./conduit-example.toml).
+> Or you can pass in `-e CONDUIT_CONFIG=""` and configure Conduit purely with env vars.
+
+Or build and run it with docker or docker-compose. [Read more](docker/README.md)


 #### How can I contribute?
@@ -50,17 +98,6 @@ If you want to connect an Appservice to Conduit, take a look at [APPSERVICES.md]
 3. Fork the repo and work on the issue. #conduit:nordgedanken.dev is happy to help :)
 4. Submit a MR

-
-#### Thanks to
-
-Thanks to Famedly, Prototype Fund (DLR and German BMBF) and all other individuals for financially supporting this project.
-
-Thanks to the contributors to Conduit and all libraries we use, for example:
-
- Ruma: A clean library for the Matrix Spec in Rust
- Rocket: A flexible web framework
-
-
 #### Donate

 Liberapay: <https://liberapay.com/timokoesters/>\
@@ -22,8 +22,8 @@ port = 6167
 # Max size for uploads
 max_request_size = 20_000_000 # in bytes

-# Enables registration. If set to false, no users can register on this server.
-allow_registration = true
+# Disable registration. No new users will be able to register on this server
+#allow_registration = false

 # Disable encryption, so no new encrypted rooms can be created
 # Note: existing rooms will continue to work
@@ -40,7 +40,6 @@ trusted_servers = ["matrix.org"]
 #workers = 4 # default: cpu core count * 2

 address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy
-#address = "0.0.0.0" # If Conduit is running in a container, make sure the reverse proxy (ie. Traefik) can reach it.

 proxy = "none" # more examples can be found at src/database/proxy.rs:6

@@ -62,8 +62,8 @@ port = ${CONDUIT_PORT}
 # Max size for uploads
 max_request_size = 20_000_000 # in bytes

-# Enables registration. If set to false, no users can register on this server.
-allow_registration = true
+# Disable registration. No new users will be able to register on this server.
+#allow_registration = false

 # Disable encryption, so no new encrypted rooms can be created.
 # Note: Existing rooms will continue to work.
@@ -27,7 +27,6 @@ services:
        environment:
            CONDUIT_SERVER_NAME: localhost:6167  # replace with your own name
            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
-            CONDUIT_ALLOW_REGISTRATION: 'true'
            ### Uncomment and change values as desired
            # CONDUIT_ADDRESS: 0.0.0.0
            # CONDUIT_PORT: 6167
@@ -35,6 +34,7 @@ services:
            # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
            # CONDUIT_LOG: info  # default is: "info,rocket=off,_=off,sled=off"
            # CONDUIT_ALLOW_JAEGER: 'false'
+            # CONDUIT_ALLOW_REGISTRATION : 'false'
            # CONDUIT_ALLOW_ENCRYPTION: 'false'
            # CONDUIT_ALLOW_FEDERATION: 'false'
            # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit
@@ -40,27 +40,18 @@ which also will tag the resulting image as `matrixconduit/matrix-conduit:latest`
 After building the image you can simply run it with

 ``` bash
-docker run -d -p 8448:6167 -v ~/conduit.toml:/srv/conduit/conduit.toml -v db:/srv/conduit/.local/share/conduit matrixconduit/matrix-conduit:latest
+docker run -d -p 8448:8000 -v ~/conduit.toml:/srv/conduit/conduit.toml -v db:/srv/conduit/.local/share/conduit matrixconduit/matrix-conduit:latest
 ```

-or you can skip the build step and pull the image from one of the following registries:
-
-| Registry        | Image                                                                                                               | Size                                                                                        |
-| --------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
-| Docker Hub      | [matrixconduit/matrix-conduit:latest](https://hub.docker.com/r/matrixconduit/matrix-conduit)                        | ![Image Size](https://img.shields.io/docker/image-size/matrixconduit/matrix-conduit/latest) |
-| GitLab Registry | [registry.gitlab.com/famedly/conduit/conduit:latest](https://gitlab.com/famedly/conduit/container_registry/2134341) | ![Image Size](https://img.shields.io/docker/image-size/matrixconduit/matrix-conduit/latest) |
-
-The `-d` flag lets the container run in detached mode. You now need to supply a `conduit.toml` config file, an example can be found [here](../conduit-example.toml).
+For detached mode, you also need to use the `-d` flag. You also need to supply a `conduit.toml` config file, you can find an example [here](../conduit-example.toml).
 You can pass in different env vars to change config values on the fly. You can even configure Conduit completely by using env vars, but for that you need
-to pass `-e CONDUIT_CONFIG=""` into your container. For an overview of possible values, please take a look at the `docker-compose.yml` file.
-
+too pass `-e CONDUIT_CONFIG=""` into your container. For an overview of possible values, please take a look at the `docker-compose.yml` file.
 If you just want to test Conduit for a short time, you can use the `--rm` flag, which will clean up everything related to your container after you stop it.


 ## Docker-compose

-If the docker command is not for you or your setup, you can also use one of the provided `docker-compose` files. Depending on your proxy setup, use the [`docker-compose.traefik.yml`](docker-compose.traefik.yml) and [`docker-compose.override.traefik.yml`](docker-compose.override.traefik.yml) for Traefik (don't forget to remove `.traefik` from the filenames) or the normal [`docker-compose.yml`](../docker-compose.yml) for every other reverse proxy. Additional info about deploying
-Conduit can be found [here](../DEPLOY.md).
+If the docker command is not for you or your setup, you can also use one of the provided `docker-compose` files. Depending on your proxy setup, use the [`docker-compose.traefik.yml`](docker-compose.traefik.yml) including [`docker-compose.override.traefik.yml`](docker-compose.override.traefik.yml) or the normal [`docker-compose.yml`](../docker-compose.yml) for every other reverse proxy.


 ### Build
@@ -76,57 +67,8 @@ This will also start the container right afterwards, so if want it to run in det

 ### Run

-If you already have built the image or want to use one from the registries, you can just start the container and everything else in the compose file in detached mode with:
+If you already have built the image, you can just start the container and everything else in the compose file in detached mode with:

 ``` bash
 docker-compose up -d
 ```
-
-> **Note:** Don't forget to modify and adjust the compose file to your needs.
-
-### Use Traefik as Proxy
-
-As a container user, you probably know about Traefik. It is a easy to use reverse proxy for making containerized app and services available through the web. With the
-two provided files, [`docker-compose.traefik.yml`](docker-compose.traefik.yml) and [`docker-compose.override.traefik.yml`](docker-compose.override.traefik.yml), it is
-equally easy to deploy and use Conduit, with a little caveat. If you already took a look at the files, then you should have seen the `well-known` service, and that is
-the little caveat. Traefik is simply a proxy and loadbalancer and is not able to serve any kind of content, but for Conduit to federate, we need to either expose ports
-`443` and `8448` or serve two endpoints `.well-known/matrix/client` and `.well-known/matrix/server`.
-
-With the service `well-known` we use a single `nginx` container that will serve those two files.
-
-So...step by step:
-
-1. Copy [`docker-compose.traefik.yml`](docker-compose.traefik.yml) and [`docker-compose.override.traefik.yml`](docker-compose.override.traefik.yml) from the repository and remove `.traefik` from the filenames.
-2. Open both files and modify/adjust them to your needs. Meaning, change the `CONDUIT_SERVER_NAME` and the volume host mappings according to your needs.
-3. Create the `conduit.toml` config file, an example can be found [here](../conduit-example.toml), or set `CONDUIT_CONFIG=""` and configure Conduit per env vars.
-4. Uncomment the `element-web` service if you want to host your own Element Web Client and create a `element_config.json`.
-5. Create the files needed by the `well-known` service.
-    - `./nginx/matrix.conf` (relative to the compose file, you can change this, but then also need to change the volume mapping)
-      ```nginx
-      server {
-          server_name <SUBDOMAIN>.<DOMAIN>;
-          listen      80 default_server;
-
-          location /.well-known/matrix/ {
-              root /var/www;
-              default_type application/json;
-              add_header Access-Control-Allow-Origin *;
-          }
-      }
-      ```
-    - `./nginx/www/.well-known/matrix/client` (relative to the compose file, you can change this, but then also need to change the volume mapping)
-      ```json
-      {
-          "m.homeserver": {
-              "base_url": "https://<SUBDOMAIN>.<DOMAIN>"
-          }
-      }
-      ```
-    - `./nginx/www/.well-known/matrix/server` (relative to the compose file, you can change this, but then also need to change the volume mapping)
-      ```json
-      {
-          "m.server": "<SUBDOMAIN>.<DOMAIN>:443"
-      }
-      ```
-6. Run `docker-compose up -d`
-7. Connect to your homeserver with your preferred client and create a user. You should do this immediatly after starting Conduit, because the first created user is the admin.
@@ -9,12 +9,6 @@

 FROM alpine:3.14

-# Install packages needed to run Conduit
-RUN apk add --no-cache \
-        ca-certificates \
-        curl \
-        libgcc
-
 ARG CREATED
 ARG VERSION
 ARG GIT_REF
@@ -42,10 +36,6 @@ EXPOSE 6167
 # create data folder for database
 RUN mkdir -p /srv/conduit/.local/share/conduit

-# Copy the Conduit binary into the image at the latest possible moment to maximise caching:
-COPY ./conduit-x86_64-unknown-linux-musl /srv/conduit/conduit
-COPY ./docker/healthcheck.sh /srv/conduit/
-
 # Add www-data user and group with UID 82, as used by alpine
 # https://git.alpinelinux.org/aports/tree/main/nginx/nginx.pre-install
 RUN set -x ; \
@@ -55,11 +45,18 @@ RUN set -x ; \

 # Change ownership of Conduit files to www-data user and group
 RUN chown -cR www-data:www-data /srv/conduit
-RUN chmod +x /srv/conduit/healthcheck.sh

+# Install packages needed to run Conduit
+RUN apk add --no-cache \
+        ca-certificates \
+        curl \
+        libgcc

 # Test if Conduit is still alive, uses the same endpoint as Element
-HEALTHCHECK --start-period=5s --interval=60s CMD ./healthcheck.sh
+HEALTHCHECK --start-period=5s \
+    CMD curl --fail -s "http://localhost:$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')/_matrix/client/versions" || \
+        curl -k --fail -s "https://localhost:$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')/_matrix/client/versions" || \
+        exit 1

 # Set user to www-data
 USER www-data
@@ -67,3 +64,7 @@ USER www-data
 WORKDIR /srv/conduit
 # Run Conduit
 ENTRYPOINT [ "/srv/conduit/conduit" ]
+
+
+# Copy the Conduit binary into the image at the latest possible moment to maximise caching:
+COPY ./conduit-x86_64-unknown-linux-musl /srv/conduit/conduit
@@ -10,29 +10,6 @@ services:
            - "traefik.http.routers.to-conduit.rule=Host(`<SUBDOMAIN>.<DOMAIN>`)"  # Change to the address on which Conduit is hosted
            - "traefik.http.routers.to-conduit.tls=true"
            - "traefik.http.routers.to-conduit.tls.certresolver=letsencrypt"
-            - "traefik.http.routers.to-conduit.middlewares=cors-headers@docker"
-
-            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowOriginList=*"
-            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowHeaders=Origin, X-Requested-With, Content-Type, Accept, Authorization"
-            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowMethods=GET, POST, PUT, DELETE, OPTIONS"
-
-    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
-    # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
-    # and in the docker-compose file.
-    well-known:
-        labels:
-            - "traefik.enable=true"
-            - "traefik.docker.network=proxy"
-
-            - "traefik.http.routers.to-matrix-wellknown.rule=Host(`<SUBDOMAIN>.<DOMAIN>`) && PathPrefix(`/.well-known/matrix`)"
-            - "traefik.http.routers.to-matrix-wellknown.tls=true"
-            - "traefik.http.routers.to-matrix-wellknown.tls.certresolver=letsencrypt"
-            - "traefik.http.routers.to-matrix-wellknown.middlewares=cors-headers@docker"
-
-            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowOriginList=*"
-            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowHeaders=Origin, X-Requested-With, Content-Type, Accept, Authorization"
-            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowMethods=GET, POST, PUT, DELETE, OPTIONS"
-

    ### Uncomment this if you uncommented Element-Web App in the docker-compose.yml
    # element-web:
@@ -27,7 +27,6 @@ services:
        environment:
            CONDUIT_SERVER_NAME: localhost:6167  # replace with your own name
            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
-            CONDUIT_ALLOW_REGISTRATION : 'true'
            ### Uncomment and change values as desired
            # CONDUIT_ADDRESS: 0.0.0.0
            # CONDUIT_PORT: 6167
@@ -35,22 +34,13 @@ services:
            # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
            # CONDUIT_LOG: info  # default is: "info,rocket=off,_=off,sled=off"
            # CONDUIT_ALLOW_JAEGER: 'false'
+            # CONDUIT_ALLOW_REGISTRATION : 'false'
            # CONDUIT_ALLOW_ENCRYPTION: 'false'
            # CONDUIT_ALLOW_FEDERATION: 'false'
            # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit
            # CONDUIT_WORKERS: 10
            # CONDUIT_MAX_REQUEST_SIZE: 20_000_000  # in bytes, ~20 MB

-    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
-    # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
-    # and in the docker-compose override file.
-    well-known:
-        image: nginx:latest
-        restart: unless-stopped
-        volumes:
-            - ./nginx/matrix.conf:/etc/nginx/conf.d/matrix.conf # the config to serve the .well-known/matrix files
-            - ./nginx/www:/var/www/ # location of the client and server .well-known-files
-
    ### Uncomment if you want to use your own Element-Web App.
    ### Note: You need to provide a config.json for Element and you also need a second
    ###       Domain or Subdomain for the communication between Element and Conduit
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# If the port is not specified as env var, take it from the config file
-if [ -z ${CONDUIT_PORT} ]; then
-  CONDUIT_PORT=$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')
-fi
-
-# The actual health check.
-# We try to first get a response on HTTP and when that fails on HTTPS and when that fails, we exit with code 1.
-# TODO: Change this to a single curl call. Do we have a config value that we can check for that?
-curl --fail -s "http://localhost:${CONDUIT_PORT}/_matrix/client/versions" || \
-    curl -k --fail -s "https://localhost:${CONDUIT_PORT}/_matrix/client/versions" || \
-    exit 1
@@ -1 +1 @@
-1.53
+1.52
@@ -9,7 +9,7 @@ use std::{
 };
 use tracing::warn;

-pub(crate) async fn send_request<T: OutgoingRequest>(
+pub async fn send_request<T: OutgoingRequest>(
    globals: &crate::database::globals::Globals,
    registration: serde_yaml::Value,
    request: T,
@@ -21,7 +21,7 @@ where
    let hs_token = registration.get("hs_token").unwrap().as_str().unwrap();

    let mut http_request = request
-        .try_into_http_request::<BytesMut>(destination, SendAccessToken::IfRequired(""))
+        .try_into_http_request::<BytesMut>(&destination, SendAccessToken::IfRequired(""))
        .unwrap()
        .map(|body| body.freeze());

@@ -15,28 +15,19 @@ use ruma::{
                ThirdPartyIdRemovalStatus,
            },
            contact::get_contacts,
-            uiaa::{AuthFlow, AuthType, UiaaInfo},
+            uiaa::{AuthFlow, UiaaInfo},
        },
    },
    events::{
        room::{
-            canonical_alias::RoomCanonicalAliasEventContent,
-            create::RoomCreateEventContent,
-            guest_access::{GuestAccess, RoomGuestAccessEventContent},
-            history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
-            join_rules::{JoinRule, RoomJoinRulesEventContent},
-            member::{MembershipState, RoomMemberEventContent},
-            message::RoomMessageEventContent,
-            name::RoomNameEventContent,
-            power_levels::RoomPowerLevelsEventContent,
-            topic::RoomTopicEventContent,
+            canonical_alias, guest_access, history_visibility, join_rules, member, message, name,
+            topic,
        },
        EventType,
    },
    identifiers::RoomName,
    push, RoomAliasId, RoomId, RoomVersionId, UserId,
 };
-use serde_json::value::to_raw_value;
 use tracing::info;

 use register::RegistrationKind;
@@ -49,12 +40,8 @@ const GUEST_NAME_LENGTH: usize = 10;
 ///
 /// Checks if a username is valid and available on this server.
 ///
-/// Conditions for returning true:
-/// - The user id is not historical
-/// - The server name of the user id matches this server
-/// - No user or appservice on this server already claimed this username
-///
-/// Note: This will not reserve the username, so the username might become invalid when trying to register
+/// - Returns true if no user or appservice on this server claimed this username
+/// - This will not reserve the username, so the username might become invalid when trying to register
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/register/available", data = "<body>")
@@ -93,15 +80,11 @@ pub async fn get_register_available_route(
 ///
 /// Register an account on this homeserver.
 ///
-/// You can use [`GET /_matrix/client/r0/register/available`](fn.get_register_available_route.html)
-/// to check if the user id is valid and available.
-///
-/// - Only works if registration is enabled
-/// - If type is guest: ignores all parameters except initial_device_display_name
-/// - If sender is not appservice: Requires UIAA (but we only use a dummy stage)
-/// - If type is not guest and no username is given: Always fails after UIAA check
-/// - Creates a new account and populates it with default account data
-/// - If `inhibit_login` is false: Creates a device and returns device id and access_token
+/// - Returns the device id and access_token unless `inhibit_login` is true
+/// - When registering a guest account, all parameters except initial_device_display_name will be
+/// ignored
+/// - Creates a new account and a device for it
+/// - The account will be populated with default account data
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/register", data = "<body>")
@@ -146,7 +129,7 @@ pub async fn register_route(
    ))?;

    // Check if username is creative enough
-    if db.users.exists(&user_id)? {
+    if !missing_username && db.users.exists(&user_id)? {
        return Err(Error::BadRequest(
            ErrorKind::UserInUse,
            "Desired user ID is already taken.",
@@ -156,7 +139,7 @@ pub async fn register_route(
    // UIAA
    let mut uiaainfo = UiaaInfo {
        flows: vec![AuthFlow {
-            stages: vec![AuthType::Dummy],
+            stages: vec!["m.login.dummy".to_owned()],
        }],
        completed: Vec::new(),
        params: Default::default(),
@@ -210,12 +193,12 @@ pub async fn register_route(
    // Create user
    db.users.create(&user_id, password)?;

-    // Default to pretty displayname
    let displayname = format!("{} ⚡️", user_id.localpart());
+
    db.users
        .set_displayname(&user_id, Some(displayname.clone()))?;

-    // Initial account data
+    // Initial data
    db.account_data.update(
        None,
        &user_id,
@@ -228,7 +211,6 @@ pub async fn register_route(
        &db.globals,
    )?;

-    // Inhibit login does not work for guests
    if !is_guest && body.inhibit_login {
        return Ok(register::Response {
            access_token: None,
@@ -249,7 +231,7 @@ pub async fn register_route(
    // Generate new token for the device
    let token = utils::random_string(TOKEN_LENGTH);

-    // Create device for this account
+    // Add device
    db.users.create_device(
        &user_id,
        &device_id,
@@ -257,7 +239,7 @@ pub async fn register_route(
        body.initial_device_display_name.clone(),
    )?;

-    // If this is the first user on this server, create the admin room
+    // If this is the first user on this server, create the admins room
    if db.users.count()? == 1 {
        // Create a user for the server
        let conduit_user = UserId::parse_with_server_name("conduit", db.globals.server_name())
@@ -279,7 +261,7 @@ pub async fn register_route(
        );
        let state_lock = mutex_state.lock().await;

-        let mut content = RoomCreateEventContent::new(conduit_user.clone());
+        let mut content = ruma::events::room::create::CreateEventContent::new(conduit_user.clone());
        content.federate = true;
        content.predecessor = None;
        content.room_version = RoomVersionId::Version6;
@@ -288,7 +270,7 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomCreate,
-                content: to_raw_value(&content).expect("event is valid, we just created it"),
+                content: serde_json::to_value(content).expect("event is valid, we just created it"),
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
@@ -303,8 +285,8 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomMember,
-                content: to_raw_value(&RoomMemberEventContent {
-                    membership: MembershipState::Join,
+                content: serde_json::to_value(member::MemberEventContent {
+                    membership: member::MembershipState::Join,
                    displayname: None,
                    avatar_url: None,
                    is_direct: None,
@@ -331,10 +313,12 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomPowerLevels,
-                content: to_raw_value(&RoomPowerLevelsEventContent {
-                    users,
-                    ..Default::default()
-                })
+                content: serde_json::to_value(
+                    ruma::events::room::power_levels::PowerLevelsEventContent {
+                        users,
+                        ..Default::default()
+                    },
+                )
                .expect("event is valid, we just created it"),
                unsigned: None,
                state_key: Some("".to_owned()),
@@ -350,8 +334,10 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomJoinRules,
-                content: to_raw_value(&RoomJoinRulesEventContent::new(JoinRule::Invite))
-                    .expect("event is valid, we just created it"),
+                content: serde_json::to_value(join_rules::JoinRulesEventContent::new(
+                    join_rules::JoinRule::Invite,
+                ))
+                .expect("event is valid, we just created it"),
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
@@ -366,9 +352,11 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomHistoryVisibility,
-                content: to_raw_value(&RoomHistoryVisibilityEventContent::new(
-                    HistoryVisibility::Shared,
-                ))
+                content: serde_json::to_value(
+                    history_visibility::HistoryVisibilityEventContent::new(
+                        history_visibility::HistoryVisibility::Shared,
+                    ),
+                )
                .expect("event is valid, we just created it"),
                unsigned: None,
                state_key: Some("".to_owned()),
@@ -384,8 +372,10 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomGuestAccess,
-                content: to_raw_value(&RoomGuestAccessEventContent::new(GuestAccess::Forbidden))
-                    .expect("event is valid, we just created it"),
+                content: serde_json::to_value(guest_access::GuestAccessEventContent::new(
+                    guest_access::GuestAccess::Forbidden,
+                ))
+                .expect("event is valid, we just created it"),
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
@@ -403,7 +393,7 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomName,
-                content: to_raw_value(&RoomNameEventContent::new(Some(room_name)))
+                content: serde_json::to_value(name::NameEventContent::new(Some(room_name)))
                    .expect("event is valid, we just created it"),
                unsigned: None,
                state_key: Some("".to_owned()),
@@ -418,7 +408,7 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomTopic,
-                content: to_raw_value(&RoomTopicEventContent {
+                content: serde_json::to_value(topic::TopicEventContent {
                    topic: format!("Manage {}", db.globals.server_name()),
                })
                .expect("event is valid, we just created it"),
@@ -440,7 +430,7 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomCanonicalAlias,
-                content: to_raw_value(&RoomCanonicalAliasEventContent {
+                content: serde_json::to_value(canonical_alias::CanonicalAliasEventContent {
                    alias: Some(alias.clone()),
                    alt_aliases: Vec::new(),
                })
@@ -461,8 +451,8 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomMember,
-                content: to_raw_value(&RoomMemberEventContent {
-                    membership: MembershipState::Invite,
+                content: serde_json::to_value(member::MemberEventContent {
+                    membership: member::MembershipState::Invite,
                    displayname: None,
                    avatar_url: None,
                    is_direct: None,
@@ -483,8 +473,8 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomMember,
-                content: to_raw_value(&RoomMemberEventContent {
-                    membership: MembershipState::Join,
+                content: serde_json::to_value(member::MemberEventContent {
+                    membership: member::MembershipState::Join,
                    displayname: Some(displayname),
                    avatar_url: None,
                    is_direct: None,
@@ -507,9 +497,9 @@ pub async fn register_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomMessage,
-                content: to_raw_value(&RoomMessageEventContent::text_html(
-                        "## Thank you for trying out Conduit!\n\nConduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.\n\nHelpful links:\n> Website: https://conduit.rs\n> Git and Documentation: https://gitlab.com/famedly/conduit\n> Report issues: https://gitlab.com/famedly/conduit/-/issues\n\nHere are some rooms you can join (by typing the command):\n\nConduit room (Ask questions and get notified on updates):\n`/join #conduit:fachschaften.org`\n\nConduit lounge (Off-topic, only Conduit users are allowed to join)\n`/join #conduit-lounge:conduit.rs`".to_owned(),
-                        "<h2>Thank you for trying out Conduit!</h2>\n<p>Conduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.</p>\n<p>Helpful links:</p>\n<blockquote>\n<p>Website: https://conduit.rs<br>Git and Documentation: https://gitlab.com/famedly/conduit<br>Report issues: https://gitlab.com/famedly/conduit/-/issues</p>\n</blockquote>\n<p>Here are some rooms you can join (by typing the command):</p>\n<p>Conduit room (Ask questions and get notified on updates):<br><code>/join #conduit:fachschaften.org</code></p>\n<p>Conduit lounge (Off-topic, only Conduit users are allowed to join)<br><code>/join #conduit-lounge:conduit.rs</code></p>\n".to_owned(),
+                content: serde_json::to_value(message::MessageEventContent::text_html(
+                        "Thanks for trying out Conduit! This software is still in development, so expect many bugs and missing features. If you have federation enabled, you can join the Conduit chat room by typing `/join #conduit:matrix.org`. **Important: Please don't join any other Matrix rooms over federation without permission from the room's admins.** Some actions might trigger bugs in other server implementations, breaking the chat for everyone else.".to_owned(),
+                        "Thanks for trying out Conduit! This software is still in development, so expect many bugs and missing features. If you have federation enabled, you can join the Conduit chat room by typing <code>/join #conduit:matrix.org</code>. <strong>Important: Please don't join any other Matrix rooms over federation without permission from the room's admins.</strong> Some actions might trigger bugs in other server implementations, breaking the chat for everyone else.".to_owned(),
                ))
                .expect("event is valid, we just created it"),
                unsigned: None,
@@ -539,16 +529,9 @@ pub async fn register_route(
 ///
 /// Changes the password of this account.
 ///
-/// - Requires UIAA to verify user password
-/// - Changes the password of the sender user
-/// - The password hash is calculated using argon2 with 32 character salt, the plain password is
-/// not saved
-///
-/// If logout_devices is true it does the following for each device except the sender device:
-/// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
-/// - Forgets to-device events
-/// - Triggers device list updates
+/// - Invalidates all other access tokens if logout_devices is true
+/// - Deletes all other devices and most of their data (to-device events, last seen, etc.) if
+/// logout_devices is true
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/account/password", data = "<body>")
@@ -563,7 +546,7 @@ pub async fn change_password_route(

    let mut uiaainfo = UiaaInfo {
        flows: vec![AuthFlow {
-            stages: vec![AuthType::Password],
+            stages: vec!["m.login.password".to_owned()],
        }],
        completed: Vec::new(),
        params: Default::default(),
@@ -573,7 +556,7 @@ pub async fn change_password_route(

    if let Some(auth) = &body.auth {
        let (worked, uiaainfo) = db.uiaa.try_auth(
-            sender_user,
+            &sender_user,
            sender_device,
            auth,
            &uiaainfo,
@@ -587,24 +570,24 @@ pub async fn change_password_route(
    } else if let Some(json) = body.json_body {
        uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
        db.uiaa
-            .create(sender_user, sender_device, &uiaainfo, &json)?;
+            .create(&sender_user, &sender_device, &uiaainfo, &json)?;
        return Err(Error::Uiaa(uiaainfo));
    } else {
        return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
    }

    db.users
-        .set_password(sender_user, Some(&body.new_password))?;
+        .set_password(&sender_user, Some(&body.new_password))?;

    if body.logout_devices {
        // Logout all devices except the current one
        for id in db
            .users
-            .all_device_ids(sender_user)
+            .all_device_ids(&sender_user)
            .filter_map(|id| id.ok())
            .filter(|id| id != sender_device)
        {
-            db.users.remove_device(sender_user, &id)?;
+            db.users.remove_device(&sender_user, &id)?;
        }
    }

@@ -615,9 +598,9 @@ pub async fn change_password_route(

 /// # `GET _matrix/client/r0/account/whoami`
 ///
-/// Get user_id of the sender user.
+/// Get user_id of this account.
 ///
-/// Note: Also works for Application Services
+/// - Also works for Application Services
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/account/whoami", data = "<body>")
@@ -633,13 +616,11 @@ pub async fn whoami_route(body: Ruma<whoami::Request>) -> ConduitResult<whoami::

 /// # `POST /_matrix/client/r0/account/deactivate`
 ///
-/// Deactivate sender user account.
+/// Deactivate this user's account
 ///
 /// - Leaves all rooms and rejects all invitations
 /// - Invalidates all access tokens
-/// - Deletes all device metadata (device id, device display name, last seen ip, last seen ts)
-/// - Forgets all to-device events
-/// - Triggers device list updates
+/// - Deletes all devices
 /// - Removes ability to log in again
 #[cfg_attr(
    feature = "conduit_bin",
@@ -655,7 +636,7 @@ pub async fn deactivate_route(

    let mut uiaainfo = UiaaInfo {
        flows: vec![AuthFlow {
-            stages: vec![AuthType::Password],
+            stages: vec!["m.login.password".to_owned()],
        }],
        completed: Vec::new(),
        params: Default::default(),
@@ -665,8 +646,8 @@ pub async fn deactivate_route(

    if let Some(auth) = &body.auth {
        let (worked, uiaainfo) = db.uiaa.try_auth(
-            sender_user,
-            sender_device,
+            &sender_user,
+            &sender_device,
            auth,
            &uiaainfo,
            &db.users,
@@ -679,28 +660,27 @@ pub async fn deactivate_route(
    } else if let Some(json) = body.json_body {
        uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
        db.uiaa
-            .create(sender_user, sender_device, &uiaainfo, &json)?;
+            .create(&sender_user, &sender_device, &uiaainfo, &json)?;
        return Err(Error::Uiaa(uiaainfo));
    } else {
        return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
    }

    // Leave all joined rooms and reject all invitations
-    // TODO: work over federation invites
    let all_rooms = db
        .rooms
-        .rooms_joined(sender_user)
+        .rooms_joined(&sender_user)
        .chain(
            db.rooms
-                .rooms_invited(sender_user)
+                .rooms_invited(&sender_user)
                .map(|t| t.map(|(r, _)| r)),
        )
        .collect::<Vec<_>>();

    for room_id in all_rooms {
        let room_id = room_id?;
-        let event = RoomMemberEventContent {
-            membership: MembershipState::Leave,
+        let event = member::MemberEventContent {
+            membership: member::MembershipState::Leave,
            displayname: None,
            avatar_url: None,
            is_direct: None,
@@ -722,12 +702,12 @@ pub async fn deactivate_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomMember,
-                content: to_raw_value(&event).expect("event is valid, we just created it"),
+                content: serde_json::to_value(event).expect("event is valid, we just created it"),
                unsigned: None,
                state_key: Some(sender_user.to_string()),
                redacts: None,
            },
-            sender_user,
+            &sender_user,
            &room_id,
            &db,
            &state_lock,
@@ -735,7 +715,7 @@ pub async fn deactivate_route(
    }

    // Remove devices and mark account as deactivated
-    db.users.deactivate_account(sender_user)?;
+    db.users.deactivate_account(&sender_user)?;

    info!("{} deactivated their account", sender_user);

@@ -750,8 +730,6 @@ pub async fn deactivate_route(
 /// # `GET _matrix/client/r0/account/3pid`
 ///
 /// Get a list of third party identifiers associated with this account.
-///
-/// - Currently always returns empty list
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/account/3pid", data = "<body>")
@@ -15,9 +15,6 @@ use ruma::{
 #[cfg(feature = "conduit_bin")]
 use rocket::{delete, get, put};

-/// # `PUT /_matrix/client/r0/directory/room/{roomAlias}`
-///
-/// Creates a new room alias on this server.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/directory/room/<_>", data = "<body>")
@@ -27,13 +24,6 @@ pub async fn create_alias_route(
    db: DatabaseGuard,
    body: Ruma<create_alias::Request<'_>>,
 ) -> ConduitResult<create_alias::Response> {
-    if body.room_alias.server_name() != db.globals.server_name() {
-        return Err(Error::BadRequest(
-            ErrorKind::InvalidParam,
-            "Alias is from another server.",
-        ));
-    }
-
    if db.rooms.id_from_alias(&body.room_alias)?.is_some() {
        return Err(Error::Conflict("Alias already exists."));
    }
@@ -46,12 +36,6 @@ pub async fn create_alias_route(
    Ok(create_alias::Response::new().into())
 }

-/// # `DELETE /_matrix/client/r0/directory/room/{roomAlias}`
-///
-/// Deletes a room alias from this server.
-///
-/// - TODO: additional access control checks
-/// - TODO: Update canonical alias event
 #[cfg_attr(
    feature = "conduit_bin",
    delete("/_matrix/client/r0/directory/room/<_>", data = "<body>")
@@ -61,27 +45,13 @@ pub async fn delete_alias_route(
    db: DatabaseGuard,
    body: Ruma<delete_alias::Request<'_>>,
 ) -> ConduitResult<delete_alias::Response> {
-    if body.room_alias.server_name() != db.globals.server_name() {
-        return Err(Error::BadRequest(
-            ErrorKind::InvalidParam,
-            "Alias is from another server.",
-        ));
-    }
-
    db.rooms.set_alias(&body.room_alias, None, &db.globals)?;

-    // TODO: update alt_aliases?
-
    db.flush()?;

    Ok(delete_alias::Response::new().into())
 }

-/// # `GET /_matrix/client/r0/directory/room/{roomAlias}`
-///
-/// Resolve an alias locally or over federation.
-///
-/// - TODO: Suggest more servers to join via
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/directory/room/<_>", data = "<body>")
@@ -94,7 +64,7 @@ pub async fn get_alias_route(
    get_alias_helper(&db, &body.room_alias).await
 }

-pub(crate) async fn get_alias_helper(
+pub async fn get_alias_helper(
    db: &Database,
    room_alias: &RoomAliasId,
 ) -> ConduitResult<get_alias::Response> {
@@ -112,7 +82,7 @@ pub(crate) async fn get_alias_helper(
    }

    let mut room_id = None;
-    match db.rooms.id_from_alias(room_alias)? {
+    match db.rooms.id_from_alias(&room_alias)? {
        Some(r) => room_id = Some(r),
        None => {
            for (_id, registration) in db.appservice.all()? {
@@ -140,7 +110,7 @@ pub(crate) async fn get_alias_helper(
                        .await
                        .is_ok()
                {
-                    room_id = Some(db.rooms.id_from_alias(room_alias)?.ok_or_else(|| {
+                    room_id = Some(db.rooms.id_from_alias(&room_alias)?.ok_or_else(|| {
                        Error::bad_config("Appservice lied to us. Room does not exist.")
                    })?);
                    break;
@@ -12,9 +12,6 @@ use ruma::api::client::{
 #[cfg(feature = "conduit_bin")]
 use rocket::{delete, get, post, put};

-/// # `POST /_matrix/client/r0/room_keys/version`
-///
-/// Creates a new backup.
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/unstable/room_keys/version", data = "<body>")
@@ -27,16 +24,13 @@ pub async fn create_backup_route(
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
    let version = db
        .key_backups
-        .create_backup(sender_user, &body.algorithm, &db.globals)?;
+        .create_backup(&sender_user, &body.algorithm, &db.globals)?;

    db.flush()?;

    Ok(create_backup::Response { version }.into())
 }

-/// # `PUT /_matrix/client/r0/room_keys/version/{version}`
-///
-/// Update information about an existing backup. Only `auth_data` can be modified.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
@@ -48,16 +42,13 @@ pub async fn update_backup_route(
 ) -> ConduitResult<update_backup::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
    db.key_backups
-        .update_backup(sender_user, &body.version, &body.algorithm, &db.globals)?;
+        .update_backup(&sender_user, &body.version, &body.algorithm, &db.globals)?;

    db.flush()?;

    Ok(update_backup::Response {}.into())
 }

-/// # `GET /_matrix/client/r0/room_keys/version`
-///
-/// Get information about the latest backup version.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/unstable/room_keys/version", data = "<body>")
@@ -71,7 +62,7 @@ pub async fn get_latest_backup_route(

    let (version, algorithm) =
        db.key_backups
-            .get_latest_backup(sender_user)?
+            .get_latest_backup(&sender_user)?
            .ok_or(Error::BadRequest(
                ErrorKind::NotFound,
                "Key backup does not exist.",
@@ -86,9 +77,6 @@ pub async fn get_latest_backup_route(
    .into())
 }

-/// # `GET /_matrix/client/r0/room_keys/version`
-///
-/// Get information about an existing backup.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
@@ -101,7 +89,7 @@ pub async fn get_backup_route(
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
    let algorithm = db
        .key_backups
-        .get_backup(sender_user, &body.version)?
+        .get_backup(&sender_user, &body.version)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "Key backup does not exist.",
@@ -116,11 +104,6 @@ pub async fn get_backup_route(
    .into())
 }

-/// # `DELETE /_matrix/client/r0/room_keys/version/{version}`
-///
-/// Delete an existing key backup.
-///
-/// - Deletes both information about the backup, as well as all key data related to the backup
 #[cfg_attr(
    feature = "conduit_bin",
    delete("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
@@ -132,20 +115,14 @@ pub async fn delete_backup_route(
 ) -> ConduitResult<delete_backup::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    db.key_backups.delete_backup(sender_user, &body.version)?;
+    db.key_backups.delete_backup(&sender_user, &body.version)?;

    db.flush()?;

    Ok(delete_backup::Response {}.into())
 }

-/// # `PUT /_matrix/client/r0/room_keys/keys`
-///
 /// Add the received backup keys to the database.
-///
-/// - Only manipulating the most recently created version of the backup is allowed
-/// - Adds the keys to the backup
-/// - Returns the new number of keys in this backup and the etag
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/unstable/room_keys/keys", data = "<body>")
@@ -157,26 +134,14 @@ pub async fn add_backup_keys_route(
 ) -> ConduitResult<add_backup_keys::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    if Some(&body.version)
-        != db
-            .key_backups
-            .get_latest_backup_version(sender_user)?
-            .as_ref()
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::InvalidParam,
-            "You may only manipulate the most recently created version of the backup.",
-        ));
-    }
-
    for (room_id, room) in &body.rooms {
        for (session_id, key_data) in &room.sessions {
            db.key_backups.add_key(
-                sender_user,
+                &sender_user,
                &body.version,
-                room_id,
-                session_id,
-                key_data,
+                &room_id,
+                &session_id,
+                &key_data,
                &db.globals,
            )?
        }
@@ -191,13 +156,7 @@ pub async fn add_backup_keys_route(
    .into())
 }

-/// # `PUT /_matrix/client/r0/room_keys/keys/{roomId}`
-///
 /// Add the received backup keys to the database.
-///
-/// - Only manipulating the most recently created version of the backup is allowed
-/// - Adds the keys to the backup
-/// - Returns the new number of keys in this backup and the etag
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
@@ -209,25 +168,13 @@ pub async fn add_backup_key_sessions_route(
 ) -> ConduitResult<add_backup_key_sessions::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    if Some(&body.version)
-        != db
-            .key_backups
-            .get_latest_backup_version(sender_user)?
-            .as_ref()
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::InvalidParam,
-            "You may only manipulate the most recently created version of the backup.",
-        ));
-    }
-
    for (session_id, key_data) in &body.sessions {
        db.key_backups.add_key(
-            sender_user,
+            &sender_user,
            &body.version,
            &body.room_id,
-            session_id,
-            key_data,
+            &session_id,
+            &key_data,
            &db.globals,
        )?
    }
@@ -241,13 +188,7 @@ pub async fn add_backup_key_sessions_route(
    .into())
 }

-/// # `PUT /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
-///
 /// Add the received backup key to the database.
-///
-/// - Only manipulating the most recently created version of the backup is allowed
-/// - Adds the keys to the backup
-/// - Returns the new number of keys in this backup and the etag
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
@@ -259,20 +200,8 @@ pub async fn add_backup_key_session_route(
 ) -> ConduitResult<add_backup_key_session::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    if Some(&body.version)
-        != db
-            .key_backups
-            .get_latest_backup_version(sender_user)?
-            .as_ref()
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::InvalidParam,
-            "You may only manipulate the most recently created version of the backup.",
-        ));
-    }
-
    db.key_backups.add_key(
-        sender_user,
+        &sender_user,
        &body.version,
        &body.room_id,
        &body.session_id,
@@ -289,9 +218,6 @@ pub async fn add_backup_key_session_route(
    .into())
 }

-/// # `GET /_matrix/client/r0/room_keys/keys`
-///
-/// Retrieves all keys from the backup.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/unstable/room_keys/keys", data = "<body>")
@@ -303,14 +229,11 @@ pub async fn get_backup_keys_route(
 ) -> ConduitResult<get_backup_keys::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let rooms = db.key_backups.get_all(sender_user, &body.version)?;
+    let rooms = db.key_backups.get_all(&sender_user, &body.version)?;

    Ok(get_backup_keys::Response { rooms }.into())
 }

-/// # `GET /_matrix/client/r0/room_keys/keys/{roomId}`
-///
-/// Retrieves all keys from the backup for a given room.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
@@ -324,14 +247,11 @@ pub async fn get_backup_key_sessions_route(

    let sessions = db
        .key_backups
-        .get_room(sender_user, &body.version, &body.room_id)?;
+        .get_room(&sender_user, &body.version, &body.room_id)?;

    Ok(get_backup_key_sessions::Response { sessions }.into())
 }

-/// # `GET /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
-///
-/// Retrieves a key from the backup.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
@@ -345,7 +265,7 @@ pub async fn get_backup_key_session_route(

    let key_data = db
        .key_backups
-        .get_session(sender_user, &body.version, &body.room_id, &body.session_id)?
+        .get_session(&sender_user, &body.version, &body.room_id, &body.session_id)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "Backup key not found for this user's session.",
@@ -354,9 +274,6 @@ pub async fn get_backup_key_session_route(
    Ok(get_backup_key_session::Response { key_data }.into())
 }

-/// # `DELETE /_matrix/client/r0/room_keys/keys`
-///
-/// Delete the keys from the backup.
 #[cfg_attr(
    feature = "conduit_bin",
    delete("/_matrix/client/unstable/room_keys/keys", data = "<body>")
@@ -368,7 +285,8 @@ pub async fn delete_backup_keys_route(
 ) -> ConduitResult<delete_backup_keys::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    db.key_backups.delete_all_keys(sender_user, &body.version)?;
+    db.key_backups
+        .delete_all_keys(&sender_user, &body.version)?;

    db.flush()?;

@@ -379,9 +297,6 @@ pub async fn delete_backup_keys_route(
    .into())
 }

-/// # `DELETE /_matrix/client/r0/room_keys/keys/{roomId}`
-///
-/// Delete the keys from the backup for a given room.
 #[cfg_attr(
    feature = "conduit_bin",
    delete("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
@@ -394,7 +309,7 @@ pub async fn delete_backup_key_sessions_route(
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

    db.key_backups
-        .delete_room_keys(sender_user, &body.version, &body.room_id)?;
+        .delete_room_keys(&sender_user, &body.version, &body.room_id)?;

    db.flush()?;

@@ -405,9 +320,6 @@ pub async fn delete_backup_key_sessions_route(
    .into())
 }

-/// # `DELETE /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
-///
-/// Delete a key from the backup.
 #[cfg_attr(
    feature = "conduit_bin",
    delete("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
@@ -420,7 +332,7 @@ pub async fn delete_backup_key_session_route(
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

    db.key_backups
-        .delete_room_key(sender_user, &body.version, &body.room_id, &body.session_id)?;
+        .delete_room_key(&sender_user, &body.version, &body.room_id, &body.session_id)?;

    db.flush()?;

@@ -1,4 +1,5 @@
-use crate::{ConduitResult, Ruma};
+use crate::ConduitResult;
+use crate::Ruma;
 use ruma::{
    api::client::r0::capabilities::{
        get_capabilities, Capabilities, RoomVersionStability, RoomVersionsCapability,
@@ -12,7 +13,7 @@ use rocket::get;

 /// # `GET /_matrix/client/r0/capabilities`
 ///
-/// Get information on the supported feature set and other relevent capabilities of this server.
+/// Get information on this server's supported feature set and other relevent capabilities.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/capabilities", data = "<_body>")
@@ -16,9 +16,6 @@ use serde_json::{json, value::RawValue as RawJsonValue};
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, put};

-/// # `PUT /_matrix/client/r0/user/{userId}/account_data/{type}`
-///
-/// Sets some account data for the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/user/<_>/account_data/<_>", data = "<body>")
@@ -30,7 +27,7 @@ pub async fn set_global_account_data_route(
 ) -> ConduitResult<set_global_account_data::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let data: serde_json::Value = serde_json::from_str(body.data.get())
+    let data = serde_json::from_str::<serde_json::Value>(body.data.get())
        .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;

    let event_type = body.event_type.to_string();
@@ -51,9 +48,6 @@ pub async fn set_global_account_data_route(
    Ok(set_global_account_data::Response {}.into())
 }

-/// # `PUT /_matrix/client/r0/user/{userId}/rooms/{roomId}/account_data/{type}`
-///
-/// Sets some room account data for the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
    put(
@@ -68,7 +62,7 @@ pub async fn set_room_account_data_route(
 ) -> ConduitResult<set_room_account_data::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let data: serde_json::Value = serde_json::from_str(body.data.get())
+    let data = serde_json::from_str::<serde_json::Value>(body.data.get())
        .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;

    let event_type = body.event_type.to_string();
@@ -89,9 +83,6 @@ pub async fn set_room_account_data_route(
    Ok(set_room_account_data::Response {}.into())
 }

-/// # `GET /_matrix/client/r0/user/{userId}/account_data/{type}`
-///
-/// Gets some account data for the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/user/<_>/account_data/<_>", data = "<body>")
@@ -103,10 +94,11 @@ pub async fn get_global_account_data_route(
 ) -> ConduitResult<get_global_account_data::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let event: Box<RawJsonValue> = db
+    let event = db
        .account_data
-        .get(None, sender_user, body.event_type.clone().into())?
+        .get::<Box<RawJsonValue>>(None, sender_user, body.event_type.clone().into())?
        .ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
+    db.flush()?;

    let account_data = serde_json::from_str::<ExtractGlobalEventContent>(event.get())
        .map_err(|_| Error::bad_database("Invalid account data event in db."))?
@@ -115,9 +107,6 @@ pub async fn get_global_account_data_route(
    Ok(get_global_account_data::Response { account_data }.into())
 }

-/// # `GET /_matrix/client/r0/user/{userId}/rooms/{roomId}/account_data/{type}`
-///
-/// Gets some room account data for the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
    get(
@@ -132,14 +121,15 @@ pub async fn get_room_account_data_route(
 ) -> ConduitResult<get_room_account_data::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let event: Box<RawJsonValue> = db
+    let event = db
        .account_data
-        .get(
+        .get::<Box<RawJsonValue>>(
            Some(&body.room_id),
            sender_user,
            body.event_type.clone().into(),
        )?
        .ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
+    db.flush()?;

    let account_data = serde_json::from_str::<ExtractRoomEventContent>(event.get())
        .map_err(|_| Error::bad_database("Invalid account data event in db."))?
@@ -5,12 +5,6 @@ use std::convert::TryFrom;
 #[cfg(feature = "conduit_bin")]
 use rocket::get;

-/// # `GET /_matrix/client/r0/rooms/{roomId}/context`
-///
-/// Allows loading room history around an event.
-///
-/// - Only works if the user is joined (TODO: always allow, but only show events if the user was
-/// joined, depending on history_visibility)
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/rooms/<_>/context/<_>", data = "<body>")
@@ -48,9 +42,9 @@ pub async fn get_context_route(
        ))?
        .to_room_event();

-    let events_before: Vec<_> = db
+    let events_before = db
        .rooms
-        .pdus_until(sender_user, &body.room_id, base_token)?
+        .pdus_until(&sender_user, &body.room_id, base_token)?
        .take(
            u32::try_from(body.limit).map_err(|_| {
                Error::BadRequest(ErrorKind::InvalidParam, "Limit value is invalid.")
@@ -58,21 +52,21 @@ pub async fn get_context_route(
                / 2,
        )
        .filter_map(|r| r.ok()) // Remove buggy events
-        .collect();
+        .collect::<Vec<_>>();

    let start_token = events_before
        .last()
        .and_then(|(pdu_id, _)| db.rooms.pdu_count(pdu_id).ok())
        .map(|count| count.to_string());

-    let events_before: Vec<_> = events_before
+    let events_before = events_before
        .into_iter()
        .map(|(_, pdu)| pdu.to_room_event())
-        .collect();
+        .collect::<Vec<_>>();

-    let events_after: Vec<_> = db
+    let events_after = db
        .rooms
-        .pdus_after(sender_user, &body.room_id, base_token)?
+        .pdus_after(&sender_user, &body.room_id, base_token)?
        .take(
            u32::try_from(body.limit).map_err(|_| {
                Error::BadRequest(ErrorKind::InvalidParam, "Limit value is invalid.")
@@ -80,17 +74,17 @@ pub async fn get_context_route(
                / 2,
        )
        .filter_map(|r| r.ok()) // Remove buggy events
-        .collect();
+        .collect::<Vec<_>>();

    let end_token = events_after
        .last()
        .and_then(|(pdu_id, _)| db.rooms.pdu_count(pdu_id).ok())
        .map(|count| count.to_string());

-    let events_after: Vec<_> = events_after
+    let events_after = events_after
        .into_iter()
        .map(|(_, pdu)| pdu.to_room_event())
-        .collect();
+        .collect::<Vec<_>>();

    let mut resp = get_context::Response::new();
    resp.start = start_token;
@@ -3,7 +3,7 @@ use ruma::api::client::{
    error::ErrorKind,
    r0::{
        device::{self, delete_device, delete_devices, get_device, get_devices, update_device},
-        uiaa::{AuthFlow, AuthType, UiaaInfo},
+        uiaa::{AuthFlow, UiaaInfo},
    },
 };

@@ -11,9 +11,6 @@ use super::SESSION_ID_LENGTH;
 #[cfg(feature = "conduit_bin")]
 use rocket::{delete, get, post, put};

-/// # `GET /_matrix/client/r0/devices`
-///
-/// Get metadata on all devices of the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/devices", data = "<body>")
@@ -25,18 +22,15 @@ pub async fn get_devices_route(
 ) -> ConduitResult<get_devices::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let devices: Vec<device::Device> = db
+    let devices = db
        .users
        .all_devices_metadata(sender_user)
        .filter_map(|r| r.ok()) // Filter out buggy devices
-        .collect();
+        .collect::<Vec<device::Device>>();

    Ok(get_devices::Response { devices }.into())
 }

-/// # `GET /_matrix/client/r0/devices/{deviceId}`
-///
-/// Get metadata on a single device of the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/devices/<_>", data = "<body>")
@@ -50,15 +44,12 @@ pub async fn get_device_route(

    let device = db
        .users
-        .get_device_metadata(sender_user, &body.body.device_id)?
+        .get_device_metadata(&sender_user, &body.body.device_id)?
        .ok_or(Error::BadRequest(ErrorKind::NotFound, "Device not found."))?;

    Ok(get_device::Response { device }.into())
 }

-/// # `PUT /_matrix/client/r0/devices/{deviceId}`
-///
-/// Updates the metadata on a given device of the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/devices/<_>", data = "<body>")
@@ -72,28 +63,19 @@ pub async fn update_device_route(

    let mut device = db
        .users
-        .get_device_metadata(sender_user, &body.device_id)?
+        .get_device_metadata(&sender_user, &body.device_id)?
        .ok_or(Error::BadRequest(ErrorKind::NotFound, "Device not found."))?;

    device.display_name = body.display_name.clone();

    db.users
-        .update_device_metadata(sender_user, &body.device_id, &device)?;
+        .update_device_metadata(&sender_user, &body.device_id, &device)?;

    db.flush()?;

    Ok(update_device::Response {}.into())
 }

-/// # `PUT /_matrix/client/r0/devices/{deviceId}`
-///
-/// Deletes the given device.
-///
-/// - Requires UIAA to verify user password
-/// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
-/// - Forgets to-device events
-/// - Triggers device list updates
 #[cfg_attr(
    feature = "conduit_bin",
    delete("/_matrix/client/r0/devices/<_>", data = "<body>")
@@ -109,7 +91,7 @@ pub async fn delete_device_route(
    // UIAA
    let mut uiaainfo = UiaaInfo {
        flows: vec![AuthFlow {
-            stages: vec![AuthType::Password],
+            stages: vec!["m.login.password".to_owned()],
        }],
        completed: Vec::new(),
        params: Default::default(),
@@ -119,8 +101,8 @@ pub async fn delete_device_route(

    if let Some(auth) = &body.auth {
        let (worked, uiaainfo) = db.uiaa.try_auth(
-            sender_user,
-            sender_device,
+            &sender_user,
+            &sender_device,
            auth,
            &uiaainfo,
            &db.users,
@@ -133,30 +115,19 @@ pub async fn delete_device_route(
    } else if let Some(json) = body.json_body {
        uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
        db.uiaa
-            .create(sender_user, sender_device, &uiaainfo, &json)?;
+            .create(&sender_user, &sender_device, &uiaainfo, &json)?;
        return Err(Error::Uiaa(uiaainfo));
    } else {
        return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
    }

-    db.users.remove_device(sender_user, &body.device_id)?;
+    db.users.remove_device(&sender_user, &body.device_id)?;

    db.flush()?;

    Ok(delete_device::Response {}.into())
 }

-/// # `PUT /_matrix/client/r0/devices/{deviceId}`
-///
-/// Deletes the given device.
-///
-/// - Requires UIAA to verify user password
-///
-/// For each device:
-/// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
-/// - Forgets to-device events
-/// - Triggers device list updates
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/delete_devices", data = "<body>")
@@ -172,7 +143,7 @@ pub async fn delete_devices_route(
    // UIAA
    let mut uiaainfo = UiaaInfo {
        flows: vec![AuthFlow {
-            stages: vec![AuthType::Password],
+            stages: vec!["m.login.password".to_owned()],
        }],
        completed: Vec::new(),
        params: Default::default(),
@@ -182,8 +153,8 @@ pub async fn delete_devices_route(

    if let Some(auth) = &body.auth {
        let (worked, uiaainfo) = db.uiaa.try_auth(
-            sender_user,
-            sender_device,
+            &sender_user,
+            &sender_device,
            auth,
            &uiaainfo,
            &db.users,
@@ -196,14 +167,14 @@ pub async fn delete_devices_route(
    } else if let Some(json) = body.json_body {
        uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
        db.uiaa
-            .create(sender_user, sender_device, &uiaainfo, &json)?;
+            .create(&sender_user, &sender_device, &uiaainfo, &json)?;
        return Err(Error::Uiaa(uiaainfo));
    } else {
        return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
    }

    for device_id in &body.devices {
-        db.users.remove_device(sender_user, device_id)?
+        db.users.remove_device(&sender_user, &device_id)?
    }

    db.flush()?;
@@ -17,16 +17,10 @@ use ruma::{
    },
    directory::{Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork},
    events::{
-        room::{
-            avatar::RoomAvatarEventContent,
-            canonical_alias::RoomCanonicalAliasEventContent,
-            guest_access::{GuestAccess, RoomGuestAccessEventContent},
-            history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
-            name::RoomNameEventContent,
-            topic::RoomTopicEventContent,
-        },
+        room::{avatar, canonical_alias, guest_access, history_visibility, name, topic},
        EventType,
    },
+    serde::Raw,
    ServerName, UInt,
 };
 use tracing::{info, warn};
@@ -34,11 +28,6 @@ use tracing::{info, warn};
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, post, put};

-/// # `POST /_matrix/client/r0/publicRooms`
-///
-/// Lists the public rooms on this server.
-///
-/// - Rooms are ordered by the number of joined members
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/publicRooms", data = "<body>")
@@ -59,11 +48,6 @@ pub async fn get_public_rooms_filtered_route(
    .await
 }

-/// # `GET /_matrix/client/r0/publicRooms`
-///
-/// Lists the public rooms on this server.
-///
-/// - Rooms are ordered by the number of joined members
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/publicRooms", data = "<body>")
@@ -93,11 +77,6 @@ pub async fn get_public_rooms_route(
    .into())
 }

-/// # `PUT /_matrix/client/r0/directory/list/room/{roomId}`
-///
-/// Sets the visibility of a given room in the room directory.
-///
-/// - TODO: Access control checks
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/directory/list/room/<_>", data = "<body>")
@@ -128,9 +107,6 @@ pub async fn set_room_visibility_route(
    Ok(set_room_visibility::Response {}.into())
 }

-/// # `GET /_matrix/client/r0/directory/list/room/{roomId}`
-///
-/// Gets the visibility of a given room in the room directory.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/directory/list/room/<_>", data = "<body>")
@@ -150,7 +126,7 @@ pub async fn get_room_visibility_route(
    .into())
 }

-pub(crate) async fn get_public_rooms_filtered_helper(
+pub async fn get_public_rooms_filtered_helper(
    db: &Database,
    server: Option<&ServerName>,
    limit: Option<UInt>,
@@ -223,139 +199,168 @@ pub(crate) async fn get_public_rooms_filtered_helper(
        }
    }

-    let mut all_rooms: Vec<_> = db
-        .rooms
-        .public_rooms()
-        .map(|room_id| {
-            let room_id = room_id?;
+    let mut all_rooms =
+        db.rooms
+            .public_rooms()
+            .map(|room_id| {
+                let room_id = room_id?;

-            let chunk = PublicRoomsChunk {
-                aliases: Vec::new(),
-                canonical_alias: db
-                    .rooms
-                    .room_state_get(&room_id, &EventType::RoomCanonicalAlias, "")?
-                    .map_or(Ok(None), |s| {
-                        serde_json::from_str(s.content.get())
-                            .map(|c: RoomCanonicalAliasEventContent| c.alias)
+                let chunk = PublicRoomsChunk {
+                    aliases: Vec::new(),
+                    canonical_alias: db
+                        .rooms
+                        .room_state_get(&room_id, &EventType::RoomCanonicalAlias, "")?
+                        .map_or(Ok::<_, Error>(None), |s| {
+                            Ok(serde_json::from_value::<
+                                Raw<canonical_alias::CanonicalAliasEventContent>,
+                            >(s.content.clone())
+                            .expect("from_value::<Raw<..>> can never fail")
+                            .deserialize()
                            .map_err(|_| {
                                Error::bad_database("Invalid canonical alias event in database.")
-                            })
-                    })?,
-                name: db
-                    .rooms
-                    .room_state_get(&room_id, &EventType::RoomName, "")?
-                    .map_or(Ok(None), |s| {
-                        serde_json::from_str(s.content.get())
-                            .map(|c: RoomNameEventContent| c.name)
+                            })?
+                            .alias)
+                        })?,
+                    name: db
+                        .rooms
+                        .room_state_get(&room_id, &EventType::RoomName, "")?
+                        .map_or(Ok::<_, Error>(None), |s| {
+                            Ok(serde_json::from_value::<Raw<name::NameEventContent>>(
+                                s.content.clone(),
+                            )
+                            .expect("from_value::<Raw<..>> can never fail")
+                            .deserialize()
                            .map_err(|_| {
                                Error::bad_database("Invalid room name event in database.")
-                            })
-                    })?,
-                num_joined_members: db
-                    .rooms
-                    .room_joined_count(&room_id)?
-                    .unwrap_or_else(|| {
-                        warn!("Room {} has no member count", room_id);
-                        0
-                    })
-                    .try_into()
-                    .expect("user count should not be that big"),
-                topic: db
-                    .rooms
-                    .room_state_get(&room_id, &EventType::RoomTopic, "")?
-                    .map_or(Ok(None), |s| {
-                        serde_json::from_str(s.content.get())
-                            .map(|c: RoomTopicEventContent| Some(c.topic))
-                            .map_err(|_| {
-                                Error::bad_database("Invalid room topic event in database.")
-                            })
-                    })?,
-                world_readable: db
-                    .rooms
-                    .room_state_get(&room_id, &EventType::RoomHistoryVisibility, "")?
-                    .map_or(Ok(false), |s| {
-                        serde_json::from_str(s.content.get())
-                            .map(|c: RoomHistoryVisibilityEventContent| {
-                                c.history_visibility == HistoryVisibility::WorldReadable
-                            })
+                            })?
+                            .name
+                            .map(|n| n.to_owned().into()))
+                        })?,
+                    num_joined_members: db
+                        .rooms
+                        .room_joined_count(&room_id)?
+                        .unwrap_or_else(|| {
+                            warn!("Room {} has no member count", room_id);
+                            0
+                        })
+                        .try_into()
+                        .expect("user count should not be that big"),
+                    topic: db
+                        .rooms
+                        .room_state_get(&room_id, &EventType::RoomTopic, "")?
+                        .map_or(Ok::<_, Error>(None), |s| {
+                            Ok(Some(
+                                serde_json::from_value::<Raw<topic::TopicEventContent>>(
+                                    s.content.clone(),
+                                )
+                                .expect("from_value::<Raw<..>> can never fail")
+                                .deserialize()
+                                .map_err(|_| {
+                                    Error::bad_database("Invalid room topic event in database.")
+                                })?
+                                .topic,
+                            ))
+                        })?,
+                    world_readable: db
+                        .rooms
+                        .room_state_get(&room_id, &EventType::RoomHistoryVisibility, "")?
+                        .map_or(Ok::<_, Error>(false), |s| {
+                            Ok(serde_json::from_value::<
+                                Raw<history_visibility::HistoryVisibilityEventContent>,
+                            >(s.content.clone())
+                            .expect("from_value::<Raw<..>> can never fail")
+                            .deserialize()
                            .map_err(|_| {
                                Error::bad_database(
                                    "Invalid room history visibility event in database.",
                                )
-                            })
-                    })?,
-                guest_can_join: db
-                    .rooms
-                    .room_state_get(&room_id, &EventType::RoomGuestAccess, "")?
-                    .map_or(Ok(false), |s| {
-                        serde_json::from_str(s.content.get())
-                            .map(|c: RoomGuestAccessEventContent| {
-                                c.guest_access == GuestAccess::CanJoin
-                            })
+                            })?
+                            .history_visibility
+                                == history_visibility::HistoryVisibility::WorldReadable)
+                        })?,
+                    guest_can_join: db
+                        .rooms
+                        .room_state_get(&room_id, &EventType::RoomGuestAccess, "")?
+                        .map_or(Ok::<_, Error>(false), |s| {
+                            Ok(
+                            serde_json::from_value::<Raw<guest_access::GuestAccessEventContent>>(
+                                s.content.clone(),
+                            )
+                            .expect("from_value::<Raw<..>> can never fail")
+                            .deserialize()
                            .map_err(|_| {
                                Error::bad_database("Invalid room guest access event in database.")
-                            })
-                    })?,
-                avatar_url: db
-                    .rooms
-                    .room_state_get(&room_id, &EventType::RoomAvatar, "")?
-                    .map(|s| {
-                        serde_json::from_str(s.content.get())
-                            .map(|c: RoomAvatarEventContent| c.url)
-                            .map_err(|_| {
-                                Error::bad_database("Invalid room avatar event in database.")
-                            })
-                    })
-                    .transpose()?
-                    // url is now an Option<String> so we must flatten
-                    .flatten(),
-                room_id,
-            };
-            Ok(chunk)
-        })
-        .filter_map(|r: Result<_>| r.ok()) // Filter out buggy rooms
-        .filter(|chunk| {
-            if let Some(query) = filter
-                .generic_search_term
-                .as_ref()
-                .map(|q| q.to_lowercase())
-            {
-                if let Some(name) = &chunk.name {
-                    if name.as_str().to_lowercase().contains(&query) {
-                        return true;
+                            })?
+                            .guest_access
+                                == guest_access::GuestAccess::CanJoin,
+                        )
+                        })?,
+                    avatar_url: db
+                        .rooms
+                        .room_state_get(&room_id, &EventType::RoomAvatar, "")?
+                        .map(|s| {
+                            Ok::<_, Error>(
+                                serde_json::from_value::<Raw<avatar::AvatarEventContent>>(
+                                    s.content.clone(),
+                                )
+                                .expect("from_value::<Raw<..>> can never fail")
+                                .deserialize()
+                                .map_err(|_| {
+                                    Error::bad_database("Invalid room avatar event in database.")
+                                })?
+                                .url,
+                            )
+                        })
+                        .transpose()?
+                        // url is now an Option<String> so we must flatten
+                        .flatten(),
+                    room_id,
+                };
+                Ok(chunk)
+            })
+            .filter_map(|r: Result<_>| r.ok()) // Filter out buggy rooms
+            .filter(|chunk| {
+                if let Some(query) = filter
+                    .generic_search_term
+                    .as_ref()
+                    .map(|q| q.to_lowercase())
+                {
+                    if let Some(name) = &chunk.name {
+                        if name.as_str().to_lowercase().contains(&query) {
+                            return true;
+                        }
                    }
-                }

-                if let Some(topic) = &chunk.topic {
-                    if topic.to_lowercase().contains(&query) {
-                        return true;
+                    if let Some(topic) = &chunk.topic {
+                        if topic.to_lowercase().contains(&query) {
+                            return true;
+                        }
                    }
-                }

-                if let Some(canonical_alias) = &chunk.canonical_alias {
-                    if canonical_alias.as_str().to_lowercase().contains(&query) {
-                        return true;
+                    if let Some(canonical_alias) = &chunk.canonical_alias {
+                        if canonical_alias.as_str().to_lowercase().contains(&query) {
+                            return true;
+                        }
                    }
-                }

-                false
-            } else {
-                // No search term
-                true
-            }
-        })
-        // We need to collect all, so we can sort by member count
-        .collect();
+                    false
+                } else {
+                    // No search term
+                    true
+                }
+            })
+            // We need to collect all, so we can sort by member count
+            .collect::<Vec<_>>();

    all_rooms.sort_by(|l, r| r.num_joined_members.cmp(&l.num_joined_members));

    let total_room_count_estimate = (all_rooms.len() as u32).into();

-    let chunk: Vec<_> = all_rooms
+    let chunk = all_rooms
        .into_iter()
        .skip(num_since as usize)
        .take(limit as usize)
-        .collect();
+        .collect::<Vec<_>>();

    let prev_batch = if num_since == 0 {
        None
@@ -4,9 +4,6 @@ use ruma::api::client::r0::filter::{self, create_filter, get_filter};
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, post};

-/// # `GET /_matrix/client/r0/user/{userId}/filter/{filterId}`
-///
-/// TODO: Loads a filter that was previously created.
 #[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/user/<_>/filter/<_>"))]
 #[tracing::instrument]
 pub async fn get_filter_route() -> ConduitResult<get_filter::Response> {
@@ -21,9 +18,6 @@ pub async fn get_filter_route() -> ConduitResult<get_filter::Response> {
    .into())
 }

-/// # `PUT /_matrix/client/r0/user/{userId}/filter`
-///
-/// TODO: Creates a new filter to be used by other endpoints.
 #[cfg_attr(feature = "conduit_bin", post("/_matrix/client/r0/user/<_>/filter"))]
 #[tracing::instrument]
 pub async fn create_filter_route() -> ConduitResult<create_filter::Response> {
@@ -10,7 +10,7 @@ use ruma::{
                    claim_keys, get_key_changes, get_keys, upload_keys, upload_signatures,
                    upload_signing_keys,
                },
-                uiaa::{AuthFlow, AuthType, UiaaInfo},
+                uiaa::{AuthFlow, UiaaInfo},
            },
        },
        federation,
@@ -24,12 +24,6 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, post};

-/// # `POST /_matrix/client/r0/keys/upload`
-///
-/// Publish end-to-end encryption keys for the sender device.
-///
-/// - Adds one time keys
-/// - If there are no device keys yet: Adds device keys (TODO: merge with existing keys?)
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/keys/upload", data = "<body>")
@@ -55,7 +49,6 @@ pub async fn upload_keys_route(
    }

    if let Some(device_keys) = &body.device_keys {
-        // TODO: merge this and the existing event?
        // This check is needed to assure that signatures are kept
        if db
            .users
@@ -80,13 +73,6 @@ pub async fn upload_keys_route(
    .into())
 }

-/// # `POST /_matrix/client/r0/keys/query`
-///
-/// Get end-to-end encryption keys for the given users.
-///
-/// - Always fetches users from other servers over federation
-/// - Gets master keys, self-signing keys, user signing keys and device keys.
-/// - The master and self-signing keys contain signatures that the user is allowed to see
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/keys/query", data = "<body>")
@@ -109,9 +95,6 @@ pub async fn get_keys_route(
    Ok(response.into())
 }

-/// # `POST /_matrix/client/r0/keys/claim`
-///
-/// Claims one-time keys
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/keys/claim", data = "<body>")
@@ -128,14 +111,9 @@ pub async fn claim_keys_route(
    Ok(response.into())
 }

-/// # `POST /_matrix/client/r0/keys/device_signing/upload`
-///
-/// Uploads end-to-end key information for the sender user.
-///
-/// - Requires UIAA to verify password
 #[cfg_attr(
    feature = "conduit_bin",
-    post("/_matrix/client/unstable/keys/device_signing/upload", data = "<body>")
+    post("/_matrix/client/r0/keys/device_signing/upload", data = "<body>")
 )]
 #[tracing::instrument(skip(db, body))]
 pub async fn upload_signing_keys_route(
@@ -148,7 +126,7 @@ pub async fn upload_signing_keys_route(
    // UIAA
    let mut uiaainfo = UiaaInfo {
        flows: vec![AuthFlow {
-            stages: vec![AuthType::Password],
+            stages: vec!["m.login.password".to_owned()],
        }],
        completed: Vec::new(),
        params: Default::default(),
@@ -158,8 +136,8 @@ pub async fn upload_signing_keys_route(

    if let Some(auth) = &body.auth {
        let (worked, uiaainfo) = db.uiaa.try_auth(
-            sender_user,
-            sender_device,
+            &sender_user,
+            &sender_device,
            auth,
            &uiaainfo,
            &db.users,
@@ -172,7 +150,7 @@ pub async fn upload_signing_keys_route(
    } else if let Some(json) = body.json_body {
        uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
        db.uiaa
-            .create(sender_user, sender_device, &uiaainfo, &json)?;
+            .create(&sender_user, &sender_device, &uiaainfo, &json)?;
        return Err(Error::Uiaa(uiaainfo));
    } else {
        return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
@@ -181,7 +159,7 @@ pub async fn upload_signing_keys_route(
    if let Some(master_key) = &body.master_key {
        db.users.add_cross_signing_keys(
            sender_user,
-            master_key,
+            &master_key,
            &body.self_signing_key,
            &body.user_signing_key,
            &db.rooms,
@@ -194,12 +172,9 @@ pub async fn upload_signing_keys_route(
    Ok(upload_signing_keys::Response {}.into())
 }

-/// # `POST /_matrix/client/r0/keys/signatures/upload`
-///
-/// Uploads end-to-end key signatures from the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
-    post("/_matrix/client/unstable/keys/signatures/upload", data = "<body>")
+    post("/_matrix/client/r0/keys/signatures/upload", data = "<body>")
 )]
 #[tracing::instrument(skip(db, body))]
 pub async fn upload_signatures_route(
@@ -242,10 +217,10 @@ pub async fn upload_signatures_route(
                        .to_owned(),
                );
                db.users.sign_key(
-                    user_id,
-                    key_id,
+                    &user_id,
+                    &key_id,
                    signature,
-                    sender_user,
+                    &sender_user,
                    &db.rooms,
                    &db.globals,
                )?;
@@ -258,11 +233,6 @@ pub async fn upload_signatures_route(
    Ok(upload_signatures::Response {}.into())
 }

-/// # `POST /_matrix/client/r0/keys/changes`
-///
-/// Gets a list of users who have updated their device identity keys since the previous sync token.
-///
-/// - TODO: left users
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/keys/changes", data = "<body>")
@@ -314,7 +284,7 @@ pub async fn get_key_changes_route(
    .into())
 }

-pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
+pub async fn get_keys_helper<F: Fn(&UserId) -> bool>(
    sender_user: Option<&UserId>,
    device_keys_input: &BTreeMap<UserId, Vec<Box<DeviceId>>>,
    allowed_signatures: F,
@@ -359,8 +329,8 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
        } else {
            for device_id in device_ids {
                let mut container = BTreeMap::new();
-                if let Some(mut keys) = db.users.get_device_keys(&user_id.clone(), device_id)? {
-                    let metadata = db.users.get_device_metadata(user_id, device_id)?.ok_or(
+                if let Some(mut keys) = db.users.get_device_keys(&user_id.clone(), &device_id)? {
+                    let metadata = db.users.get_device_metadata(user_id, &device_id)?.ok_or(
                        Error::BadRequest(
                            ErrorKind::InvalidParam,
                            "Tried to get keys for nonexistent device.",
@@ -395,7 +365,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(

    let mut failures = BTreeMap::new();

-    let mut futures: FuturesUnordered<_> = get_over_federation
+    let mut futures = get_over_federation
        .into_iter()
        .map(|(server, vec)| async move {
            let mut device_keys_input_fed = BTreeMap::new();
@@ -415,7 +385,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
                    .await,
            )
        })
-        .collect();
+        .collect::<FuturesUnordered<_>>();

    while let Some((server, response)) = futures.next().await {
        match response {
@@ -439,7 +409,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
    })
 }

-pub(crate) async fn claim_keys_helper(
+pub async fn claim_keys_helper(
    one_time_keys_input: &BTreeMap<UserId, BTreeMap<Box<DeviceId>, DeviceKeyAlgorithm>>,
    db: &Database,
 ) -> Result<claim_keys::Response> {
@@ -1,6 +1,5 @@
 use crate::{
-    database::{media::FileMeta, DatabaseGuard},
-    utils, ConduitResult, Error, Ruma,
+    database::media::FileMeta, database::DatabaseGuard, utils, ConduitResult, Error, Ruma,
 };
 use ruma::api::client::{
    error::ErrorKind,
@@ -13,9 +12,6 @@ use rocket::{get, post};

 const MXC_LENGTH: usize = 32;

-/// # `GET /_matrix/media/r0/config`
-///
-/// Returns max upload size.
 #[cfg_attr(feature = "conduit_bin", get("/_matrix/media/r0/config"))]
 #[tracing::instrument(skip(db))]
 pub async fn get_media_config_route(
@@ -27,12 +23,6 @@ pub async fn get_media_config_route(
    .into())
 }

-/// # `POST /_matrix/media/r0/upload`
-///
-/// Permanently save media in the server.
-///
-/// - Some metadata will be saved in the database
-/// - Media will be saved in the media/ directory
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/media/r0/upload", data = "<body>")
@@ -71,11 +61,6 @@ pub async fn create_content_route(
    .into())
 }

-/// # `POST /_matrix/media/r0/download/{serverName}/{mediaId}`
-///
-/// Load media from our server or over federation.
-///
-/// - Only allows federation if `allow_remote` is true
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/media/r0/download/<_>/<_>", data = "<body>")
@@ -129,11 +114,6 @@ pub async fn get_content_route(
    }
 }

-/// # `POST /_matrix/media/r0/thumbnail/{serverName}/{mediaId}`
-///
-/// Load media thumbnail from our server or over federation.
-///
-/// - Only allows federation if `allow_remote` is true
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/media/r0/thumbnail/<_>/<_>", data = "<body>")
@@ -1,9 +1,11 @@
 use crate::{
    client_server,
    database::DatabaseGuard,
-    pdu::{EventHash, PduBuilder, PduEvent},
+    pdu::{PduBuilder, PduEvent},
    server_server, utils, ConduitResult, Database, Error, Result, Ruma,
 };
+use member::{MemberEventContent, MembershipState};
+use rocket::futures;
 use ruma::{
    api::{
        client::{
@@ -17,17 +19,14 @@ use ruma::{
        federation::{self, membership::create_invite},
    },
    events::{
-        room::{
-            create::RoomCreateEventContent,
-            member::{MembershipState, RoomMemberEventContent},
-        },
+        pdu::Pdu,
+        room::{create::CreateEventContent, member},
        EventType,
    },
-    serde::{to_canonical_value, CanonicalJsonObject, CanonicalJsonValue},
+    serde::{to_canonical_value, CanonicalJsonObject, CanonicalJsonValue, Raw},
    state_res::{self, RoomVersion},
    uint, EventId, RoomId, RoomVersionId, ServerName, UserId,
 };
-use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
 use std::{
    collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
    convert::{TryFrom, TryInto},
@@ -39,12 +38,6 @@ use tracing::{debug, error, warn};
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, post};

-/// # `POST /_matrix/client/r0/rooms/{roomId}/join`
-///
-/// Tries to join the sender user into a room.
-///
-/// - If the server knowns about this room: creates the join event and does auth rules locally
-/// - If the server does not know about the room: asks other servers over federation
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/rooms/<_>/join", data = "<body>")
@@ -56,17 +49,19 @@ pub async fn join_room_by_id_route(
 ) -> ConduitResult<join_room_by_id::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let mut servers: HashSet<_> = db
+    let mut servers = db
        .rooms
-        .invite_state(sender_user, &body.room_id)?
+        .invite_state(&sender_user, &body.room_id)?
        .unwrap_or_default()
        .iter()
-        .filter_map(|event| serde_json::from_str(event.json().get()).ok())
-        .filter_map(|event: serde_json::Value| event.get("sender").cloned())
+        .filter_map(|event| {
+            serde_json::from_str::<serde_json::Value>(&event.json().to_string()).ok()
+        })
+        .filter_map(|event| event.get("sender").cloned())
        .filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
        .filter_map(|sender| UserId::try_from(sender).ok())
        .map(|user| user.server_name().to_owned())
-        .collect();
+        .collect::<HashSet<_>>();

    servers.insert(body.room_id.server_name().to_owned());

@@ -84,12 +79,6 @@ pub async fn join_room_by_id_route(
    ret
 }

-/// # `POST /_matrix/client/r0/join/{roomIdOrAlias}`
-///
-/// Tries to join the sender user into a room.
-///
-/// - If the server knowns about this room: creates the join event and does auth rules locally
-/// - If the server does not know about the room: asks other servers over federation
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/join/<_>", data = "<body>")
@@ -103,17 +92,19 @@ pub async fn join_room_by_id_or_alias_route(

    let (servers, room_id) = match RoomId::try_from(body.room_id_or_alias.clone()) {
        Ok(room_id) => {
-            let mut servers: HashSet<_> = db
+            let mut servers = db
                .rooms
-                .invite_state(sender_user, &room_id)?
+                .invite_state(&sender_user, &room_id)?
                .unwrap_or_default()
                .iter()
-                .filter_map(|event| serde_json::from_str(event.json().get()).ok())
-                .filter_map(|event: serde_json::Value| event.get("sender").cloned())
+                .filter_map(|event| {
+                    serde_json::from_str::<serde_json::Value>(&event.json().to_string()).ok()
+                })
+                .filter_map(|event| event.get("sender").cloned())
                .filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
                .filter_map(|sender| UserId::try_from(sender).ok())
                .map(|user| user.server_name().to_owned())
-                .collect();
+                .collect::<HashSet<_>>();

            servers.insert(room_id.server_name().to_owned());
            (servers, room_id)
@@ -142,11 +133,6 @@ pub async fn join_room_by_id_or_alias_route(
    .into())
 }

-/// # `POST /_matrix/client/r0/rooms/{roomId}/leave`
-///
-/// Tries to leave the sender user from a room.
-///
-/// - This should always work if the user is currently joined.
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/rooms/<_>/leave", data = "<body>")
@@ -165,9 +151,6 @@ pub async fn leave_room_route(
    Ok(leave_room::Response::new().into())
 }

-/// # `POST /_matrix/client/r0/rooms/{roomId}/invite`
-///
-/// Tries to send an invite event into the room.
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/rooms/<_>/invite", data = "<body>")
@@ -188,9 +171,6 @@ pub async fn invite_user_route(
    }
 }

-/// # `POST /_matrix/client/r0/rooms/{roomId}/kick`
-///
-/// Tries to send a kick event into the room.
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/rooms/<_>/kick", data = "<body>")
@@ -202,7 +182,7 @@ pub async fn kick_user_route(
 ) -> ConduitResult<kick_user::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let mut event: RoomMemberEventContent = serde_json::from_str(
+    let mut event = serde_json::from_value::<Raw<ruma::events::room::member::MemberEventContent>>(
        db.rooms
            .room_state_get(
                &body.room_id,
@@ -214,11 +194,13 @@ pub async fn kick_user_route(
                "Cannot kick member that's not in the room.",
            ))?
            .content
-            .get(),
+            .clone(),
    )
+    .expect("Raw::from_value always works")
+    .deserialize()
    .map_err(|_| Error::bad_database("Invalid member event in database."))?;

-    event.membership = MembershipState::Leave;
+    event.membership = ruma::events::room::member::MembershipState::Leave;
    // TODO: reason

    let mutex_state = Arc::clone(
@@ -234,12 +216,12 @@ pub async fn kick_user_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomMember,
-            content: to_raw_value(&event).expect("event is valid, we just created it"),
+            content: serde_json::to_value(event).expect("event is valid, we just created it"),
            unsigned: None,
            state_key: Some(body.user_id.to_string()),
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        &body.room_id,
        &db,
        &state_lock,
@@ -252,9 +234,6 @@ pub async fn kick_user_route(
    Ok(kick_user::Response::new().into())
 }

-/// # `POST /_matrix/client/r0/rooms/{roomId}/ban`
-///
-/// Tries to send a ban event into the room.
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/rooms/<_>/ban", data = "<body>")
@@ -276,8 +255,8 @@ pub async fn ban_user_route(
            &body.user_id.to_string(),
        )?
        .map_or(
-            Ok(RoomMemberEventContent {
-                membership: MembershipState::Ban,
+            Ok::<_, Error>(member::MemberEventContent {
+                membership: member::MembershipState::Ban,
                displayname: db.users.displayname(&body.user_id)?,
                avatar_url: db.users.avatar_url(&body.user_id)?,
                is_direct: None,
@@ -286,12 +265,14 @@ pub async fn ban_user_route(
                reason: None,
            }),
            |event| {
-                serde_json::from_str(event.content.get())
-                    .map(|event: RoomMemberEventContent| RoomMemberEventContent {
-                        membership: MembershipState::Ban,
-                        ..event
-                    })
-                    .map_err(|_| Error::bad_database("Invalid member event in database."))
+                let mut event = serde_json::from_value::<Raw<member::MemberEventContent>>(
+                    event.content.clone(),
+                )
+                .expect("Raw::from_value always works")
+                .deserialize()
+                .map_err(|_| Error::bad_database("Invalid member event in database."))?;
+                event.membership = ruma::events::room::member::MembershipState::Ban;
+                Ok(event)
            },
        )?;

@@ -308,12 +289,12 @@ pub async fn ban_user_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomMember,
-            content: to_raw_value(&event).expect("event is valid, we just created it"),
+            content: serde_json::to_value(event).expect("event is valid, we just created it"),
            unsigned: None,
            state_key: Some(body.user_id.to_string()),
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        &body.room_id,
        &db,
        &state_lock,
@@ -326,9 +307,6 @@ pub async fn ban_user_route(
    Ok(ban_user::Response::new().into())
 }

-/// # `POST /_matrix/client/r0/rooms/{roomId}/unban`
-///
-/// Tries to send an unban event into the room.
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/rooms/<_>/unban", data = "<body>")
@@ -340,7 +318,7 @@ pub async fn unban_user_route(
 ) -> ConduitResult<unban_user::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let mut event: RoomMemberEventContent = serde_json::from_str(
+    let mut event = serde_json::from_value::<Raw<ruma::events::room::member::MemberEventContent>>(
        db.rooms
            .room_state_get(
                &body.room_id,
@@ -352,11 +330,13 @@ pub async fn unban_user_route(
                "Cannot unban a user who is not banned.",
            ))?
            .content
-            .get(),
+            .clone(),
    )
+    .expect("from_value::<Raw<..>> can never fail")
+    .deserialize()
    .map_err(|_| Error::bad_database("Invalid member event in database."))?;

-    event.membership = MembershipState::Leave;
+    event.membership = ruma::events::room::member::MembershipState::Leave;

    let mutex_state = Arc::clone(
        db.globals
@@ -371,12 +351,12 @@ pub async fn unban_user_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomMember,
-            content: to_raw_value(&event).expect("event is valid, we just created it"),
+            content: serde_json::to_value(event).expect("event is valid, we just created it"),
            unsigned: None,
            state_key: Some(body.user_id.to_string()),
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        &body.room_id,
        &db,
        &state_lock,
@@ -389,14 +369,6 @@ pub async fn unban_user_route(
    Ok(unban_user::Response::new().into())
 }

-/// # `POST /_matrix/client/r0/rooms/{roomId}/forget`
-///
-/// Forgets about a room.
-///
-/// - If the sender user currently left the room: Stops sender user from receiving information about the room
-///
-/// Note: Other devices of the user have no way of knowing the room was forgotten, so this has to
-/// be called from every device
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/rooms/<_>/forget", data = "<body>")
@@ -408,16 +380,13 @@ pub async fn forget_room_route(
 ) -> ConduitResult<forget_room::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    db.rooms.forget(&body.room_id, sender_user)?;
+    db.rooms.forget(&body.room_id, &sender_user)?;

    db.flush()?;

    Ok(forget_room::Response::new().into())
 }

-/// # `POST /_matrix/client/r0/joined_rooms`
-///
-/// Lists all rooms the user has joined.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/joined_rooms", data = "<body>")
@@ -432,18 +401,13 @@ pub async fn joined_rooms_route(
    Ok(joined_rooms::Response {
        joined_rooms: db
            .rooms
-            .rooms_joined(sender_user)
+            .rooms_joined(&sender_user)
            .filter_map(|r| r.ok())
            .collect(),
    }
    .into())
 }

-/// # `POST /_matrix/client/r0/rooms/{roomId}/members`
-///
-/// Lists all joined users in a room (TODO: at a specific point in time, with a specific membership).
-///
-/// - Only works if the user is currently joined
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/rooms/<_>/members", data = "<body>")
@@ -455,7 +419,6 @@ pub async fn get_member_events_route(
 ) -> ConduitResult<get_member_events::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    // TODO: check history visibility?
    if !db.rooms.is_joined(sender_user, &body.room_id)? {
        return Err(Error::BadRequest(
            ErrorKind::Forbidden,
@@ -475,12 +438,6 @@ pub async fn get_member_events_route(
    .into())
 }

-/// # `POST /_matrix/client/r0/rooms/{roomId}/joined_members`
-///
-/// Lists all members of a room.
-///
-/// - The sender user must be in the room
-/// - TODO: An appservice just needs a puppet joined
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/rooms/<_>/joined_members", data = "<body>")
@@ -492,7 +449,11 @@ pub async fn joined_members_route(
 ) -> ConduitResult<joined_members::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    if !db.rooms.is_joined(sender_user, &body.room_id)? {
+    if !db
+        .rooms
+        .is_joined(&sender_user, &body.room_id)
+        .unwrap_or(false)
+    {
        return Err(Error::BadRequest(
            ErrorKind::Forbidden,
            "You aren't a member of the room.",
@@ -537,7 +498,7 @@ async fn join_room_by_id_helper(
    let state_lock = mutex_state.lock().await;

    // Ask a remote server if we don't have this room
-    if !db.rooms.exists(room_id)? && room_id.server_name() != db.globals.server_name() {
+    if !db.rooms.exists(&room_id)? && room_id.server_name() != db.globals.server_name() {
        let mut make_join_response_and_server = Err(Error::BadServerResponse(
            "No server available to assist in joining.",
        ));
@@ -575,10 +536,11 @@ async fn join_room_by_id_helper(
            _ => return Err(Error::BadServerResponse("Room version is not supported")),
        };

-        let mut join_event_stub: CanonicalJsonObject =
-            serde_json::from_str(make_join_response.event.get()).map_err(|_| {
-                Error::BadServerResponse("Invalid make_join event json received from server.")
-            })?;
+        let mut join_event_stub =
+            serde_json::from_str::<CanonicalJsonObject>(make_join_response.event.json().get())
+                .map_err(|_| {
+                    Error::BadServerResponse("Invalid make_join event json received from server.")
+                })?;

        // TODO: Is origin needed?
        join_event_stub.insert(
@@ -595,13 +557,13 @@ async fn join_room_by_id_helper(
        );
        join_event_stub.insert(
            "content".to_owned(),
-            to_canonical_value(RoomMemberEventContent {
-                membership: MembershipState::Join,
-                displayname: db.users.displayname(sender_user)?,
-                avatar_url: db.users.avatar_url(sender_user)?,
+            to_canonical_value(member::MemberEventContent {
+                membership: member::MembershipState::Join,
+                displayname: db.users.displayname(&sender_user)?,
+                avatar_url: db.users.avatar_url(&sender_user)?,
                is_direct: None,
                third_party_invite: None,
-                blurhash: db.users.blurhash(sender_user)?,
+                blurhash: db.users.blurhash(&sender_user)?,
                reason: None,
            })
            .expect("event is valid, we just created it"),
@@ -644,12 +606,12 @@ async fn join_room_by_id_helper(
                federation::membership::create_join_event::v2::Request {
                    room_id,
                    event_id: &event_id,
-                    pdu: &PduEvent::convert_to_outgoing_federation_event(join_event.clone()),
+                    pdu: PduEvent::convert_to_outgoing_federation_event(join_event.clone()),
                },
            )
            .await?;

-        db.rooms.get_or_create_shortroomid(room_id, &db.globals)?;
+        db.rooms.get_or_create_shortroomid(&room_id, &db.globals)?;

        let pdu = PduEvent::from_id_val(&event_id, join_event.clone())
            .map_err(|_| Error::BadServerResponse("Invalid join event PDU."))?;
@@ -657,19 +619,14 @@ async fn join_room_by_id_helper(
        let mut state = HashMap::new();
        let pub_key_map = RwLock::new(BTreeMap::new());

-        server_server::fetch_join_signing_keys(
-            &send_join_response,
-            &room_version,
-            &pub_key_map,
-            db,
+        for result in futures::future::join_all(
+            send_join_response
+                .room_state
+                .state
+                .iter()
+                .map(|pdu| validate_and_add_event_id(pdu, &room_version, &pub_key_map, &db)),
        )
-        .await?;
-
-        for result in send_join_response
-            .room_state
-            .state
-            .iter()
-            .map(|pdu| validate_and_add_event_id(pdu, &room_version, &pub_key_map, db))
+        .await
        {
            let (event_id, value) = match result {
                Ok(t) => t,
@@ -714,15 +671,18 @@ async fn join_room_by_id_helper(
            state
                .into_iter()
                .map(|(k, id)| db.rooms.compress_state_event(k, &id, &db.globals))
-                .collect::<Result<_>>()?,
-            db,
+                .collect::<Result<HashSet<_>>>()?,
+            &db,
        )?;

-        for result in send_join_response
-            .room_state
-            .auth_chain
-            .iter()
-            .map(|pdu| validate_and_add_event_id(pdu, &room_version, &pub_key_map, db))
+        for result in futures::future::join_all(
+            send_join_response
+                .room_state
+                .auth_chain
+                .iter()
+                .map(|pdu| validate_and_add_event_id(pdu, &room_version, &pub_key_map, &db)),
+        )
+        .await
        {
            let (event_id, value) = match result {
                Ok(t) => t,
@@ -745,29 +705,29 @@ async fn join_room_by_id_helper(

        // We set the room state after inserting the pdu, so that we never have a moment in time
        // where events in the current room state do not exist
-        db.rooms.set_room_state(room_id, statehashid)?;
+        db.rooms.set_room_state(&room_id, statehashid)?;
    } else {
-        let event = RoomMemberEventContent {
-            membership: MembershipState::Join,
-            displayname: db.users.displayname(sender_user)?,
-            avatar_url: db.users.avatar_url(sender_user)?,
+        let event = member::MemberEventContent {
+            membership: member::MembershipState::Join,
+            displayname: db.users.displayname(&sender_user)?,
+            avatar_url: db.users.avatar_url(&sender_user)?,
            is_direct: None,
            third_party_invite: None,
-            blurhash: db.users.blurhash(sender_user)?,
+            blurhash: db.users.blurhash(&sender_user)?,
            reason: None,
        };

        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomMember,
-                content: to_raw_value(&event).expect("event is valid, we just created it"),
+                content: serde_json::to_value(event).expect("event is valid, we just created it"),
                unsigned: None,
                state_key: Some(sender_user.to_string()),
                redacts: None,
            },
-            sender_user,
-            room_id,
-            db,
+            &sender_user,
+            &room_id,
+            &db,
            &state_lock,
        )?;
    }
@@ -779,19 +739,19 @@ async fn join_room_by_id_helper(
    Ok(join_room_by_id::Response::new(room_id.clone()).into())
 }

-fn validate_and_add_event_id(
-    pdu: &RawJsonValue,
+async fn validate_and_add_event_id(
+    pdu: &Raw<Pdu>,
    room_version: &RoomVersionId,
    pub_key_map: &RwLock<BTreeMap<String, BTreeMap<String, String>>>,
    db: &Database,
 ) -> Result<(EventId, CanonicalJsonObject)> {
-    let mut value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|e| {
+    let mut value = serde_json::from_str::<CanonicalJsonObject>(pdu.json().get()).map_err(|e| {
        error!("Invalid PDU in server response: {:?}: {:?}", pdu, e);
        Error::BadServerResponse("Invalid PDU in server response")
    })?;
    let event_id = EventId::try_from(&*format!(
        "${}",
-        ruma::signatures::reference_hash(&value, room_version)
+        ruma::signatures::reference_hash(&value, &room_version)
            .expect("ruma can calculate reference hashes")
    ))
    .expect("ruma's reference hashes are valid event ids");
@@ -822,6 +782,7 @@ fn validate_and_add_event_id(
        }
    }

+    server_server::fetch_required_signing_keys(&value, pub_key_map, db).await?;
    if let Err(e) = ruma::signatures::verify_event(
        &*pub_key_map
            .read()
@@ -842,7 +803,7 @@ fn validate_and_add_event_id(
    Ok((event_id, value))
 }

-pub(crate) async fn invite_helper<'a>(
+pub async fn invite_helper<'a>(
    sender_user: &UserId,
    user_id: &UserId,
    room_id: &RoomId,
@@ -861,24 +822,27 @@ pub(crate) async fn invite_helper<'a>(
            );
            let state_lock = mutex_state.lock().await;

-            let prev_events: Vec<_> = db
+            let prev_events = db
                .rooms
                .get_pdu_leaves(room_id)?
                .into_iter()
                .take(20)
-                .collect();
+                .collect::<Vec<_>>();

            let create_event = db
                .rooms
                .room_state_get(room_id, &EventType::RoomCreate, "")?;

-            let create_event_content: Option<RoomCreateEventContent> = create_event
+            let create_event_content = create_event
                .as_ref()
                .map(|create_event| {
-                    serde_json::from_str(create_event.content.get()).map_err(|e| {
-                        warn!("Invalid create event: {}", e);
-                        Error::bad_database("Invalid create event in db.")
-                    })
+                    serde_json::from_value::<Raw<CreateEventContent>>(create_event.content.clone())
+                        .expect("Raw::from_value always works.")
+                        .deserialize()
+                        .map_err(|e| {
+                            warn!("Invalid create event: {}", e);
+                            Error::bad_database("Invalid create event in db.")
+                        })
                })
                .transpose()?;

@@ -898,7 +862,7 @@ pub(crate) async fn invite_helper<'a>(
            let room_version =
                RoomVersion::new(&room_version_id).expect("room version is supported");

-            let content = to_raw_value(&RoomMemberEventContent {
+            let content = serde_json::to_value(MemberEventContent {
                avatar_url: None,
                displayname: None,
                is_direct: Some(is_direct),
@@ -915,7 +879,7 @@ pub(crate) async fn invite_helper<'a>(
            let auth_events = db.rooms.get_auth_events(
                room_id,
                &kind,
-                sender_user,
+                &sender_user,
                Some(&state_key),
                &content,
            )?;
@@ -934,7 +898,7 @@ pub(crate) async fn invite_helper<'a>(
                unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone());
                unsigned.insert(
                    "prev_sender".to_owned(),
-                    serde_json::from_str(prev_pdu.sender.as_str()).expect("UserId is valid string"),
+                    serde_json::to_value(&prev_pdu.sender).expect("UserId::to_value always works"),
                );
            }

@@ -955,23 +919,19 @@ pub(crate) async fn invite_helper<'a>(
                    .map(|(_, pdu)| pdu.event_id.clone())
                    .collect(),
                redacts: None,
-                unsigned: if unsigned.is_empty() {
-                    None
-                } else {
-                    Some(to_raw_value(&unsigned).expect("to_raw_value always works"))
-                },
-                hashes: EventHash {
+                unsigned,
+                hashes: ruma::events::pdu::EventHash {
                    sha256: "aaa".to_owned(),
                },
-                signatures: None,
+                signatures: BTreeMap::new(),
            };

            let auth_check = state_res::auth_check(
                &room_version,
-                &pdu,
+                &Arc::new(pdu.clone()),
                create_prev_event,
-                None::<PduEvent>, // TODO: third_party_invite
-                |k, s| auth_events.get(&(k.clone(), s.to_owned())),
+                None, // TODO: third_party_invite
+                |k, s| auth_events.get(&(k.clone(), s.to_owned())).map(Arc::clone),
            )
            .map_err(|e| {
                error!("{:?}", e);
@@ -1013,25 +973,17 @@ pub(crate) async fn invite_helper<'a>(
            (room_version_id, pdu_json, invite_room_state)
        };

-        // Generate event id
-        let expected_event_id = EventId::try_from(&*format!(
-            "${}",
-            ruma::signatures::reference_hash(&pdu_json, &room_version_id)
-                .expect("ruma can calculate reference hashes")
-        ))
-        .expect("ruma's reference hashes are valid event ids");
-
        let response = db
            .sending
            .send_federation_request(
                &db.globals,
                user_id.server_name(),
                create_invite::v2::Request {
-                    room_id,
-                    event_id: &expected_event_id,
-                    room_version: &room_version_id,
-                    event: &PduEvent::convert_to_outgoing_federation_event(pdu_json.clone()),
-                    invite_room_state: &invite_room_state,
+                    room_id: room_id.clone(),
+                    event_id: ruma::event_id!("$receivingservershouldsetthis"),
+                    room_version: room_version_id,
+                    event: PduEvent::convert_to_outgoing_federation_event(pdu_json),
+                    invite_room_state,
                },
            )
            .await?;
@@ -1050,11 +1002,7 @@ pub(crate) async fn invite_helper<'a>(
            }
        };

-        if expected_event_id != event_id {
-            warn!("Server {} changed invite event, that's not allowed in the spec: ours: {:?}, theirs: {:?}", user_id.server_name(), pdu_json, value);
-        }
-
-        let origin: Box<ServerName> = serde_json::from_value(
+        let origin = serde_json::from_value::<Box<ServerName>>(
            serde_json::to_value(value.get("origin").ok_or(Error::BadRequest(
                ErrorKind::InvalidParam,
                "Event needs an origin field.",
@@ -1066,10 +1014,10 @@ pub(crate) async fn invite_helper<'a>(
        let pdu_id = server_server::handle_incoming_pdu(
            &origin,
            &event_id,
-            room_id,
+            &room_id,
            value,
            true,
-            db,
+            &db,
            &pub_key_map,
        )
        .await
@@ -1084,13 +1032,14 @@ pub(crate) async fn invite_helper<'a>(
            "Could not accept incoming PDU as timeline event.",
        ))?;

-        let servers = db
+        for server in db
            .rooms
            .room_servers(room_id)
            .filter_map(|r| r.ok())
-            .filter(|server| &**server != db.globals.server_name());
-
-        db.sending.send_pdu(servers, &pdu_id)?;
+            .filter(|server| &**server != db.globals.server_name())
+        {
+            db.sending.send_pdu(&server, &pdu_id)?;
+        }

        return Ok(());
    }
@@ -1108,13 +1057,13 @@ pub(crate) async fn invite_helper<'a>(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomMember,
-            content: to_raw_value(&RoomMemberEventContent {
-                membership: MembershipState::Invite,
-                displayname: db.users.displayname(user_id)?,
-                avatar_url: db.users.avatar_url(user_id)?,
+            content: serde_json::to_value(member::MemberEventContent {
+                membership: member::MembershipState::Invite,
+                displayname: db.users.displayname(&user_id)?,
+                avatar_url: db.users.avatar_url(&user_id)?,
                is_direct: Some(is_direct),
                third_party_invite: None,
-                blurhash: db.users.blurhash(user_id)?,
+                blurhash: db.users.blurhash(&user_id)?,
                reason: None,
            })
            .expect("event is valid, we just created it"),
@@ -1122,9 +1071,9 @@ pub(crate) async fn invite_helper<'a>(
            state_key: Some(user_id.to_string()),
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        room_id,
-        db,
+        &db,
        &state_lock,
    )?;

@@ -16,13 +16,6 @@ use std::{
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, put};

-/// # `PUT /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId}`
-///
-/// Send a message event into the room.
-///
-/// - Is a NOOP if the txn id was already used before and returns the same event id again
-/// - The only requirement for the content is that it has to be valid json
-/// - Tries to send the event into the room, auth rules will determine if it is allowed
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/rooms/<_>/send/<_>/<_>", data = "<body>")
@@ -45,14 +38,6 @@ pub async fn send_message_event_route(
    );
    let state_lock = mutex_state.lock().await;

-    // Forbid m.room.encrypted if encryption is disabled
-    if &body.event_type == "m.room.encrypted" && !db.globals.allow_encryption() {
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "Encryption has been disabled",
-        ));
-    }
-
    // Check if this is a new transaction id
    if let Some(response) =
        db.transaction_ids
@@ -87,7 +72,7 @@ pub async fn send_message_event_route(
            state_key: None,
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        &body.room_id,
        &db,
        &state_lock,
@@ -107,12 +92,6 @@ pub async fn send_message_event_route(
    Ok(send_message_event::Response::new(event_id).into())
 }

-/// # `GET /_matrix/client/r0/rooms/{roomId}/messages`
-///
-/// Allows paginating through room history.
-///
-/// - Only works if the user is joined (TODO: always allow, but only show events where the user was
-/// joined, depending on history_visibility)
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/rooms/<_>/messages", data = "<body>")
@@ -140,13 +119,16 @@ pub async fn get_message_events_route(
    let to = body.to.as_ref().map(|t| t.parse());

    // Use limit or else 10
-    let limit = body.limit.try_into().map_or(10_usize, |l: u32| l as usize);
+    let limit = body
+        .limit
+        .try_into()
+        .map_or(Ok::<_, Error>(10_usize), |l: u32| Ok(l as usize))?;

    match body.dir {
        get_message_events::Direction::Forward => {
-            let events_after: Vec<_> = db
+            let events_after = db
                .rooms
-                .pdus_after(sender_user, &body.room_id, from)?
+                .pdus_after(&sender_user, &body.room_id, from)?
                .take(limit)
                .filter_map(|r| r.ok()) // Filter out buggy events
                .filter_map(|(pdu_id, pdu)| {
@@ -156,14 +138,14 @@ pub async fn get_message_events_route(
                        .ok()
                })
                .take_while(|&(k, _)| Some(Ok(k)) != to) // Stop at `to`
-                .collect();
+                .collect::<Vec<_>>();

            let end_token = events_after.last().map(|(count, _)| count.to_string());

-            let events_after: Vec<_> = events_after
+            let events_after = events_after
                .into_iter()
                .map(|(_, pdu)| pdu.to_room_event())
-                .collect();
+                .collect::<Vec<_>>();

            let mut resp = get_message_events::Response::new();
            resp.start = Some(body.from.to_owned());
@@ -174,9 +156,9 @@ pub async fn get_message_events_route(
            Ok(resp.into())
        }
        get_message_events::Direction::Backward => {
-            let events_before: Vec<_> = db
+            let events_before = db
                .rooms
-                .pdus_until(sender_user, &body.room_id, from)?
+                .pdus_until(&sender_user, &body.room_id, from)?
                .take(limit)
                .filter_map(|r| r.ok()) // Filter out buggy events
                .filter_map(|(pdu_id, pdu)| {
@@ -186,14 +168,14 @@ pub async fn get_message_events_route(
                        .ok()
                })
                .take_while(|&(k, _)| Some(Ok(k)) != to) // Stop at `to`
-                .collect();
+                .collect::<Vec<_>>();

            let start_token = events_before.last().map(|(count, _)| count.to_string());

-            let events_before: Vec<_> = events_before
+            let events_before = events_before
                .into_iter()
                .map(|(_, pdu)| pdu.to_room_event())
-                .collect();
+                .collect::<Vec<_>>();

            let mut resp = get_message_events::Response::new();
            resp.start = Some(body.from.to_owned());
@@ -71,9 +71,6 @@ pub const DEVICE_ID_LENGTH: usize = 10;
 pub const TOKEN_LENGTH: usize = 256;
 pub const SESSION_ID_LENGTH: usize = 256;

-/// # `OPTIONS`
-///
-/// Web clients use this to get CORS headers.
 #[cfg(feature = "conduit_bin")]
 #[options("/<_..>")]
 #[tracing::instrument]
@@ -5,9 +5,6 @@ use std::{convert::TryInto, time::Duration};
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, put};

-/// # `PUT /_matrix/client/r0/presence/{userId}/status`
-///
-/// Sets the presence state of the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/presence/<_>/status", data = "<body>")
@@ -19,17 +16,17 @@ pub async fn set_presence_route(
 ) -> ConduitResult<set_presence::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    for room_id in db.rooms.rooms_joined(sender_user) {
+    for room_id in db.rooms.rooms_joined(&sender_user) {
        let room_id = room_id?;

        db.rooms.edus.update_presence(
-            sender_user,
+            &sender_user,
            &room_id,
            ruma::events::presence::PresenceEvent {
                content: ruma::events::presence::PresenceEventContent {
-                    avatar_url: db.users.avatar_url(sender_user)?,
+                    avatar_url: db.users.avatar_url(&sender_user)?,
                    currently_active: None,
-                    displayname: db.users.displayname(sender_user)?,
+                    displayname: db.users.displayname(&sender_user)?,
                    last_active_ago: Some(
                        utils::millis_since_unix_epoch()
                            .try_into()
@@ -49,11 +46,6 @@ pub async fn set_presence_route(
    Ok(set_presence::Response {}.into())
 }

-/// # `GET /_matrix/client/r0/presence/{userId}/status`
-///
-/// Gets the presence state of the given user.
-///
-/// - Only works if you share a room with the user
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/presence/<_>/status", data = "<body>")
@@ -76,10 +68,9 @@ pub async fn get_presence_route(
        if let Some(presence) = db
            .rooms
            .edus
-            .get_last_presence_event(sender_user, &room_id)?
+            .get_last_presence_event(&sender_user, &room_id)?
        {
            presence_event = Some(presence);
-            break;
        }
    }

@@ -9,19 +9,14 @@ use ruma::{
        },
        federation::{self, query::get_profile_information::v1::ProfileField},
    },
-    events::{room::member::RoomMemberEventContent, EventType},
+    events::EventType,
+    serde::Raw,
 };
-use serde_json::value::to_raw_value;
 use std::{convert::TryInto, sync::Arc};

 #[cfg(feature = "conduit_bin")]
 use rocket::{get, put};

-/// # `PUT /_matrix/client/r0/profile/{userId}/displayname`
-///
-/// Updates the displayname.
-///
-/// - Also makes sure other users receive the update using presence EDUs
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/profile/<_>/displayname", data = "<body>")
@@ -34,20 +29,21 @@ pub async fn set_displayname_route(
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

    db.users
-        .set_displayname(sender_user, body.displayname.clone())?;
+        .set_displayname(&sender_user, body.displayname.clone())?;

    // Send a new membership event and presence update into all joined rooms
-    let all_rooms_joined: Vec<_> = db
-        .rooms
-        .rooms_joined(sender_user)
+    let all_rooms_joined = db.rooms.rooms_joined(&sender_user).collect::<Vec<_>>();
+
+    for (pdu_builder, room_id) in all_rooms_joined
+        .into_iter()
        .filter_map(|r| r.ok())
        .map(|room_id| {
            Ok::<_, Error>((
                PduBuilder {
                    event_type: EventType::RoomMember,
-                    content: to_raw_value(&RoomMemberEventContent {
+                    content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
                        displayname: body.displayname.clone(),
-                        ..serde_json::from_str(
+                        ..serde_json::from_value::<Raw<_>>(
                            db.rooms
                                .room_state_get(
                                    &room_id,
@@ -57,12 +53,14 @@ pub async fn set_displayname_route(
                                .ok_or_else(|| {
                                    Error::bad_database(
                                        "Tried to send displayname update for user not in the \
-                                     room.",
+                                         room.",
                                    )
                                })?
                                .content
-                                .get(),
+                                .clone(),
                        )
+                        .expect("from_value::<Raw<..>> can never fail")
+                        .deserialize()
                        .map_err(|_| Error::bad_database("Database contains invalid PDU."))?
                    })
                    .expect("event is valid, we just created it"),
@@ -74,9 +72,7 @@ pub async fn set_displayname_route(
            ))
        })
        .filter_map(|r| r.ok())
-        .collect();
-
-    for (pdu_builder, room_id) in all_rooms_joined {
+    {
        let mutex_state = Arc::clone(
            db.globals
                .roomid_mutex_state
@@ -87,19 +83,19 @@ pub async fn set_displayname_route(
        );
        let state_lock = mutex_state.lock().await;

-        let _ = db
-            .rooms
-            .build_and_append_pdu(pdu_builder, sender_user, &room_id, &db, &state_lock);
+        let _ =
+            db.rooms
+                .build_and_append_pdu(pdu_builder, &sender_user, &room_id, &db, &state_lock);

        // Presence update
        db.rooms.edus.update_presence(
-            sender_user,
+            &sender_user,
            &room_id,
            ruma::events::presence::PresenceEvent {
                content: ruma::events::presence::PresenceEventContent {
-                    avatar_url: db.users.avatar_url(sender_user)?,
+                    avatar_url: db.users.avatar_url(&sender_user)?,
                    currently_active: None,
-                    displayname: db.users.displayname(sender_user)?,
+                    displayname: db.users.displayname(&sender_user)?,
                    last_active_ago: Some(
                        utils::millis_since_unix_epoch()
                            .try_into()
@@ -119,11 +115,6 @@ pub async fn set_displayname_route(
    Ok(set_display_name::Response {}.into())
 }

-/// # `GET /_matrix/client/r0/profile/{userId}/displayname`
-///
-/// Returns the displayname of the user.
-///
-/// - If user is on another server: Fetches displayname over federation
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/profile/<_>/displayname", data = "<body>")
@@ -158,11 +149,6 @@ pub async fn get_displayname_route(
    .into())
 }

-/// # `PUT /_matrix/client/r0/profile/{userId}/avatar_url`
-///
-/// Updates the avatar_url and blurhash.
-///
-/// - Also makes sure other users receive the update using presence EDUs
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/profile/<_>/avatar_url", data = "<body>")
@@ -175,22 +161,23 @@ pub async fn set_avatar_url_route(
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

    db.users
-        .set_avatar_url(sender_user, body.avatar_url.clone())?;
+        .set_avatar_url(&sender_user, body.avatar_url.clone())?;

-    db.users.set_blurhash(sender_user, body.blurhash.clone())?;
+    db.users.set_blurhash(&sender_user, body.blurhash.clone())?;

    // Send a new membership event and presence update into all joined rooms
-    let all_joined_rooms: Vec<_> = db
-        .rooms
-        .rooms_joined(sender_user)
+    let all_joined_rooms = db.rooms.rooms_joined(&sender_user).collect::<Vec<_>>();
+
+    for (pdu_builder, room_id) in all_joined_rooms
+        .into_iter()
        .filter_map(|r| r.ok())
        .map(|room_id| {
            Ok::<_, Error>((
                PduBuilder {
                    event_type: EventType::RoomMember,
-                    content: to_raw_value(&RoomMemberEventContent {
+                    content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
                        avatar_url: body.avatar_url.clone(),
-                        ..serde_json::from_str(
+                        ..serde_json::from_value::<Raw<_>>(
                            db.rooms
                                .room_state_get(
                                    &room_id,
@@ -200,12 +187,14 @@ pub async fn set_avatar_url_route(
                                .ok_or_else(|| {
                                    Error::bad_database(
                                        "Tried to send displayname update for user not in the \
-                                     room.",
+                                         room.",
                                    )
                                })?
                                .content
-                                .get(),
+                                .clone(),
                        )
+                        .expect("from_value::<Raw<..>> can never fail")
+                        .deserialize()
                        .map_err(|_| Error::bad_database("Database contains invalid PDU."))?
                    })
                    .expect("event is valid, we just created it"),
@@ -217,9 +206,7 @@ pub async fn set_avatar_url_route(
            ))
        })
        .filter_map(|r| r.ok())
-        .collect();
-
-    for (pdu_builder, room_id) in all_joined_rooms {
+    {
        let mutex_state = Arc::clone(
            db.globals
                .roomid_mutex_state
@@ -230,19 +217,19 @@ pub async fn set_avatar_url_route(
        );
        let state_lock = mutex_state.lock().await;

-        let _ = db
-            .rooms
-            .build_and_append_pdu(pdu_builder, sender_user, &room_id, &db, &state_lock);
+        let _ =
+            db.rooms
+                .build_and_append_pdu(pdu_builder, &sender_user, &room_id, &db, &state_lock);

        // Presence update
        db.rooms.edus.update_presence(
-            sender_user,
+            &sender_user,
            &room_id,
            ruma::events::presence::PresenceEvent {
                content: ruma::events::presence::PresenceEventContent {
-                    avatar_url: db.users.avatar_url(sender_user)?,
+                    avatar_url: db.users.avatar_url(&sender_user)?,
                    currently_active: None,
-                    displayname: db.users.displayname(sender_user)?,
+                    displayname: db.users.displayname(&sender_user)?,
                    last_active_ago: Some(
                        utils::millis_since_unix_epoch()
                            .try_into()
@@ -262,11 +249,6 @@ pub async fn set_avatar_url_route(
    Ok(set_avatar_url::Response {}.into())
 }

-/// # `GET /_matrix/client/r0/profile/{userId}/avatar_url`
-///
-/// Returns the avatar_url and blurhash of the user.
-///
-/// - If user is on another server: Fetches avatar_url and blurhash over federation
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/profile/<_>/avatar_url", data = "<body>")
@@ -303,11 +285,6 @@ pub async fn get_avatar_url_route(
    .into())
 }

-/// # `GET /_matrix/client/r0/profile/{userId}`
-///
-/// Returns the displayname, avatar_url and blurhash of the user.
-///
-/// - If user is on another server: Fetches profile over federation
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/profile/<_>", data = "<body>")
@@ -8,16 +8,13 @@ use ruma::{
            set_pushrule_enabled, RuleKind,
        },
    },
-    events::{push_rules::PushRulesEvent, EventType},
+    events::{push_rules, EventType},
    push::{ConditionalPushRuleInit, PatternedPushRuleInit, SimplePushRuleInit},
 };

 #[cfg(feature = "conduit_bin")]
 use rocket::{delete, get, post, put};

-/// # `GET /_matrix/client/r0/pushrules`
-///
-/// Retrieves the push rules event for this user.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/pushrules", data = "<body>")
@@ -29,9 +26,9 @@ pub async fn get_pushrules_all_route(
 ) -> ConduitResult<get_pushrules_all::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let event: PushRulesEvent = db
+    let event = db
        .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -43,9 +40,6 @@ pub async fn get_pushrules_all_route(
    .into())
 }

-/// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
-///
-/// Retrieves a single specified push rule for this user.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/pushrules/<_>/<_>/<_>", data = "<body>")
@@ -57,9 +51,9 @@ pub async fn get_pushrule_route(
 ) -> ConduitResult<get_pushrule::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let event: PushRulesEvent = db
+    let event = db
        .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -100,9 +94,6 @@ pub async fn get_pushrule_route(
    }
 }

-/// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
-///
-/// Creates a single specified push rule for this user.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/pushrules/<_>/<_>/<_>", data = "<req>")
@@ -122,9 +113,9 @@ pub async fn set_pushrule_route(
        ));
    }

-    let mut event: PushRulesEvent = db
+    let mut event = db
        .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -193,17 +184,19 @@ pub async fn set_pushrule_route(
        _ => {}
    }

-    db.account_data
-        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
+    db.account_data.update(
+        None,
+        &sender_user,
+        EventType::PushRules,
+        &event,
+        &db.globals,
+    )?;

    db.flush()?;

    Ok(set_pushrule::Response {}.into())
 }

-/// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions`
-///
-/// Gets the actions of a single specified push rule for this user.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/pushrules/<_>/<_>/<_>/actions", data = "<body>")
@@ -222,9 +215,9 @@ pub async fn get_pushrule_actions_route(
        ));
    }

-    let mut event: PushRulesEvent = db
+    let mut event = db
        .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -263,9 +256,6 @@ pub async fn get_pushrule_actions_route(
    .into())
 }

-/// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions`
-///
-/// Sets the actions of a single specified push rule for this user.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/pushrules/<_>/<_>/<_>/actions", data = "<body>")
@@ -284,9 +274,9 @@ pub async fn set_pushrule_actions_route(
        ));
    }

-    let mut event: PushRulesEvent = db
+    let mut event = db
        .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -327,17 +317,19 @@ pub async fn set_pushrule_actions_route(
        _ => {}
    };

-    db.account_data
-        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
+    db.account_data.update(
+        None,
+        &sender_user,
+        EventType::PushRules,
+        &event,
+        &db.globals,
+    )?;

    db.flush()?;

    Ok(set_pushrule_actions::Response {}.into())
 }

-/// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/enabled`
-///
-/// Gets the enabled status of a single specified push rule for this user.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/pushrules/<_>/<_>/<_>/enabled", data = "<body>")
@@ -356,9 +348,9 @@ pub async fn get_pushrule_enabled_route(
        ));
    }

-    let mut event: PushRulesEvent = db
+    let mut event = db
        .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -399,9 +391,6 @@ pub async fn get_pushrule_enabled_route(
    Ok(get_pushrule_enabled::Response { enabled }.into())
 }

-/// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/enabled`
-///
-/// Sets the enabled status of a single specified push rule for this user.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/pushrules/<_>/<_>/<_>/enabled", data = "<body>")
@@ -420,9 +409,9 @@ pub async fn set_pushrule_enabled_route(
        ));
    }

-    let mut event: PushRulesEvent = db
+    let mut event = db
        .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -468,17 +457,19 @@ pub async fn set_pushrule_enabled_route(
        _ => {}
    }

-    db.account_data
-        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
+    db.account_data.update(
+        None,
+        &sender_user,
+        EventType::PushRules,
+        &event,
+        &db.globals,
+    )?;

    db.flush()?;

    Ok(set_pushrule_enabled::Response {}.into())
 }

-/// # `DELETE /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
-///
-/// Deletes a single specified push rule for this user.
 #[cfg_attr(
    feature = "conduit_bin",
    delete("/_matrix/client/r0/pushrules/<_>/<_>/<_>", data = "<body>")
@@ -497,9 +488,9 @@ pub async fn delete_pushrule_route(
        ));
    }

-    let mut event: PushRulesEvent = db
+    let mut event = db
        .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -535,17 +526,19 @@ pub async fn delete_pushrule_route(
        _ => {}
    }

-    db.account_data
-        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
+    db.account_data.update(
+        None,
+        &sender_user,
+        EventType::PushRules,
+        &event,
+        &db.globals,
+    )?;

    db.flush()?;

    Ok(delete_pushrule::Response {}.into())
 }

-/// # `GET /_matrix/client/r0/pushers`
-///
-/// Gets all currently active pushers for the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/pushers", data = "<body>")
@@ -563,11 +556,6 @@ pub async fn get_pushers_route(
    .into())
 }

-/// # `POST /_matrix/client/r0/pushers/set`
-///
-/// Adds a pusher for the sender user.
-///
-/// - TODO: Handle `append`
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/pushers/set", data = "<body>")
@@ -13,12 +13,6 @@ use std::collections::BTreeMap;
 #[cfg(feature = "conduit_bin")]
 use rocket::post;

-/// # `POST /_matrix/client/r0/rooms/{roomId}/read_markers`
-///
-/// Sets different types of read markers.
-///
-/// - Updates fully-read account data event to `fully_read`
-/// - If `read_receipt` is set: Update private marker and public read receipt EDU
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/rooms/<_>/read_markers", data = "<body>")
@@ -37,7 +31,7 @@ pub async fn set_read_marker_route(
    };
    db.account_data.update(
        Some(&body.room_id),
-        sender_user,
+        &sender_user,
        EventType::FullyRead,
        &fully_read_event,
        &db.globals,
@@ -46,7 +40,7 @@ pub async fn set_read_marker_route(
    if let Some(event) = &body.read_receipt {
        db.rooms.edus.private_read_set(
            &body.room_id,
-            sender_user,
+            &sender_user,
            db.rooms.get_pdu_count(event)?.ok_or(Error::BadRequest(
                ErrorKind::InvalidParam,
                "Event does not exist.",
@@ -54,7 +48,7 @@ pub async fn set_read_marker_route(
            &db.globals,
        )?;
        db.rooms
-            .reset_notification_counts(sender_user, &body.room_id)?;
+            .reset_notification_counts(&sender_user, &body.room_id)?;

        let mut user_receipts = BTreeMap::new();
        user_receipts.insert(
@@ -71,7 +65,7 @@ pub async fn set_read_marker_route(
        receipt_content.insert(event.to_owned(), receipts);

        db.rooms.edus.readreceipt_update(
-            sender_user,
+            &sender_user,
            &body.room_id,
            AnyEphemeralRoomEvent::Receipt(ruma::events::receipt::ReceiptEvent {
                content: ruma::events::receipt::ReceiptEventContent(receipt_content),
@@ -86,9 +80,6 @@ pub async fn set_read_marker_route(
    Ok(set_read_marker::Response {}.into())
 }

-/// # `POST /_matrix/client/r0/rooms/{roomId}/receipt/{receiptType}/{eventId}`
-///
-/// Sets private read marker and public read receipt EDU.
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/rooms/<_>/receipt/<_>/<_>", data = "<body>")
@@ -102,7 +93,7 @@ pub async fn create_receipt_route(

    db.rooms.edus.private_read_set(
        &body.room_id,
-        sender_user,
+        &sender_user,
        db.rooms
            .get_pdu_count(&body.event_id)?
            .ok_or(Error::BadRequest(
@@ -112,7 +103,7 @@ pub async fn create_receipt_route(
        &db.globals,
    )?;
    db.rooms
-        .reset_notification_counts(sender_user, &body.room_id)?;
+        .reset_notification_counts(&sender_user, &body.room_id)?;

    let mut user_receipts = BTreeMap::new();
    user_receipts.insert(
@@ -128,7 +119,7 @@ pub async fn create_receipt_route(
    receipt_content.insert(body.event_id.to_owned(), receipts);

    db.rooms.edus.readreceipt_update(
-        sender_user,
+        &sender_user,
        &body.room_id,
        AnyEphemeralRoomEvent::Receipt(ruma::events::receipt::ReceiptEvent {
            content: ruma::events::receipt::ReceiptEventContent(receipt_content),
@@ -3,18 +3,12 @@ use std::sync::Arc;
 use crate::{database::DatabaseGuard, pdu::PduBuilder, ConduitResult, Ruma};
 use ruma::{
    api::client::r0::redact::redact_event,
-    events::{room::redaction::RoomRedactionEventContent, EventType},
+    events::{room::redaction, EventType},
 };

 #[cfg(feature = "conduit_bin")]
 use rocket::put;
-use serde_json::value::to_raw_value;

-/// # `PUT /_matrix/client/r0/rooms/{roomId}/redact/{eventId}/{txnId}`
-///
-/// Tries to send a redaction event into the room.
-///
-/// - TODO: Handle txn id
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/rooms/<_>/redact/<_>/<_>", data = "<body>")
@@ -39,7 +33,7 @@ pub async fn redact_event_route(
    let event_id = db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomRedaction,
-            content: to_raw_value(&RoomRedactionEventContent {
+            content: serde_json::to_value(redaction::RedactionEventContent {
                reason: body.reason.clone(),
            })
            .expect("event is valid, we just created it"),
@@ -47,7 +41,7 @@ pub async fn redact_event_route(
            state_key: None,
            redacts: Some(body.event_id.clone()),
        },
-        sender_user,
+        &sender_user,
        &body.room_id,
        &db,
        &state_lock,
@@ -8,46 +8,18 @@ use ruma::{
        r0::room::{self, aliases, create_room, get_room_event, upgrade_room},
    },
    events::{
-        room::{
-            canonical_alias::RoomCanonicalAliasEventContent,
-            create::RoomCreateEventContent,
-            guest_access::{GuestAccess, RoomGuestAccessEventContent},
-            history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
-            join_rules::{JoinRule, RoomJoinRulesEventContent},
-            member::{MembershipState, RoomMemberEventContent},
-            name::RoomNameEventContent,
-            power_levels::RoomPowerLevelsEventContent,
-            tombstone::RoomTombstoneEventContent,
-            topic::RoomTopicEventContent,
-        },
+        room::{guest_access, history_visibility, join_rules, member, name, topic},
        EventType,
    },
-    serde::JsonObject,
+    serde::Raw,
    RoomAliasId, RoomId, RoomVersionId,
 };
-use serde_json::value::to_raw_value;
 use std::{cmp::max, collections::BTreeMap, convert::TryFrom, sync::Arc};
 use tracing::{info, warn};

 #[cfg(feature = "conduit_bin")]
 use rocket::{get, post};

-/// # `POST /_matrix/client/r0/createRoom`
-///
-/// Creates a new room.
-///
-/// - Room ID is randomly generated
-/// - Create alias if room_alias_name is set
-/// - Send create event
-/// - Join sender user
-/// - Send power levels event
-/// - Send canonical room alias
-/// - Send join rules
-/// - Send history visibility
-/// - Send guest access
-/// - Send events listed in initial state
-/// - Send events implied by `name` and `topic`
-/// - Send invite events
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/createRoom", data = "<body>")
@@ -73,16 +45,6 @@ pub async fn create_room_route(
    );
    let state_lock = mutex_state.lock().await;

-    if !db.globals.allow_room_creation()
-        && !body.from_appservice
-        && !db.users.is_admin(sender_user, &db.rooms, &db.globals)?
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "Room creation has been disabled.",
-        ));
-    }
-
    let alias: Option<RoomAliasId> =
        body.room_alias_name
            .as_ref()
@@ -102,7 +64,7 @@ pub async fn create_room_route(
                }
            })?;

-    let mut content = RoomCreateEventContent::new(sender_user.clone());
+    let mut content = ruma::events::room::create::CreateEventContent::new(sender_user.clone());
    content.federate = body.creation_content.federate;
    content.predecessor = body.creation_content.predecessor.clone();
    content.room_version = match body.room_version.clone() {
@@ -123,12 +85,12 @@ pub async fn create_room_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomCreate,
-            content: to_raw_value(&content).expect("event is valid, we just created it"),
+            content: serde_json::to_value(content).expect("event is valid, we just created it"),
            unsigned: None,
            state_key: Some("".to_owned()),
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -138,13 +100,13 @@ pub async fn create_room_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomMember,
-            content: to_raw_value(&RoomMemberEventContent {
-                membership: MembershipState::Join,
-                displayname: db.users.displayname(sender_user)?,
-                avatar_url: db.users.avatar_url(sender_user)?,
+            content: serde_json::to_value(member::MemberEventContent {
+                membership: member::MembershipState::Join,
+                displayname: db.users.displayname(&sender_user)?,
+                avatar_url: db.users.avatar_url(&sender_user)?,
                is_direct: Some(body.is_direct),
                third_party_invite: None,
-                blurhash: db.users.blurhash(sender_user)?,
+                blurhash: db.users.blurhash(&sender_user)?,
                reason: None,
            })
            .expect("event is valid, we just created it"),
@@ -152,7 +114,7 @@ pub async fn create_room_route(
            state_key: Some(sender_user.to_string()),
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -179,17 +141,20 @@ pub async fn create_room_route(
        }
    }

-    let mut power_levels_content = serde_json::to_value(RoomPowerLevelsEventContent {
-        users,
-        ..Default::default()
-    })
-    .expect("event is valid, we just created it");
+    let mut power_levels_content =
+        serde_json::to_value(ruma::events::room::power_levels::PowerLevelsEventContent {
+            users,
+            ..Default::default()
+        })
+        .expect("event is valid, we just created it");

    if let Some(power_level_content_override) = &body.power_level_content_override {
-        let json: JsonObject = serde_json::from_str(power_level_content_override.json().get())
-            .map_err(|_| {
-                Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override.")
-            })?;
+        let json = serde_json::from_str::<serde_json::Map<String, serde_json::Value>>(
+            power_level_content_override.json().get(),
+        )
+        .map_err(|_| {
+            Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override.")
+        })?;

        for (key, value) in json {
            power_levels_content[key] = value;
@@ -199,13 +164,12 @@ pub async fn create_room_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomPowerLevels,
-            content: to_raw_value(&power_levels_content)
-                .expect("to_raw_value always works on serde_json::Value"),
+            content: power_levels_content,
            unsigned: None,
            state_key: Some("".to_owned()),
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -216,16 +180,18 @@ pub async fn create_room_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomCanonicalAlias,
-                content: to_raw_value(&RoomCanonicalAliasEventContent {
-                    alias: Some(room_alias_id.clone()),
-                    alt_aliases: vec![],
-                })
+                content: serde_json::to_value(
+                    ruma::events::room::canonical_alias::CanonicalAliasEventContent {
+                        alias: Some(room_alias_id.clone()),
+                        alt_aliases: vec![],
+                    },
+                )
                .expect("We checked that alias earlier, it must be fine"),
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
            },
-            sender_user,
+            &sender_user,
            &room_id,
            &db,
            &state_lock,
@@ -238,17 +204,22 @@ pub async fn create_room_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomJoinRules,
-            content: to_raw_value(&RoomJoinRulesEventContent::new(match preset {
-                create_room::RoomPreset::PublicChat => JoinRule::Public,
+            content: match preset {
+                create_room::RoomPreset::PublicChat => serde_json::to_value(
+                    join_rules::JoinRulesEventContent::new(join_rules::JoinRule::Public),
+                )
+                .expect("event is valid, we just created it"),
                // according to spec "invite" is the default
-                _ => JoinRule::Invite,
-            }))
-            .expect("event is valid, we just created it"),
+                _ => serde_json::to_value(join_rules::JoinRulesEventContent::new(
+                    join_rules::JoinRule::Invite,
+                ))
+                .expect("event is valid, we just created it"),
+            },
            unsigned: None,
            state_key: Some("".to_owned()),
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -258,15 +229,15 @@ pub async fn create_room_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomHistoryVisibility,
-            content: to_raw_value(&RoomHistoryVisibilityEventContent::new(
-                HistoryVisibility::Shared,
+            content: serde_json::to_value(history_visibility::HistoryVisibilityEventContent::new(
+                history_visibility::HistoryVisibility::Shared,
            ))
            .expect("event is valid, we just created it"),
            unsigned: None,
            state_key: Some("".to_owned()),
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -276,16 +247,23 @@ pub async fn create_room_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomGuestAccess,
-            content: to_raw_value(&RoomGuestAccessEventContent::new(match preset {
-                create_room::RoomPreset::PublicChat => GuestAccess::Forbidden,
-                _ => GuestAccess::CanJoin,
-            }))
-            .expect("event is valid, we just created it"),
+            content: match preset {
+                create_room::RoomPreset::PublicChat => {
+                    serde_json::to_value(guest_access::GuestAccessEventContent::new(
+                        guest_access::GuestAccess::Forbidden,
+                    ))
+                    .expect("event is valid, we just created it")
+                }
+                _ => serde_json::to_value(guest_access::GuestAccessEventContent::new(
+                    guest_access::GuestAccess::CanJoin,
+                ))
+                .expect("event is valid, we just created it"),
+            },
            unsigned: None,
            state_key: Some("".to_owned()),
            redacts: None,
        },
-        sender_user,
+        &sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -304,7 +282,7 @@ pub async fn create_room_route(
        }

        db.rooms
-            .build_and_append_pdu(pdu_builder, sender_user, &room_id, &db, &state_lock)?;
+            .build_and_append_pdu(pdu_builder, &sender_user, &room_id, &db, &state_lock)?;
    }

    // 7. Events implied by name and topic
@@ -312,13 +290,13 @@ pub async fn create_room_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomName,
-                content: to_raw_value(&RoomNameEventContent::new(Some(name.clone())))
+                content: serde_json::to_value(name::NameEventContent::new(Some(name.clone())))
                    .expect("event is valid, we just created it"),
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
            },
-            sender_user,
+            &sender_user,
            &room_id,
            &db,
            &state_lock,
@@ -329,7 +307,7 @@ pub async fn create_room_route(
        db.rooms.build_and_append_pdu(
            PduBuilder {
                event_type: EventType::RoomTopic,
-                content: to_raw_value(&RoomTopicEventContent {
+                content: serde_json::to_value(topic::TopicEventContent {
                    topic: topic.clone(),
                })
                .expect("event is valid, we just created it"),
@@ -337,7 +315,7 @@ pub async fn create_room_route(
                state_key: Some("".to_owned()),
                redacts: None,
            },
-            sender_user,
+            &sender_user,
            &room_id,
            &db,
            &state_lock,
@@ -366,11 +344,6 @@ pub async fn create_room_route(
    Ok(create_room::Response::new(room_id).into())
 }

-/// # `GET /_matrix/client/r0/rooms/{roomId}/event/{eventId}`
-///
-/// Gets a single event.
-///
-/// - You have to currently be joined to the room (TODO: Respect history visibility)
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/rooms/<_>/event/<_>", data = "<body>")
@@ -399,11 +372,6 @@ pub async fn get_room_event_route(
    .into())
 }

-/// # `GET /_matrix/client/r0/rooms/{roomId}/aliases`
-///
-/// Lists all aliases of the room.
-///
-/// - Only users joined to the room are allowed to call this TODO: Allow any user to call it if history_visibility is world readable
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/rooms/<_>/aliases", data = "<body>")
@@ -432,16 +400,6 @@ pub async fn get_room_aliases_route(
    .into())
 }

-/// # `GET /_matrix/client/r0/rooms/{roomId}/upgrade`
-///
-/// Upgrades the room.
-///
-/// - Creates a replacement room
-/// - Sends a tombstone event into the current room
-/// - Sender user joins the room
-/// - Transfers some state events
-/// - Moves local aliases
-/// - Modifies old room power levels to prevent users from speaking
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/rooms/<_>/upgrade", data = "<body>")
@@ -483,8 +441,8 @@ pub async fn upgrade_room_route(
    let tombstone_event_id = db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomTombstone,
-            content: to_raw_value(&RoomTombstoneEventContent {
-                body: "This room has been replaced".to_owned(),
+            content: serde_json::to_value(ruma::events::room::tombstone::TombstoneEventContent {
+                body: "This room has been replaced".to_string(),
                replacement_room: replacement_room.clone(),
            })
            .expect("event is valid, we just created it"),
@@ -511,13 +469,15 @@ pub async fn upgrade_room_route(
    let state_lock = mutex_state.lock().await;

    // Get the old room federations status
-    let federate = serde_json::from_str::<RoomCreateEventContent>(
+    let federate = serde_json::from_value::<Raw<ruma::events::room::create::CreateEventContent>>(
        db.rooms
            .room_state_get(&body.room_id, &EventType::RoomCreate, "")?
            .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))?
            .content
-            .get(),
+            .clone(),
    )
+    .expect("Raw::from_value always works")
+    .deserialize()
    .map_err(|_| Error::bad_database("Invalid room event in database."))?
    .federate;

@@ -528,7 +488,8 @@ pub async fn upgrade_room_route(
    ));

    // Send a m.room.create event containing a predecessor field and the applicable room_version
-    let mut create_event_content = RoomCreateEventContent::new(sender_user.clone());
+    let mut create_event_content =
+        ruma::events::room::create::CreateEventContent::new(sender_user.clone());
    create_event_content.federate = federate;
    create_event_content.room_version = body.new_version.clone();
    create_event_content.predecessor = predecessor;
@@ -536,7 +497,7 @@ pub async fn upgrade_room_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomCreate,
-            content: to_raw_value(&create_event_content)
+            content: serde_json::to_value(create_event_content)
                .expect("event is valid, we just created it"),
            unsigned: None,
            state_key: Some("".to_owned()),
@@ -552,13 +513,13 @@ pub async fn upgrade_room_route(
    db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomMember,
-            content: to_raw_value(&RoomMemberEventContent {
-                membership: MembershipState::Join,
-                displayname: db.users.displayname(sender_user)?,
-                avatar_url: db.users.avatar_url(sender_user)?,
+            content: serde_json::to_value(member::MemberEventContent {
+                membership: member::MembershipState::Join,
+                displayname: db.users.displayname(&sender_user)?,
+                avatar_url: db.users.avatar_url(&sender_user)?,
                is_direct: None,
                third_party_invite: None,
-                blurhash: db.users.blurhash(sender_user)?,
+                blurhash: db.users.blurhash(&sender_user)?,
                reason: None,
            })
            .expect("event is valid, we just created it"),
@@ -614,14 +575,17 @@ pub async fn upgrade_room_route(
    }

    // Get the old room power levels
-    let mut power_levels_event_content: RoomPowerLevelsEventContent = serde_json::from_str(
-        db.rooms
-            .room_state_get(&body.room_id, &EventType::RoomPowerLevels, "")?
-            .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))?
-            .content
-            .get(),
-    )
-    .map_err(|_| Error::bad_database("Invalid room event in database."))?;
+    let mut power_levels_event_content =
+        serde_json::from_value::<Raw<ruma::events::room::power_levels::PowerLevelsEventContent>>(
+            db.rooms
+                .room_state_get(&body.room_id, &EventType::RoomPowerLevels, "")?
+                .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))?
+                .content
+                .clone(),
+        )
+        .expect("database contains invalid PDU")
+        .deserialize()
+        .map_err(|_| Error::bad_database("Invalid room event in database."))?;

    // Setting events_default and invite to the greater of 50 and users_default + 1
    let new_level = max(
@@ -635,7 +599,7 @@ pub async fn upgrade_room_route(
    let _ = db.rooms.build_and_append_pdu(
        PduBuilder {
            event_type: EventType::RoomPowerLevels,
-            content: to_raw_value(&power_levels_event_content)
+            content: serde_json::to_value(power_levels_event_content)
                .expect("event is valid, we just created it"),
            unsigned: None,
            state_key: Some("".to_owned()),
@@ -6,11 +6,6 @@ use rocket::post;
 use search_events::{EventContextResult, ResultCategories, ResultRoomEvents, SearchResult};
 use std::collections::BTreeMap;

-/// # `POST /_matrix/client/r0/search`
-///
-/// Searches rooms for messages.
-///
-/// - Only works if the user is currently joined to the room (TODO: Respect history visibility)
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/search", data = "<body>")
@@ -27,7 +22,7 @@ pub async fn search_events_route(

    let room_ids = filter.rooms.clone().unwrap_or_else(|| {
        db.rooms
-            .rooms_joined(sender_user)
+            .rooms_joined(&sender_user)
            .filter_map(|r| r.ok())
            .collect()
    });
@@ -74,7 +69,7 @@ pub async fn search_events_route(
        }
    }

-    let results: Vec<_> = results
+    let results = results
        .iter()
        .map(|result| {
            Ok::<_, Error>(SearchResult {
@@ -88,14 +83,14 @@ pub async fn search_events_route(
                rank: None,
                result: db
                    .rooms
-                    .get_pdu_from_id(result)?
+                    .get_pdu_from_id(&result)?
                    .map(|pdu| pdu.to_room_event()),
            })
        })
        .filter_map(|r| r.ok())
        .skip(skip)
        .take(limit)
-        .collect();
+        .collect::<Vec<_>>();

    let next_batch = if results.len() < limit as usize {
        None
@@ -114,7 +109,7 @@ pub async fn search_events_route(
                .search_term
                .split_terminator(|c: char| !c.is_alphanumeric())
                .map(str::to_lowercase)
-                .collect(),
+                .collect::<Vec<_>>(),
        },
    })
    .into())
@@ -24,7 +24,7 @@ use rocket::{get, post};

 /// # `GET /_matrix/client/r0/login`
 ///
-/// Get the supported login types of this server. One of these should be used as the `type` field
+/// Get the homeserver's supported login types. One of these should be used as the `type` field
 /// when logging in.
 #[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/login"))]
 #[tracing::instrument]
@@ -41,10 +41,9 @@ pub async fn get_login_types_route() -> ConduitResult<get_login_types::Response>
 ///
 /// Authenticates the user and returns an access token it can use in subsequent requests.
 ///
-/// - The user needs to authenticate using their password (or if enabled using a json web token)
-/// - If `device_id` is known: invalidates old access token of that device
-/// - If `device_id` is unknown: creates a new device
-/// - Returns access token that is associated with the user and device
+/// - The returned access token is associated with the user and device
+/// - Old access tokens of that device should be invalidated
+/// - If `device_id` is unknown, a new device will be created
 ///
 /// Note: You can use [`GET /_matrix/client/r0/login`](fn.get_supported_versions_route.html) to see
 /// supported login types.
@@ -60,10 +59,10 @@ pub async fn login_route(
    // Validate login method
    // TODO: Other login methods
    let user_id = match &body.login_info {
-        login::IncomingLoginInfo::Password(login::IncomingPassword {
+        login::IncomingLoginInfo::Password {
            identifier,
            password,
-        }) => {
+        } => {
            let username = if let IncomingUserIdentifier::MatrixId(matrix_id) = identifier {
                matrix_id
            } else {
@@ -97,11 +96,11 @@ pub async fn login_route(

            user_id
        }
-        login::IncomingLoginInfo::Token(login::IncomingToken { token }) => {
+        login::IncomingLoginInfo::Token { token } => {
            if let Some(jwt_decoding_key) = db.globals.jwt_decoding_key() {
                let token = jsonwebtoken::decode::<Claims>(
-                    token,
-                    jwt_decoding_key,
+                    &token,
+                    &jwt_decoding_key,
                    &jsonwebtoken::Validation::default(),
                )
                .map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Token is invalid."))?;
@@ -116,12 +115,6 @@ pub async fn login_route(
                ));
            }
        }
-        _ => {
-            return Err(Error::BadRequest(
-                ErrorKind::Unknown,
-                "Unsupported login type.",
-            ));
-        }
    };

    // Generate new device id if the user didn't specify one
@@ -169,10 +162,8 @@ pub async fn login_route(
 ///
 /// Log out the current device.
 ///
-/// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
-/// - Forgets to-device events
-/// - Triggers device list updates
+/// - Invalidates the access token
+/// - Deletes the device and most of it's data (to-device events, last seen, etc.)
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/logout", data = "<body>")
@@ -185,7 +176,7 @@ pub async fn logout_route(
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
    let sender_device = body.sender_device.as_ref().expect("user is authenticated");

-    db.users.remove_device(sender_user, sender_device)?;
+    db.users.remove_device(&sender_user, sender_device)?;

    db.flush()?;

@@ -197,9 +188,7 @@ pub async fn logout_route(
 /// Log out all devices of this user.
 ///
 /// - Invalidates all access tokens
-/// - Deletes all device metadata (device id, device display name, last seen ip, last seen ts)
-/// - Forgets all to-device events
-/// - Triggers device list updates
+/// - Deletes devices and most of their data (to-device events, last seen, etc.)
 ///
 /// Note: This is equivalent to calling [`GET /_matrix/client/r0/logout`](fn.logout_route.html)
 /// from each device of this user.
@@ -215,7 +204,7 @@ pub async fn logout_all_route(
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

    for device_id in db.users.all_device_ids(sender_user).flatten() {
-        db.users.remove_device(sender_user, &device_id)?;
+        db.users.remove_device(&sender_user, &device_id)?;
    }

    db.flush()?;
@@ -10,8 +10,8 @@ use ruma::{
    },
    events::{
        room::{
-            canonical_alias::RoomCanonicalAliasEventContent,
-            history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
+            canonical_alias::CanonicalAliasEventContent,
+            history_visibility::{HistoryVisibility, HistoryVisibilityEventContent},
        },
        AnyStateEventContent, EventType,
    },
@@ -22,13 +22,6 @@ use ruma::{
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, put};

-/// # `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}`
-///
-/// Sends a state event into the room.
-///
-/// - The only requirement for the content is that it has to be valid json
-/// - Tries to send the event into the room, auth rules will determine if it is allowed
-/// - If event is new canonical_alias: Rejects if alias is incorrect
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/rooms/<_>/state/<_>/<_>", data = "<body>")
@@ -55,13 +48,6 @@ pub async fn send_state_event_for_key_route(
    Ok(send_state_event::Response { event_id }.into())
 }

-/// # `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}`
-///
-/// Sends a state event into the room.
-///
-/// - The only requirement for the content is that it has to be valid json
-/// - Tries to send the event into the room, auth rules will determine if it is allowed
-/// - If event is new canonical_alias: Rejects if alias is incorrect
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/rooms/<_>/state/<_>", data = "<body>")
@@ -73,14 +59,6 @@ pub async fn send_state_event_for_empty_key_route(
 ) -> ConduitResult<send_state_event::Response> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    // Forbid m.room.encryption if encryption is disabled
-    if &body.event_type == "m.room.encryption" && !db.globals.allow_encryption() {
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "Encryption has been disabled",
-        ));
-    }
-
    let event_id = send_state_event_for_key_helper(
        &db,
        sender_user,
@@ -96,11 +74,6 @@ pub async fn send_state_event_for_empty_key_route(
    Ok(send_state_event::Response { event_id }.into())
 }

-/// # `GET /_matrix/client/r0/rooms/{roomid}/state`
-///
-/// Get all state events for a room.
-///
-/// - If not joined: Only works if current room history visibility is world readable
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/rooms/<_>/state", data = "<body>")
@@ -120,13 +93,13 @@ pub async fn get_state_events_route(
            db.rooms
                .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")?
                .map(|event| {
-                    serde_json::from_str(event.content.get())
-                        .map(|e: RoomHistoryVisibilityEventContent| e.history_visibility)
+                    serde_json::from_value::<HistoryVisibilityEventContent>(event.content.clone())
                        .map_err(|_| {
                            Error::bad_database(
                                "Invalid room history visibility event in database.",
                            )
                        })
+                        .map(|e| e.history_visibility)
                }),
            Some(Ok(HistoryVisibility::WorldReadable))
        )
@@ -148,11 +121,6 @@ pub async fn get_state_events_route(
    .into())
 }

-/// # `GET /_matrix/client/r0/rooms/{roomid}/state/{eventType}/{stateKey}`
-///
-/// Get single state event of a room.
-///
-/// - If not joined: Only works if current room history visibility is world readable
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/rooms/<_>/state/<_>/<_>", data = "<body>")
@@ -172,13 +140,13 @@ pub async fn get_state_events_for_key_route(
            db.rooms
                .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")?
                .map(|event| {
-                    serde_json::from_str(event.content.get())
-                        .map(|e: RoomHistoryVisibilityEventContent| e.history_visibility)
+                    serde_json::from_value::<HistoryVisibilityEventContent>(event.content.clone())
                        .map_err(|_| {
                            Error::bad_database(
                                "Invalid room history visibility event in database.",
                            )
                        })
+                        .map(|e| e.history_visibility)
                }),
            Some(Ok(HistoryVisibility::WorldReadable))
        )
@@ -198,17 +166,12 @@ pub async fn get_state_events_for_key_route(
        ))?;

    Ok(get_state_events_for_key::Response {
-        content: serde_json::from_str(event.content.get())
+        content: serde_json::from_value(event.content.clone())
            .map_err(|_| Error::bad_database("Invalid event content in database"))?,
    }
    .into())
 }

-/// # `GET /_matrix/client/r0/rooms/{roomid}/state/{eventType}`
-///
-/// Get single state event of a room.
-///
-/// - If not joined: Only works if current room history visibility is world readable
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/rooms/<_>/state/<_>", data = "<body>")
@@ -228,13 +191,13 @@ pub async fn get_state_events_for_empty_key_route(
            db.rooms
                .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")?
                .map(|event| {
-                    serde_json::from_str(event.content.get())
-                        .map(|e: RoomHistoryVisibilityEventContent| e.history_visibility)
+                    serde_json::from_value::<HistoryVisibilityEventContent>(event.content.clone())
                        .map_err(|_| {
                            Error::bad_database(
                                "Invalid room history visibility event in database.",
                            )
                        })
+                        .map(|e| e.history_visibility)
                }),
            Some(Ok(HistoryVisibility::WorldReadable))
        )
@@ -254,13 +217,13 @@ pub async fn get_state_events_for_empty_key_route(
        ))?;

    Ok(get_state_events_for_key::Response {
-        content: serde_json::from_str(event.content.get())
+        content: serde_json::from_value(event.content.clone())
            .map_err(|_| Error::bad_database("Invalid event content in database"))?,
    }
    .into())
 }

-async fn send_state_event_for_key_helper(
+pub async fn send_state_event_for_key_helper(
    db: &Database,
    sender: &UserId,
    room_id: &RoomId,
@@ -270,10 +233,8 @@ async fn send_state_event_for_key_helper(
 ) -> Result<EventId> {
    let sender_user = sender;

-    // TODO: Review this check, error if event is unparsable, use event type, allow alias if it
-    // previously existed
    if let Ok(canonical_alias) =
-        serde_json::from_str::<RoomCanonicalAliasEventContent>(json.json().get())
+        serde_json::from_str::<CanonicalAliasEventContent>(json.json().get())
    {
        let mut aliases = canonical_alias.alt_aliases.clone();

@@ -316,9 +277,9 @@ async fn send_state_event_for_key_helper(
            state_key: Some(state_key),
            redacts: None,
        },
-        sender_user,
-        room_id,
-        db,
+        &sender_user,
+        &room_id,
+        &db,
        &state_lock,
    )?;

@@ -1,10 +1,7 @@
 use crate::{database::DatabaseGuard, ConduitResult, Database, Error, Result, Ruma, RumaResponse};
 use ruma::{
    api::client::r0::{sync::sync_events, uiaa::UiaaResponse},
-    events::{
-        room::member::{MembershipState, RoomMemberEventContent},
-        AnySyncEphemeralRoomEvent, EventType,
-    },
+    events::{room::member::MembershipState, AnySyncEphemeralRoomEvent, EventType},
    serde::Raw,
    DeviceId, RoomId, UserId,
 };
@@ -25,33 +22,12 @@ use rocket::{get, tokio};
 /// Synchronize the client's state with the latest state on the server.
 ///
 /// - This endpoint takes a `since` parameter which should be the `next_batch` value from a
-/// previous request for incremental syncs.
-///
-/// Calling this endpoint without a `since` parameter returns:
-/// - Some of the most recent events of each timeline
-/// - Notification counts for each room
-/// - Joined and invited member counts, heroes
-/// - All state events
-///
-/// Calling this endpoint with a `since` parameter from a previous `next_batch` returns:
-/// For joined rooms:
-/// - Some of the most recent events of each timeline that happened after since
-/// - If user joined the room after since: All state events and device list updates in that room
-/// - If the user was already in the room: A list of all events that are in the state now, but were
-/// not in the state at `since`
-/// - If the state we send contains a member event: Joined and invited member counts, heroes
-/// - Device list updates that happened after `since`
-/// - If there are events in the timeline we send or the user send updated his read mark: Notification counts
-/// - EDUs that are active now (read receipts, typing updates, presence)
-///
-/// For invited rooms:
-/// - If the user was invited after `since`: A subset of the state of the room at the point of the invite
-///
-/// For left rooms:
-/// - If the user left after `since`: prev_batch token, empty state (TODO: subset of the state at the point of the leave)
-///
-/// - Sync is handled in an async task, multiple requests from the same device with the same
-/// `since` will be cached
+/// previous request.
+/// - Calling this endpoint without a `since` parameter will return all recent events, the state
+/// of all rooms and more data. This should only be called on the initial login of the device.
+/// - To get incremental updates, you can call this endpoint with a `since` parameter. This will
+/// return all recent events, state updates and more data that happened since the last /sync
+/// request.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/sync", data = "<body>")
@@ -60,7 +36,7 @@ use rocket::{get, tokio};
 pub async fn sync_events_route(
    db: DatabaseGuard,
    body: Ruma<sync_events::Request<'_>>,
-) -> Result<RumaResponse<sync_events::Response>, RumaResponse<UiaaResponse>> {
+) -> std::result::Result<RumaResponse<sync_events::Response>, RumaResponse<UiaaResponse>> {
    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
    let sender_device = body.sender_device.as_ref().expect("user is authenticated");

@@ -130,7 +106,7 @@ pub async fn sync_events_route(
    result
 }

-async fn sync_helper_wrapper(
+pub async fn sync_helper_wrapper(
    db: Arc<DatabaseGuard>,
    sender_user: UserId,
    sender_device: Box<DeviceId>,
@@ -182,7 +158,7 @@ async fn sync_helper(
    full_state: bool,
    timeout: Option<Duration>,
    // bool = caching allowed
-) -> Result<(sync_events::Response, bool), Error> {
+) -> std::result::Result<(sync_events::Response, bool), Error> {
    // TODO: match body.set_presence {
    db.rooms.edus.ping_presence(&sender_user)?;

@@ -244,13 +220,13 @@ async fn sync_helper(
            });

        // Take the last 10 events for the timeline
-        let timeline_pdus: Vec<_> = non_timeline_pdus
+        let timeline_pdus = non_timeline_pdus
            .by_ref()
            .take(10)
            .collect::<Vec<_>>()
            .into_iter()
            .rev()
-            .collect();
+            .collect::<Vec<_>>();

        let send_notification_counts = !timeline_pdus.is_empty()
            || db
@@ -270,6 +246,12 @@ async fn sync_helper(
            .current_shortstatehash(&room_id)?
            .expect("All rooms have state");

+        let pdus_after_since = db
+            .rooms
+            .pdus_after(&sender_user, &room_id, since)?
+            .next()
+            .is_some();
+
        let since_shortstatehash = db.rooms.get_token_shortstatehash(&room_id, since)?;

        // Calculates joined_member_count, invited_member_count and heroes
@@ -290,10 +272,10 @@ async fn sync_helper(
                    .filter_map(|pdu| pdu.ok()) // Ignore all broken pdus
                    .filter(|(_, pdu)| pdu.kind == EventType::RoomMember)
                    .map(|(_, pdu)| {
-                        let content: RoomMemberEventContent =
-                            serde_json::from_str(pdu.content.get()).map_err(|_| {
-                                Error::bad_database("Invalid member event in database.")
-                            })?;
+                        let content = serde_json::from_value::<
+                            ruma::events::room::member::MemberEventContent,
+                        >(pdu.content.clone())
+                        .map_err(|_| Error::bad_database("Invalid member event in database."))?;

                        if let Some(state_key) = &pdu.state_key {
                            let user_id = UserId::try_from(state_key.clone()).map_err(|_| {
@@ -346,11 +328,11 @@ async fn sync_helper(
            let (joined_member_count, invited_member_count, heroes) = calculate_counts()?;

            let current_state_ids = db.rooms.state_full_ids(current_shortstatehash)?;
-            let state_events: Vec<_> = current_state_ids
+            let state_events = current_state_ids
                .iter()
                .map(|(_, id)| db.rooms.get_pdu(id))
                .filter_map(|r| r.ok().flatten())
-                .collect();
+                .collect::<Vec<_>>();

            (
                heroes,
@@ -359,14 +341,14 @@ async fn sync_helper(
                true,
                state_events,
            )
-        } else if timeline_pdus.is_empty() && since_shortstatehash == Some(current_shortstatehash) {
+        } else if !pdus_after_since && since_shortstatehash == Some(current_shortstatehash) {
            // No state changes
            (Vec::new(), None, None, false, Vec::new())
        } else {
            // Incremental /sync
            let since_shortstatehash = since_shortstatehash.unwrap();

-            let since_sender_member: Option<RoomMemberEventContent> = db
+            let since_sender_member = db
                .rooms
                .state_get(
                    since_shortstatehash,
@@ -374,9 +356,13 @@ async fn sync_helper(
                    sender_user.as_str(),
                )?
                .and_then(|pdu| {
-                    serde_json::from_str(pdu.content.get())
-                        .map_err(|_| Error::bad_database("Invalid PDU in database."))
-                        .ok()
+                    serde_json::from_value::<Raw<ruma::events::room::member::MemberEventContent>>(
+                        pdu.content.clone(),
+                    )
+                    .expect("Raw::from_value always works")
+                    .deserialize()
+                    .map_err(|_| Error::bad_database("Invalid PDU in database."))
+                    .ok()
                });

            let joined_since_last_sync = since_sender_member
@@ -415,7 +401,10 @@ async fn sync_helper(

            let send_member_count = state_events
                .iter()
-                .any(|event| event.kind == EventType::RoomMember);
+                .any(|event| event.kind == EventType::RoomMember)
+                || timeline_pdus.iter().any(|(_, event)| {
+                    event.state_key.is_some() && event.kind == EventType::RoomMember
+                });

            if encrypted_room {
                for state_event in &state_events {
@@ -431,9 +420,11 @@ async fn sync_helper(
                            continue;
                        }

-                        let new_membership = serde_json::from_str::<RoomMemberEventContent>(
-                            state_event.content.get(),
-                        )
+                        let new_membership = serde_json::from_value::<
+                            Raw<ruma::events::room::member::MemberEventContent>,
+                        >(state_event.content.clone())
+                        .expect("Raw::from_value always works")
+                        .deserialize()
                        .map_err(|_| Error::bad_database("Invalid PDU in database."))?
                        .membership;

@@ -522,18 +513,18 @@ async fn sync_helper(
                Ok(Some(db.rooms.pdu_count(pdu_id)?.to_string()))
            })?;

-        let room_events: Vec<_> = timeline_pdus
+        let room_events = timeline_pdus
            .iter()
            .map(|(_, pdu)| pdu.to_sync_room_event())
-            .collect();
+            .collect::<Vec<_>>();

-        let mut edus: Vec<_> = db
+        let mut edus = db
            .rooms
            .edus
            .readreceipts_since(&room_id, since)
            .filter_map(|r| r.ok()) // Filter out buggy events
            .map(|(_, _, v)| v)
-            .collect();
+            .collect::<Vec<_>>();

        if db.rooms.edus.last_typing_update(&room_id, &db.globals)? > since {
            edus.push(
@@ -562,7 +553,7 @@ async fn sync_helper(
                            .map_err(|_| Error::bad_database("Invalid account event in database."))
                            .ok()
                    })
-                    .collect(),
+                    .collect::<Vec<_>>(),
            },
            summary: sync_events::RoomSummary {
                heroes,
@@ -627,7 +618,7 @@ async fn sync_helper(
    }

    let mut left_rooms = BTreeMap::new();
-    let all_left_rooms: Vec<_> = db.rooms.rooms_left(&sender_user).collect();
+    let all_left_rooms = db.rooms.rooms_left(&sender_user).collect::<Vec<_>>();
    for result in all_left_rooms {
        let (room_id, left_state_events) = result?;

@@ -667,7 +658,7 @@ async fn sync_helper(
    }

    let mut invited_rooms = BTreeMap::new();
-    let all_invited_rooms: Vec<_> = db.rooms.rooms_invited(&sender_user).collect();
+    let all_invited_rooms = db.rooms.rooms_invited(&sender_user).collect::<Vec<_>>();
    for result in all_invited_rooms {
        let (room_id, invite_state_events) = result?;

@@ -736,7 +727,7 @@ async fn sync_helper(
        presence: sync_events::Presence {
            events: presence_updates
                .into_iter()
-                .map(|(_, v)| Raw::new(&v).expect("PresenceEvent always serializes successfully"))
+                .map(|(_, v)| Raw::from(v))
                .collect(),
        },
        account_data: sync_events::GlobalAccountData {
@@ -749,13 +740,19 @@ async fn sync_helper(
                        .map_err(|_| Error::bad_database("Invalid account event in database."))
                        .ok()
                })
-                .collect(),
+                .collect::<Vec<_>>(),
        },
        device_lists: sync_events::DeviceLists {
            changed: device_list_updates.into_iter().collect(),
            left: device_list_left.into_iter().collect(),
        },
-        device_one_time_keys_count: db.users.count_one_time_keys(&sender_user, &sender_device)?,
+        device_one_time_keys_count: if db.users.last_one_time_keys_update(&sender_user)? > since
+            || since == 0
+        {
+            db.users.count_one_time_keys(&sender_user, &sender_device)?
+        } else {
+            BTreeMap::new()
+        },
        to_device: sync_events::ToDevice {
            events: db
                .users
@@ -769,6 +766,7 @@ async fn sync_helper(
        && response.presence.is_empty()
        && response.account_data.is_empty()
        && response.device_lists.is_empty()
+        && response.device_one_time_keys_count.is_empty()
        && response.to_device.is_empty()
    {
        // Hang a few seconds so requests are not spammed
@@ -1,21 +1,13 @@
 use crate::{database::DatabaseGuard, ConduitResult, Ruma};
 use ruma::{
    api::client::r0::tag::{create_tag, delete_tag, get_tags},
-    events::{
-        tag::{TagEvent, TagEventContent},
-        EventType,
-    },
+    events::EventType,
 };
 use std::collections::BTreeMap;

 #[cfg(feature = "conduit_bin")]
 use rocket::{delete, get, put};

-/// # `PUT /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag}`
-///
-/// Adds a tag to the room.
-///
-/// - Inserts the tag into the tag event of the room account data.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/user/<_>/rooms/<_>/tags/<_>", data = "<body>")
@@ -29,9 +21,9 @@ pub async fn update_tag_route(

    let mut tags_event = db
        .account_data
-        .get(Some(&body.room_id), sender_user, EventType::Tag)?
-        .unwrap_or_else(|| TagEvent {
-            content: TagEventContent {
+        .get::<ruma::events::tag::TagEvent>(Some(&body.room_id), sender_user, EventType::Tag)?
+        .unwrap_or_else(|| ruma::events::tag::TagEvent {
+            content: ruma::events::tag::TagEventContent {
                tags: BTreeMap::new(),
            },
        });
@@ -53,11 +45,6 @@ pub async fn update_tag_route(
    Ok(create_tag::Response {}.into())
 }

-/// # `DELETE /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag}`
-///
-/// Deletes a tag from the room.
-///
-/// - Removes the tag from the tag event of the room account data.
 #[cfg_attr(
    feature = "conduit_bin",
    delete("/_matrix/client/r0/user/<_>/rooms/<_>/tags/<_>", data = "<body>")
@@ -71,9 +58,9 @@ pub async fn delete_tag_route(

    let mut tags_event = db
        .account_data
-        .get(Some(&body.room_id), sender_user, EventType::Tag)?
-        .unwrap_or_else(|| TagEvent {
-            content: TagEventContent {
+        .get::<ruma::events::tag::TagEvent>(Some(&body.room_id), sender_user, EventType::Tag)?
+        .unwrap_or_else(|| ruma::events::tag::TagEvent {
+            content: ruma::events::tag::TagEventContent {
                tags: BTreeMap::new(),
            },
        });
@@ -92,11 +79,6 @@ pub async fn delete_tag_route(
    Ok(delete_tag::Response {}.into())
 }

-/// # `GET /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags`
-///
-/// Returns tags on the room.
-///
-/// - Gets the tag event of the room account data.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/user/<_>/rooms/<_>/tags", data = "<body>")
@@ -111,9 +93,9 @@ pub async fn get_tags_route(
    Ok(get_tags::Response {
        tags: db
            .account_data
-            .get(Some(&body.room_id), sender_user, EventType::Tag)?
-            .unwrap_or_else(|| TagEvent {
-                content: TagEventContent {
+            .get::<ruma::events::tag::TagEvent>(Some(&body.room_id), sender_user, EventType::Tag)?
+            .unwrap_or_else(|| ruma::events::tag::TagEvent {
+                content: ruma::events::tag::TagEventContent {
                    tags: BTreeMap::new(),
                },
            })
@@ -5,9 +5,6 @@ use ruma::api::client::r0::thirdparty::get_protocols;
 use rocket::get;
 use std::collections::BTreeMap;

-/// # `GET /_matrix/client/r0/thirdparty/protocols`
-///
-/// TODO: Fetches all metadata about protocols supported by the homeserver.
 #[cfg_attr(
    feature = "conduit_bin",
    get("/_matrix/client/r0/thirdparty/protocols")
@@ -13,9 +13,6 @@ use ruma::{
 #[cfg(feature = "conduit_bin")]
 use rocket::put;

-/// # `PUT /_matrix/client/r0/sendToDevice/{eventType}/{txnId}`
-///
-/// Send a to-device event to a set of client devices.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/sendToDevice/<_>/<_>", data = "<body>")
@@ -68,8 +65,8 @@ pub async fn send_event_to_device_route(
            match target_device_id_maybe {
                DeviceIdOrAllDevices::DeviceId(target_device_id) => db.users.add_to_device_event(
                    sender_user,
-                    target_user_id,
-                    target_device_id,
+                    &target_user_id,
+                    &target_device_id,
                    &body.event_type,
                    event.deserialize_as().map_err(|_| {
                        Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid")
@@ -78,10 +75,10 @@ pub async fn send_event_to_device_route(
                )?,

                DeviceIdOrAllDevices::AllDevices => {
-                    for target_device_id in db.users.all_device_ids(target_user_id) {
+                    for target_device_id in db.users.all_device_ids(&target_user_id) {
                        db.users.add_to_device_event(
                            sender_user,
-                            target_user_id,
+                            &target_user_id,
                            &target_device_id?,
                            &body.event_type,
                            event.deserialize_as().map_err(|_| {
@@ -5,9 +5,6 @@ use ruma::api::client::r0::typing::create_typing_event;
 #[cfg(feature = "conduit_bin")]
 use rocket::put;

-/// # `PUT /_matrix/client/r0/rooms/{roomId}/typing/{userId}`
-///
-/// Sets the typing state of the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
    put("/_matrix/client/r0/rooms/<_>/typing/<_>", data = "<body>")
@@ -21,7 +18,7 @@ pub fn create_typing_event_route(

    if let Typing::Yes(duration) = body.state {
        db.rooms.edus.typing_add(
-            sender_user,
+            &sender_user,
            &body.room_id,
            duration.as_millis() as u64 + utils::millis_since_unix_epoch(),
            &db.globals,
@@ -29,7 +26,7 @@ pub fn create_typing_event_route(
    } else {
        db.rooms
            .edus
-            .typing_remove(sender_user, &body.room_id, &db.globals)?;
+            .typing_remove(&sender_user, &body.room_id, &db.globals)?;
    }

    Ok(create_typing_event::Response {}.into())
@@ -10,7 +10,7 @@ use rocket::get;
 ///
 /// - Versions take the form MAJOR.MINOR.PATCH
 /// - Only the latest PATCH release will be reported for each MAJOR.MINOR value
-/// - Unstable features are namespaced and may include version information in their name
+/// - Unstable features should be namespaced and may include version information in their name
 ///
 /// Note: Unstable features are used while developing new features. Clients should avoid using
 /// unstable features in their stable releases
@@ -4,11 +4,6 @@ use ruma::api::client::r0::user_directory::search_users;
 #[cfg(feature = "conduit_bin")]
 use rocket::post;

-/// # `POST /_matrix/client/r0/user_directory/search`
-///
-/// Searches all known users for a match.
-///
-/// - TODO: Hide users that are not in any public rooms?
 #[cfg_attr(
    feature = "conduit_bin",
    post("/_matrix/client/r0/user_directory/search", data = "<body>")
@@ -5,9 +5,6 @@ use std::time::Duration;
 #[cfg(feature = "conduit_bin")]
 use rocket::get;

-/// # `GET /_matrix/client/r0/voip/turnServer`
-///
-/// TODO: Returns information about the recommended turn server.
 #[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/voip/turnServer"))]
 #[tracing::instrument]
 pub async fn turn_server_route() -> ConduitResult<get_turn_server_info::Response> {
@@ -47,22 +47,18 @@ pub struct Config {
    database_path: String,
    #[serde(default = "default_db_cache_capacity_mb")]
    db_cache_capacity_mb: f64,
-    #[serde(default = "default_pdu_cache_capacity")]
-    pdu_cache_capacity: u32,
    #[serde(default = "default_sqlite_wal_clean_second_interval")]
    sqlite_wal_clean_second_interval: u32,
    #[serde(default = "default_max_request_size")]
    max_request_size: u32,
    #[serde(default = "default_max_concurrent_requests")]
    max_concurrent_requests: u16,
-    #[serde(default = "false_fn")]
+    #[serde(default = "true_fn")]
    allow_registration: bool,
    #[serde(default = "true_fn")]
    allow_encryption: bool,
    #[serde(default = "false_fn")]
    allow_federation: bool,
-    #[serde(default = "true_fn")]
-    allow_room_creation: bool,
    #[serde(default = "false_fn")]
    pub allow_jaeger: bool,
    #[serde(default = "false_fn")]
@@ -74,11 +70,6 @@ pub struct Config {
    trusted_servers: Vec<Box<ServerName>>,
    #[serde(default = "default_log")]
    pub log: String,
-    /// If enabled, Conduit will serve /.wellknown/matrix files that point to the configured server_name.
-    /// This should make it easier, if you only host Conduit on the same domain as the server_name.
-    /// E.g. setting server_name: "matrix.example.com" -> other servers are directed to "https://matrix.example.com:443"
-    #[serde(default = "false_fn")]
-    pub serve_wellknown: bool,

    #[serde(flatten)]
    catchall: BTreeMap<String, IgnoredAny>,
@@ -116,10 +107,6 @@ fn default_db_cache_capacity_mb() -> f64 {
    200.0
 }

-fn default_pdu_cache_capacity() -> u32 {
-    100_000
-}
-
 fn default_sqlite_wal_clean_second_interval() -> u32 {
    1 * 60 // every minute
 }
@@ -203,14 +190,9 @@ impl Database {

    /// Load an existing database or create a new one.
    pub async fn load_or_create(config: &Config) -> Result<Arc<TokioRwLock<Self>>> {
-        Self::check_sled_or_sqlite_db(config)?;
+        Self::check_sled_or_sqlite_db(&config)?;

-        if !Path::new(&config.database_path).exists() {
-            std::fs::create_dir_all(&config.database_path)
-                .map_err(|_| Error::BadConfig("Database folder doesn't exists and couldn't be created (e.g. due to missing permissions). Please create the database folder yourself."))?;
-        }
-
-        let builder = Engine::open(config)?;
+        let builder = Engine::open(&config)?;

        if config.max_request_size < 1024 {
            eprintln!("ERROR: Max request size is less than 1KB. Please increase it.");
@@ -299,20 +281,14 @@ impl Database {
                softfailedeventids: builder.open_tree("softfailedeventids")?,

                referencedevents: builder.open_tree("referencedevents")?,
-                pdu_cache: Mutex::new(LruCache::new(
-                    config
-                        .pdu_cache_capacity
-                        .try_into()
-                        .expect("pdu cache capacity fits into usize"),
-                )),
+                pdu_cache: Mutex::new(LruCache::new(100_000)),
                auth_chain_cache: Mutex::new(LruCache::new(1_000_000)),
                shorteventid_cache: Mutex::new(LruCache::new(1_000_000)),
                eventidshort_cache: Mutex::new(LruCache::new(1_000_000)),
                shortstatekey_cache: Mutex::new(LruCache::new(1_000_000)),
                statekeyshort_cache: Mutex::new(LruCache::new(1_000_000)),
-                our_real_users_cache: RwLock::new(HashMap::new()),
-                appservice_in_room_cache: RwLock::new(HashMap::new()),
                stateinfo_cache: Mutex::new(LruCache::new(1000)),
+                our_real_users_cache: RwLock::new(HashMap::new()),
            },
            account_data: account_data::AccountData {
                roomuserdataid_accountdata: builder.open_tree("roomuserdataid_accountdata")?,
@@ -506,13 +482,13 @@ impl Database {
                            if let Some(parent_stateinfo) = states_parents.last() {
                                let statediffnew = current_state
                                    .difference(&parent_stateinfo.1)
-                                    .copied()
+                                    .cloned()
                                    .collect::<HashSet<_>>();

                                let statediffremoved = parent_stateinfo
                                    .1
                                    .difference(&current_state)
-                                    .copied()
+                                    .cloned()
                                    .collect::<HashSet<_>>();

                                (statediffnew, statediffremoved)
@@ -625,7 +601,7 @@ impl Database {
                    let short_room_id = db
                        .rooms
                        .roomid_shortroomid
-                        .get(room_id)
+                        .get(&room_id)
                        .unwrap()
                        .expect("shortroomid should exist");

@@ -648,7 +624,7 @@ impl Database {
                    let short_room_id = db
                        .rooms
                        .roomid_shortroomid
-                        .get(room_id)
+                        .get(&room_id)
                        .unwrap()
                        .expect("shortroomid should exist");

@@ -667,7 +643,7 @@ impl Database {

            if db.globals.database_version()? < 9 {
                // Update tokenids db layout
-                let mut iter = db
+                let batch = db
                    .rooms
                    .tokenids
                    .iter()
@@ -684,7 +660,7 @@ impl Database {
                        let short_room_id = db
                            .rooms
                            .roomid_shortroomid
-                            .get(room_id)
+                            .get(&room_id)
                            .unwrap()
                            .expect("shortroomid should exist");
                        let mut new_key = short_room_id;
@@ -695,7 +671,9 @@ impl Database {
                        println!("new {:?}", new_key);
                        Some((new_key, Vec::new()))
                    })
-                    .peekable();
+                    .collect::<Vec<_>>();
+
+                let mut iter = batch.into_iter().peekable();

                while iter.peek().is_some() {
                    db.rooms
@@ -706,7 +684,7 @@ impl Database {

                println!("Deleting starts");

-                let batch2: Vec<_> = db
+                let batch2 = db
                    .rooms
                    .tokenids
                    .iter()
@@ -718,7 +696,7 @@ impl Database {
                            None
                        }
                    })
-                    .collect();
+                    .collect::<Vec<_>>();

                for key in batch2 {
                    println!("del");
@@ -764,7 +742,7 @@ impl Database {

        #[cfg(feature = "sqlite")]
        {
-            Self::start_wal_clean_task(Arc::clone(&db), config).await;
+            Self::start_wal_clean_task(Arc::clone(&db), &config).await;
        }

        Ok(db)
@@ -822,21 +800,12 @@ impl Database {

        // Events for rooms we are in
        for room_id in self.rooms.rooms_joined(user_id).filter_map(|r| r.ok()) {
-            let short_roomid = self
-                .rooms
-                .get_shortroomid(&room_id)
-                .ok()
-                .flatten()
-                .expect("room exists")
-                .to_be_bytes()
-                .to_vec();
-
            let roomid_bytes = room_id.as_bytes().to_vec();
            let mut roomid_prefix = roomid_bytes.clone();
            roomid_prefix.push(0xff);

            // PDUs
-            futures.push(self.rooms.pduid_pdu.watch_prefix(&short_roomid));
+            futures.push(self.rooms.pduid_pdu.watch_prefix(&roomid_prefix));

            // EDUs
            futures.push(
@@ -971,7 +940,7 @@ impl<'r> FromRequest<'r> for DatabaseGuard {
    async fn from_request(req: &'r Request<'_>) -> rocket::request::Outcome<Self, ()> {
        let db = try_outcome!(req.guard::<&State<Arc<TokioRwLock<Database>>>>().await);

-        Ok(DatabaseGuard(Arc::clone(db).read_owned().await)).or_forward(())
+        Ok(DatabaseGuard(Arc::clone(&db).read_owned().await)).or_forward(())
    }
 }

@@ -22,7 +22,7 @@ pub trait Tree: Send + Sync {
    fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>>;

    fn insert(&self, key: &[u8], value: &[u8]) -> Result<()>;
-    fn insert_batch(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()>;
+    fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()>;

    fn remove(&self, key: &[u8]) -> Result<()>;

@@ -35,7 +35,7 @@ pub trait Tree: Send + Sync {
    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a>;

    fn increment(&self, key: &[u8]) -> Result<Vec<u8>>;
-    fn increment_batch(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()>;
+    fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()>;

    fn scan_prefix<'a>(
        &'a self,
@@ -4,14 +4,13 @@ use parking_lot::{Mutex, MutexGuard, RwLock};
 use rusqlite::{Connection, DatabaseName::Main, OptionalExtension};
 use std::{
    cell::RefCell,
-    collections::{hash_map, HashMap},
+    collections::HashMap,
    future::Future,
    path::{Path, PathBuf},
    pin::Pin,
    sync::Arc,
 };
-use thread_local::ThreadLocal;
-use tokio::sync::watch;
+use tokio::sync::oneshot::Sender;
 use tracing::debug;

 thread_local! {
@@ -41,8 +40,6 @@ impl<T> Drop for NonAliasingBox<T> {

 pub struct Engine {
    writer: Mutex<Connection>,
-    read_conn_tls: ThreadLocal<Connection>,
-    read_iterator_conn_tls: ThreadLocal<Connection>,

    path: PathBuf,
    cache_size_per_thread: u32,
@@ -56,7 +53,7 @@ impl Engine {
        conn.pragma_update(Some(Main), "journal_mode", &"WAL")?;
        conn.pragma_update(Some(Main), "synchronous", &"NORMAL")?;
        conn.pragma_update(Some(Main), "cache_size", &(-i64::from(cache_size_kb)))?;
-        conn.pragma_update(Some(Main), "wal_autocheckpoint", &0)?;
+        conn.pragma_update(Some(Main), "wal_autocheckpoint", &2000)?;

        Ok(conn)
    }
@@ -65,19 +62,39 @@ impl Engine {
        self.writer.lock()
    }

-    fn read_lock(&self) -> &Connection {
-        self.read_conn_tls
-            .get_or(|| Self::prepare_conn(&self.path, self.cache_size_per_thread).unwrap())
+    fn read_lock(&self) -> &'static Connection {
+        READ_CONNECTION.with(|cell| {
+            let connection = &mut cell.borrow_mut();
+
+            if (*connection).is_none() {
+                let c = Box::leak(Box::new(
+                    Self::prepare_conn(&self.path, self.cache_size_per_thread).unwrap(),
+                ));
+                **connection = Some(c);
+            }
+
+            connection.unwrap()
+        })
    }

-    fn read_lock_iterator(&self) -> &Connection {
-        self.read_iterator_conn_tls
-            .get_or(|| Self::prepare_conn(&self.path, self.cache_size_per_thread).unwrap())
+    fn read_lock_iterator(&self) -> &'static Connection {
+        READ_CONNECTION_ITERATOR.with(|cell| {
+            let connection = &mut cell.borrow_mut();
+
+            if (*connection).is_none() {
+                let c = Box::leak(Box::new(
+                    Self::prepare_conn(&self.path, self.cache_size_per_thread).unwrap(),
+                ));
+                **connection = Some(c);
+            }
+
+            connection.unwrap()
+        })
    }

    pub fn flush_wal(self: &Arc<Self>) -> Result<()> {
        self.write_lock()
-            .pragma_update(Some(Main), "wal_checkpoint", &"RESTART")?;
+            .pragma_update(Some(Main), "wal_checkpoint", &"TRUNCATE")?;
        Ok(())
    }
 }
@@ -88,18 +105,15 @@ impl DatabaseEngine for Engine {

        // calculates cache-size per permanent connection
        // 1. convert MB to KiB
-        // 2. divide by permanent connections + permanent iter connections + write connection
+        // 2. divide by permanent connections
        // 3. round down to nearest integer
-        let cache_size_per_thread: u32 = ((config.db_cache_capacity_mb * 1024.0)
-            / ((num_cpus::get().max(1) * 2) + 1) as f64)
-            as u32;
+        let cache_size_per_thread: u32 =
+            ((config.db_cache_capacity_mb * 1024.0) / (num_cpus::get().max(1) + 1) as f64) as u32;

        let writer = Mutex::new(Self::prepare_conn(&path, cache_size_per_thread)?);

        let arc = Arc::new(Engine {
            writer,
-            read_conn_tls: ThreadLocal::new(),
-            read_iterator_conn_tls: ThreadLocal::new(),
            path,
            cache_size_per_thread,
        });
@@ -126,7 +140,7 @@ impl DatabaseEngine for Engine {
 pub struct SqliteTable {
    engine: Arc<Engine>,
    name: String,
-    watchers: RwLock<HashMap<Vec<u8>, (watch::Sender<()>, watch::Receiver<()>)>>,
+    watchers: RwLock<HashMap<Vec<u8>, Vec<Sender<()>>>>,
 }

 type TupleOfBytes = (Vec<u8>, Vec<u8>);
@@ -134,7 +148,6 @@ type TupleOfBytes = (Vec<u8>, Vec<u8>);
 impl SqliteTable {
    #[tracing::instrument(skip(self, guard, key))]
    fn get_with_guard(&self, guard: &Connection, key: &[u8]) -> Result<Option<Vec<u8>>> {
-        //dbg!(&self.name);
        Ok(guard
            .prepare(format!("SELECT value FROM {} WHERE key = ?", self.name).as_str())?
            .query_row([key], |row| row.get(0))
@@ -143,7 +156,6 @@ impl SqliteTable {

    #[tracing::instrument(skip(self, guard, key, value))]
    fn insert_with_guard(&self, guard: &Connection, key: &[u8], value: &[u8]) -> Result<()> {
-        //dbg!(&self.name);
        guard.execute(
            format!(
                "INSERT OR REPLACE INTO {} (key, value) VALUES (?, ?)",
@@ -170,16 +182,11 @@ impl SqliteTable {

        let statement_ref = NonAliasingBox(statement);

-        //let name = self.name.clone();
-
        let iterator = Box::new(
            statement
                .query_map([], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
                .unwrap()
-                .map(move |r| {
-                    //dbg!(&name);
-                    r.unwrap()
-                }),
+                .map(|r| r.unwrap()),
        );

        Box::new(PreparedStatementIterator {
@@ -192,7 +199,7 @@ impl SqliteTable {
 impl Tree for SqliteTable {
    #[tracing::instrument(skip(self, key))]
    fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
-        self.get_with_guard(self.engine.read_lock(), key)
+        self.get_with_guard(&self.engine.read_lock(), key)
    }

    #[tracing::instrument(skip(self, key, value))]
@@ -215,8 +222,10 @@ impl Tree for SqliteTable {
        if !triggered.is_empty() {
            let mut watchers = self.watchers.write();
            for prefix in triggered {
-                if let Some(tx) = watchers.remove(prefix) {
-                    let _ = tx.0.send(());
+                if let Some(txs) = watchers.remove(prefix) {
+                    for tx in txs {
+                        let _ = tx.send(());
+                    }
                }
            }
        };
@@ -273,7 +282,7 @@ impl Tree for SqliteTable {
    fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
        let guard = self.engine.read_lock_iterator();

-        self.iter_with_guard(guard)
+        self.iter_with_guard(&guard)
    }

    #[tracing::instrument(skip(self, from, backwards))]
@@ -285,8 +294,6 @@ impl Tree for SqliteTable {
        let guard = self.engine.read_lock_iterator();
        let from = from.to_vec(); // TODO change interface?

-        //let name = self.name.clone();
-
        if backwards {
            let statement = Box::leak(Box::new(
                guard
@@ -303,10 +310,7 @@ impl Tree for SqliteTable {
                statement
                    .query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
                    .unwrap()
-                    .map(move |r| {
-                        //dbg!(&name);
-                        r.unwrap()
-                    }),
+                    .map(|r| r.unwrap()),
            );
            Box::new(PreparedStatementIterator {
                iterator,
@@ -328,10 +332,7 @@ impl Tree for SqliteTable {
                statement
                    .query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
                    .unwrap()
-                    .map(move |r| {
-                        //dbg!(&name);
-                        r.unwrap()
-                    }),
+                    .map(|r| r.unwrap()),
            );

            Box::new(PreparedStatementIterator {
@@ -365,18 +366,17 @@ impl Tree for SqliteTable {

    #[tracing::instrument(skip(self, prefix))]
    fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
-        let mut rx = match self.watchers.write().entry(prefix.to_vec()) {
-            hash_map::Entry::Occupied(o) => o.get().1.clone(),
-            hash_map::Entry::Vacant(v) => {
-                let (tx, rx) = tokio::sync::watch::channel(());
-                v.insert((tx, rx.clone()));
-                rx
-            }
-        };
+        let (tx, rx) = tokio::sync::oneshot::channel();
+
+        self.watchers
+            .write()
+            .entry(prefix.to_vec())
+            .or_default()
+            .push(tx);

        Box::pin(async move {
            // Tx is never destroyed
-            rx.changed().await.unwrap();
+            rx.await.unwrap();
        })
    }

@@ -32,15 +32,15 @@ impl AccountData {
            .as_bytes()
            .to_vec();
        prefix.push(0xff);
-        prefix.extend_from_slice(user_id.as_bytes());
+        prefix.extend_from_slice(&user_id.as_bytes());
        prefix.push(0xff);

        let mut roomuserdataid = prefix.clone();
        roomuserdataid.extend_from_slice(&globals.next_count()?.to_be_bytes());
        roomuserdataid.push(0xff);
-        roomuserdataid.extend_from_slice(event_type.as_bytes());
+        roomuserdataid.extend_from_slice(&event_type.as_bytes());

-        let mut key = prefix;
+        let mut key = prefix.clone();
        key.extend_from_slice(event_type.as_bytes());

        let json = serde_json::to_value(data).expect("all types here can be serialized"); // TODO: maybe add error handling
@@ -83,7 +83,7 @@ impl AccountData {
            .as_bytes()
            .to_vec();
        key.push(0xff);
-        key.extend_from_slice(user_id.as_bytes());
+        key.extend_from_slice(&user_id.as_bytes());
        key.push(0xff);
        key.extend_from_slice(kind.as_ref().as_bytes());

@@ -118,7 +118,7 @@ impl AccountData {
            .as_bytes()
            .to_vec();
        prefix.push(0xff);
-        prefix.extend_from_slice(user_id.as_bytes());
+        prefix.extend_from_slice(&user_id.as_bytes());
        prefix.push(0xff);

        // Skip the data that's exactly at since, because we sent that last time
@@ -6,17 +6,16 @@ use std::{
 use crate::{pdu::PduBuilder, Database};
 use rocket::futures::{channel::mpsc, stream::StreamExt};
 use ruma::{
-    events::{room::message::RoomMessageEventContent, EventType},
+    events::{room::message, EventType},
    UserId,
 };
-use serde_json::value::to_raw_value;
 use tokio::sync::{MutexGuard, RwLock, RwLockReadGuard};
 use tracing::warn;

 pub enum AdminCommand {
    RegisterAppservice(serde_yaml::Value),
    ListAppservices,
-    SendMessage(RoomMessageEventContent),
+    SendMessage(message::MessageEventContent),
 }

 #[derive(Clone)]
@@ -59,7 +58,7 @@ impl Admin {

            drop(guard);

-            let send_message = |message: RoomMessageEventContent,
+            let send_message = |message: message::MessageEventContent,
                                guard: RwLockReadGuard<'_, Database>,
                                mutex_lock: &MutexGuard<'_, ()>| {
                guard
@@ -67,7 +66,7 @@ impl Admin {
                    .build_and_append_pdu(
                        PduBuilder {
                            event_type: EventType::RoomMessage,
-                            content: to_raw_value(&message)
+                            content: serde_json::to_value(message)
                                .expect("event is valid, we just created it"),
                            unsigned: None,
                            state_key: None,
@@ -107,9 +106,9 @@ impl Admin {
                                        count,
                                        appservices.into_iter().filter_map(|r| r.ok()).collect::<Vec<_>>().join(", ")
                                    );
-                                    send_message(RoomMessageEventContent::text_plain(output), guard, &state_lock);
+                                    send_message(message::MessageEventContent::text_plain(output), guard, &state_lock);
                                } else {
-                                    send_message(RoomMessageEventContent::text_plain("Failed to get appservices."), guard, &state_lock);
+                                    send_message(message::MessageEventContent::text_plain("Failed to get appservices."), guard, &state_lock);
                                }
                            }
                            AdminCommand::SendMessage(message) => {
@@ -57,7 +57,8 @@ pub struct RotationHandler(broadcast::Sender<()>, broadcast::Receiver<()>);

 impl RotationHandler {
    pub fn new() -> Self {
-        let (s, r) = broadcast::channel(1);
+        let (s, r) = broadcast::channel::<()>(1);
+
        Self(s, r)
    }

@@ -112,7 +113,7 @@ impl Globals {
                .map(|key| (version, key))
        })
        .and_then(|(version, key)| {
-            ruma::signatures::Ed25519KeyPair::from_der(key, version)
+            ruma::signatures::Ed25519KeyPair::from_der(&key, version)
                .map_err(|_| Error::bad_database("Private or public keys are invalid."))
        });

@@ -210,10 +211,6 @@ impl Globals {
        self.config.allow_federation
    }

-    pub fn allow_room_creation(&self) -> bool {
-        self.config.allow_room_creation
-    }
-
    pub fn trusted_servers(&self) -> &[Box<ServerName>] {
        &self.config.trusted_servers
    }
@@ -226,19 +223,11 @@ impl Globals {
        self.jwt_decoding_key.as_ref()
    }

-    pub fn serve_wellknown(&self) -> bool {
-        self.config.serve_wellknown
-    }
-
    /// TODO: the key valid until timestamp is only honored in room version > 4
    /// Remove the outdated keys and insert the new ones.
    ///
    /// This doesn't actually check that the keys provided are newer than the old set.
-    pub fn add_signing_key(
-        &self,
-        origin: &ServerName,
-        new_keys: ServerSigningKeys,
-    ) -> Result<BTreeMap<ServerSigningKeyId, VerifyKey>> {
+    pub fn add_signing_key(&self, origin: &ServerName, new_keys: ServerSigningKeys) -> Result<()> {
        // Not atomic, but this is not critical
        let signingkeys = self.server_signingkeys.get(origin.as_bytes())?;

@@ -263,14 +252,7 @@ impl Globals {
            &serde_json::to_vec(&keys).expect("serversigningkeys can be serialized"),
        )?;

-        let mut tree = keys.verify_keys;
-        tree.extend(
-            keys.old_verify_keys
-                .into_iter()
-                .map(|old| (old.0, VerifyKey::new(old.1.key))),
-        );
-
-        Ok(tree)
+        Ok(())
    }

    /// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found for the server.
@@ -281,8 +263,8 @@ impl Globals {
        let signingkeys = self
            .server_signingkeys
            .get(origin.as_bytes())?
-            .and_then(|bytes| serde_json::from_slice(&bytes).ok())
-            .map(|keys: ServerSigningKeys| {
+            .and_then(|bytes| serde_json::from_slice::<ServerSigningKeys>(&bytes).ok())
+            .map(|keys| {
                let mut tree = keys.verify_keys;
                tree.extend(
                    keys.old_verify_keys
@@ -27,7 +27,7 @@ impl KeyBackups {

        let mut key = user_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(version.as_bytes());
+        key.extend_from_slice(&version.as_bytes());

        self.backupid_algorithm.insert(
            &key,
@@ -41,7 +41,7 @@ impl KeyBackups {
    pub fn delete_backup(&self, user_id: &UserId, version: &str) -> Result<()> {
        let mut key = user_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(version.as_bytes());
+        key.extend_from_slice(&version.as_bytes());

        self.backupid_algorithm.remove(&key)?;
        self.backupid_etag.remove(&key)?;
@@ -64,7 +64,7 @@ impl KeyBackups {
    ) -> Result<String> {
        let mut key = user_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(version.as_bytes());
+        key.extend_from_slice(&version.as_bytes());

        if self.backupid_algorithm.get(&key)?.is_none() {
            return Err(Error::BadRequest(
@@ -75,34 +75,13 @@ impl KeyBackups {

        self.backupid_algorithm.insert(
            &key,
-            serde_json::to_string(backup_metadata)
+            &serde_json::to_string(backup_metadata)
                .expect("BackupAlgorithm::to_string always works")
                .as_bytes(),
        )?;
        self.backupid_etag
            .insert(&key, &globals.next_count()?.to_be_bytes())?;
-        Ok(version.to_owned())
-    }
-
-    pub fn get_latest_backup_version(&self, user_id: &UserId) -> Result<Option<String>> {
-        let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
-        let mut last_possible_key = prefix.clone();
-        last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());
-
-        self.backupid_algorithm
-            .iter_from(&last_possible_key, true)
-            .take_while(move |(k, _)| k.starts_with(&prefix))
-            .next()
-            .map(|(key, _)| {
-                utils::string_from_bytes(
-                    key.rsplit(|&b| b == 0xff)
-                        .next()
-                        .expect("rsplit always returns an element"),
-                )
-                .map_err(|_| Error::bad_database("backupid_algorithm key is invalid."))
-            })
-            .transpose()
+        Ok(version.to_string())
    }

    pub fn get_latest_backup(&self, user_id: &UserId) -> Result<Option<(String, BackupAlgorithm)>> {
@@ -115,7 +94,7 @@ impl KeyBackups {
            .iter_from(&last_possible_key, true)
            .take_while(move |(k, _)| k.starts_with(&prefix))
            .next()
-            .map(|(key, value)| {
+            .map_or(Ok(None), |(key, value)| {
                let version = utils::string_from_bytes(
                    key.rsplit(|&b| b == 0xff)
                        .next()
@@ -123,14 +102,13 @@ impl KeyBackups {
                )
                .map_err(|_| Error::bad_database("backupid_algorithm key is invalid."))?;

-                Ok((
+                Ok(Some((
                    version,
                    serde_json::from_slice(&value).map_err(|_| {
                        Error::bad_database("Algorithm in backupid_algorithm is invalid.")
                    })?,
-                ))
+                )))
            })
-            .transpose()
    }

    pub fn get_backup(&self, user_id: &UserId, version: &str) -> Result<Option<BackupAlgorithm>> {
@@ -193,7 +171,7 @@ impl KeyBackups {
    pub fn get_etag(&self, user_id: &UserId, version: &str) -> Result<String> {
        let mut key = user_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(version.as_bytes());
+        key.extend_from_slice(&version.as_bytes());

        Ok(utils::u64_from_bytes(
            &self
@@ -224,7 +202,7 @@ impl KeyBackups {
                let mut parts = key.rsplit(|&b| b == 0xff);

                let session_id =
-                    utils::string_from_bytes(parts.next().ok_or_else(|| {
+                    utils::string_from_bytes(&parts.next().ok_or_else(|| {
                        Error::bad_database("backupkeyid_backup key is invalid.")
                    })?)
                    .map_err(|_| {
@@ -232,7 +210,7 @@ impl KeyBackups {
                    })?;

                let room_id = RoomId::try_from(
-                    utils::string_from_bytes(parts.next().ok_or_else(|| {
+                    utils::string_from_bytes(&parts.next().ok_or_else(|| {
                        Error::bad_database("backupkeyid_backup key is invalid.")
                    })?)
                    .map_err(|_| Error::bad_database("backupkeyid_backup room_id is invalid."))?,
@@ -281,7 +259,7 @@ impl KeyBackups {
                let mut parts = key.rsplit(|&b| b == 0xff);

                let session_id =
-                    utils::string_from_bytes(parts.next().ok_or_else(|| {
+                    utils::string_from_bytes(&parts.next().ok_or_else(|| {
                        Error::bad_database("backupkeyid_backup key is invalid.")
                    })?)
                    .map_err(|_| {
@@ -326,7 +304,7 @@ impl KeyBackups {
    pub fn delete_all_keys(&self, user_id: &UserId, version: &str) -> Result<()> {
        let mut key = user_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(version.as_bytes());
+        key.extend_from_slice(&version.as_bytes());
        key.push(0xff);

        for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
@@ -344,9 +322,9 @@ impl KeyBackups {
    ) -> Result<()> {
        let mut key = user_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(version.as_bytes());
+        key.extend_from_slice(&version.as_bytes());
        key.push(0xff);
-        key.extend_from_slice(room_id.as_bytes());
+        key.extend_from_slice(&room_id.as_bytes());
        key.push(0xff);

        for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
@@ -365,11 +343,11 @@ impl KeyBackups {
    ) -> Result<()> {
        let mut key = user_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(version.as_bytes());
+        key.extend_from_slice(&version.as_bytes());
        key.push(0xff);
-        key.extend_from_slice(room_id.as_bytes());
+        key.extend_from_slice(&room_id.as_bytes());
        key.push(0xff);
-        key.extend_from_slice(session_id.as_bytes());
+        key.extend_from_slice(&session_id.as_bytes());

        for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
            self.backupkeyid_backup.remove(&outdated_key)?;
@@ -4,10 +4,7 @@ use image::{imageops::FilterType, GenericImageView};
 use super::abstraction::Tree;
 use crate::{utils, Error, Result};
 use std::{mem, sync::Arc};
-use tokio::{
-    fs::File,
-    io::{AsyncReadExt, AsyncWriteExt},
-};
+use tokio::{fs::File, io::AsyncReadExt, io::AsyncWriteExt};

 pub struct FileMeta {
    pub content_disposition: Option<String>,
@@ -125,7 +125,7 @@ impl WildCardedDomain {
 }
 impl std::str::FromStr for WildCardedDomain {
    type Err = std::convert::Infallible;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
        // maybe do some domain validation?
        Ok(if s.starts_with("*.") {
            WildCardedDomain::WildCarded(s[1..].to_owned())
@@ -136,8 +136,8 @@ impl std::str::FromStr for WildCardedDomain {
        })
    }
 }
-impl<'de> Deserialize<'de> for WildCardedDomain {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+impl<'de> serde::de::Deserialize<'de> for WildCardedDomain {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
    where
        D: serde::de::Deserializer<'de>,
    {
@@ -9,10 +9,8 @@ use ruma::{
        },
        IncomingResponse, OutgoingRequest, SendAccessToken,
    },
-    events::{
-        room::{name::RoomNameEventContent, power_levels::RoomPowerLevelsEventContent},
-        AnySyncRoomEvent, EventType,
-    },
+    events::{room::power_levels::PowerLevelsEventContent, AnySyncRoomEvent, EventType},
+    identifiers::RoomName,
    push::{Action, PushConditionRoomCtx, PushFormat, Ruleset, Tweak},
    serde::Raw,
    uint, RoomId, UInt, UserId,
@@ -179,11 +177,11 @@ pub async fn send_push_notice(
    let mut notify = None;
    let mut tweaks = Vec::new();

-    let power_levels: RoomPowerLevelsEventContent = db
+    let power_levels: PowerLevelsEventContent = db
        .rooms
        .room_state_get(&pdu.room_id, &EventType::RoomPowerLevels, "")?
        .map(|ev| {
-            serde_json::from_str(ev.content.get())
+            serde_json::from_value(ev.content.clone())
                .map_err(|_| Error::bad_database("invalid m.room.power_levels event"))
        })
        .transpose()?
@@ -228,7 +226,7 @@ pub async fn send_push_notice(
 pub fn get_actions<'a>(
    user: &UserId,
    ruleset: &'a Ruleset,
-    power_levels: &RoomPowerLevelsEventContent,
+    power_levels: &PowerLevelsEventContent,
    pdu: &Raw<AnySyncRoomEvent>,
    room_id: &RoomId,
    db: &Database,
@@ -238,7 +236,7 @@ pub fn get_actions<'a>(
        member_count: 10_u32.into(), // TODO: get member count efficiently
        user_display_name: db
            .users
-            .displayname(user)?
+            .displayname(&user)?
            .unwrap_or_else(|| user.localpart().to_owned()),
        users_power_levels: power_levels.users.clone(),
        default_power_level: power_levels.users_default,
@@ -304,7 +302,7 @@ async fn send_notice(
    if event_id_only {
        send_request(
            &db.globals,
-            url,
+            &url,
            send_event_notification::v1::Request::new(notifi),
        )
        .await?;
@@ -320,23 +318,21 @@ async fn send_notice(

        let user_name = db.users.displayname(&event.sender)?;
        notifi.sender_display_name = user_name.as_deref();
-
-        let room_name = if let Some(room_name_pdu) =
-            db.rooms
-                .room_state_get(&event.room_id, &EventType::RoomName, "")?
-        {
-            serde_json::from_str::<RoomNameEventContent>(room_name_pdu.content.get())
-                .map_err(|_| Error::bad_database("Invalid room name event in database."))?
-                .name
-        } else {
-            None
-        };
-
+        let room_name = db
+            .rooms
+            .room_state_get(&event.room_id, &EventType::RoomName, "")?
+            .map(|pdu| match pdu.content.get("name") {
+                Some(serde_json::Value::String(s)) => {
+                    Some(Box::<RoomName>::try_from(&**s).expect("room name is valid"))
+                }
+                _ => None,
+            })
+            .flatten();
        notifi.room_name = room_name.as_deref();

        send_request(
            &db.globals,
-            url,
+            &url,
            send_event_notification::v1::Request::new(notifi),
        )
        .await?;
@@ -60,7 +60,7 @@ impl RoomEdus {
        let mut room_latest_id = prefix;
        room_latest_id.extend_from_slice(&globals.next_count()?.to_be_bytes());
        room_latest_id.push(0xff);
-        room_latest_id.extend_from_slice(user_id.as_bytes());
+        room_latest_id.extend_from_slice(&user_id.as_bytes());

        self.readreceiptid_readreceipt.insert(
            &room_latest_id,
@@ -126,7 +126,7 @@ impl RoomEdus {
    ) -> Result<()> {
        let mut key = room_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(user_id.as_bytes());
+        key.extend_from_slice(&user_id.as_bytes());

        self.roomuserid_privateread
            .insert(&key, &count.to_be_bytes())?;
@@ -142,7 +142,7 @@ impl RoomEdus {
    pub fn private_read_get(&self, room_id: &RoomId, user_id: &UserId) -> Result<Option<u64>> {
        let mut key = room_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(user_id.as_bytes());
+        key.extend_from_slice(&user_id.as_bytes());

        self.roomuserid_privateread
            .get(&key)?
@@ -157,17 +157,16 @@ impl RoomEdus {
    pub fn last_privateread_update(&self, user_id: &UserId, room_id: &RoomId) -> Result<u64> {
        let mut key = room_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(user_id.as_bytes());
+        key.extend_from_slice(&user_id.as_bytes());

        Ok(self
            .roomuserid_lastprivatereadupdate
            .get(&key)?
-            .map(|bytes| {
-                utils::u64_from_bytes(&bytes).map_err(|_| {
+            .map_or(Ok::<_, Error>(None), |bytes| {
+                Ok(Some(utils::u64_from_bytes(&bytes).map_err(|_| {
                    Error::bad_database("Count in roomuserid_lastprivatereadupdate is invalid.")
-                })
-            })
-            .transpose()?
+                })?))
+            })?
            .unwrap_or(0))
    }

@@ -194,7 +193,7 @@ impl RoomEdus {
            .insert(&room_typing_id, &*user_id.as_bytes())?;

        self.roomid_lasttypingupdate
-            .insert(room_id.as_bytes(), &count)?;
+            .insert(&room_id.as_bytes(), &count)?;

        Ok(())
    }
@@ -225,7 +224,7 @@ impl RoomEdus {

        if found_outdated {
            self.roomid_lasttypingupdate
-                .insert(room_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;
+                .insert(&room_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;
        }

        Ok(())
@@ -269,7 +268,7 @@ impl RoomEdus {

        if found_outdated {
            self.roomid_lasttypingupdate
-                .insert(room_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;
+                .insert(&room_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;
        }

        Ok(())
@@ -286,13 +285,12 @@ impl RoomEdus {

        Ok(self
            .roomid_lasttypingupdate
-            .get(room_id.as_bytes())?
-            .map(|bytes| {
-                utils::u64_from_bytes(&bytes).map_err(|_| {
+            .get(&room_id.as_bytes())?
+            .map_or(Ok::<_, Error>(None), |bytes| {
+                Ok(Some(utils::u64_from_bytes(&bytes).map_err(|_| {
                    Error::bad_database("Count in roomid_lastroomactiveupdate is invalid.")
-                })
-            })
-            .transpose()?
+                })?))
+            })?
            .unwrap_or(0))
    }

@@ -333,7 +331,7 @@ impl RoomEdus {
        &self,
        user_id: &UserId,
        room_id: &RoomId,
-        presence: PresenceEvent,
+        presence: ruma::events::presence::PresenceEvent,
        globals: &super::super::globals::Globals,
    ) -> Result<()> {
        // TODO: Remove old entry? Or maybe just wipe completely from time to time?
@@ -344,7 +342,7 @@ impl RoomEdus {
        presence_id.push(0xff);
        presence_id.extend_from_slice(&count);
        presence_id.push(0xff);
-        presence_id.extend_from_slice(presence.sender.as_bytes());
+        presence_id.extend_from_slice(&presence.sender.as_bytes());

        self.presenceid_presence.insert(
            &presence_id,
@@ -363,7 +361,7 @@ impl RoomEdus {
    #[tracing::instrument(skip(self))]
    pub fn ping_presence(&self, user_id: &UserId) -> Result<()> {
        self.userid_lastpresenceupdate.insert(
-            user_id.as_bytes(),
+            &user_id.as_bytes(),
            &utils::millis_since_unix_epoch().to_be_bytes(),
        )?;

@@ -373,7 +371,7 @@ impl RoomEdus {
    /// Returns the timestamp of the last presence update of this user in millis since the unix epoch.
    pub fn last_presence_update(&self, user_id: &UserId) -> Result<Option<u64>> {
        self.userid_lastpresenceupdate
-            .get(user_id.as_bytes())?
+            .get(&user_id.as_bytes())?
            .map(|bytes| {
                utils::u64_from_bytes(&bytes).map_err(|_| {
                    Error::bad_database("Invalid timestamp in userid_lastpresenceupdate.")
@@ -396,12 +394,12 @@ impl RoomEdus {
        presence_id.push(0xff);
        presence_id.extend_from_slice(&last_update.to_be_bytes());
        presence_id.push(0xff);
-        presence_id.extend_from_slice(user_id.as_bytes());
+        presence_id.extend_from_slice(&user_id.as_bytes());

        self.presenceid_presence
            .get(&presence_id)?
            .map(|value| {
-                let mut presence: PresenceEvent = serde_json::from_slice(&value)
+                let mut presence = serde_json::from_slice::<PresenceEvent>(&value)
                    .map_err(|_| Error::bad_database("Invalid presence event in db."))?;
                let current_timestamp: UInt = utils::millis_since_unix_epoch()
                    .try_into()
@@ -424,7 +422,7 @@ impl RoomEdus {
    }

    /// Sets all users to offline who have been quiet for too long.
-    fn _presence_maintain(
+    fn presence_maintain(
        &self,
        rooms: &super::Rooms,
        globals: &super::super::globals::Globals,
@@ -482,7 +480,7 @@ impl RoomEdus {
            }

            self.userid_lastpresenceupdate.insert(
-                user_id.as_bytes(),
+                &user_id.as_bytes(),
                &utils::millis_since_unix_epoch().to_be_bytes(),
            )?;
        }
@@ -491,13 +489,13 @@ impl RoomEdus {
    }

    /// Returns an iterator over the most recent presence updates that happened after the event with id `since`.
-    #[tracing::instrument(skip(self, since, _rooms, _globals))]
+    #[tracing::instrument(skip(self, globals, rooms))]
    pub fn presence_since(
        &self,
        room_id: &RoomId,
        since: u64,
-        _rooms: &super::Rooms,
-        _globals: &super::super::globals::Globals,
+        rooms: &super::Rooms,
+        globals: &super::super::globals::Globals,
    ) -> Result<HashMap<UserId, PresenceEvent>> {
        //self.presence_maintain(rooms, globals)?;

@@ -523,7 +521,7 @@ impl RoomEdus {
            )
            .map_err(|_| Error::bad_database("Invalid UserId in presenceid_presence."))?;

-            let mut presence: PresenceEvent = serde_json::from_slice(&value)
+            let mut presence = serde_json::from_slice::<PresenceEvent>(&value)
                .map_err(|_| Error::bad_database("Invalid presence event in db."))?;

            let current_timestamp: UInt = utils::millis_since_unix_epoch()
@@ -27,7 +27,7 @@ use ruma::{
        OutgoingRequest,
    },
    device_id,
-    events::{push_rules::PushRulesEvent, AnySyncEphemeralRoomEvent, EventType},
+    events::{push_rules, AnySyncEphemeralRoomEvent, EventType},
    push,
    receipt::ReceiptType,
    uint, MilliSecondsSinceUnixEpoch, ServerName, UInt, UserId,
@@ -58,9 +58,9 @@ impl OutgoingKind {
            }
            OutgoingKind::Push(user, pushkey) => {
                let mut p = b"$".to_vec();
-                p.extend_from_slice(user);
+                p.extend_from_slice(&user);
                p.push(0xff);
-                p.extend_from_slice(pushkey);
+                p.extend_from_slice(&pushkey);
                p
            }
            OutgoingKind::Normal(server) => {
@@ -84,7 +84,7 @@ pub enum SendingEventType {
 pub struct Sending {
    /// The state for a given state hash.
    pub(super) servername_educount: Arc<dyn Tree>, // EduCount: Count of last EDU sync
-    pub(super) servernameevent_data: Arc<dyn Tree>, // ServernameEvent = (+ / $)SenderKey / ServerName / UserId + PduId / Id (for edus), Data = EDU content
+    pub(super) servernameevent_data: Arc<dyn Tree>, // ServernamEvent = (+ / $)SenderKey / ServerName / UserId + PduId / Id (for edus), Data = EDU content
    pub(super) servercurrentevent_data: Arc<dyn Tree>, // ServerCurrentEvents = (+ / $)ServerName / UserId + PduId / Id (for edus), Data = EDU content
    pub(super) maximum_requests: Arc<Semaphore>,
    pub sender: mpsc::UnboundedSender<(Vec<u8>, Vec<u8>)>,
@@ -165,13 +165,13 @@ impl Sending {
                                }

                                // Find events that have been added since starting the last request
-                                let new_events: Vec<_> = guard.sending.servernameevent_data
+                                let new_events = guard.sending.servernameevent_data
                                    .scan_prefix(prefix.clone())
                                    .filter_map(|(k, v)| {
                                        Self::parse_servercurrentevent(&k, v).ok().map(|ev| (ev, k))
                                    })
                                    .take(30)
-                                    .collect::<>();
+                                    .collect::<Vec<_>>();

                                // TODO: find edus

@@ -179,8 +179,8 @@ impl Sending {
                                    // Insert pdus we found
                                    for (e, key) in &new_events {
                                        let value = if let SendingEventType::Edu(value) = &e.1 { &**value } else { &[] };
-                                        guard.sending.servercurrentevent_data.insert(key, value).unwrap();
-                                        guard.sending.servernameevent_data.remove(key).unwrap();
+                                        guard.sending.servercurrentevent_data.insert(&key, value).unwrap();
+                                        guard.sending.servernameevent_data.remove(&key).unwrap();
                                    }

                                    drop(guard);
@@ -344,8 +344,8 @@ impl Sending {
                    continue;
                }

-                let event: AnySyncEphemeralRoomEvent =
-                    serde_json::from_str(read_receipt.json().get())
+                let event =
+                    serde_json::from_str::<AnySyncEphemeralRoomEvent>(&read_receipt.json().get())
                        .map_err(|_| Error::bad_database("Invalid edu event in read_receipts."))?;
                let federation_event = match event {
                    AnySyncEphemeralRoomEvent::Receipt(r) => {
@@ -398,7 +398,7 @@ impl Sending {
            let edu = Edu::DeviceListUpdate(DeviceListUpdateContent {
                user_id,
                device_id: device_id!("dummy"),
-                device_display_name: Some("Dummy".to_owned()),
+                device_display_name: "Dummy".to_owned(),
                stream_id: uint!(1),
                prev_id: Vec::new(),
                deleted: None,
@@ -423,23 +423,13 @@ impl Sending {
        Ok(())
    }

-    #[tracing::instrument(skip(self, servers, pdu_id))]
-    pub fn send_pdu<I: Iterator<Item = Box<ServerName>>>(
-        &self,
-        servers: I,
-        pdu_id: &[u8],
-    ) -> Result<()> {
-        let mut batch = servers.map(|server| {
-            let mut key = server.as_bytes().to_vec();
-            key.push(0xff);
-            key.extend_from_slice(pdu_id);
-
-            self.sender.unbounded_send((key.clone(), vec![])).unwrap();
-
-            (key, Vec::new())
-        });
-
-        self.servernameevent_data.insert_batch(&mut batch)?;
+    #[tracing::instrument(skip(self, server, pdu_id))]
+    pub fn send_pdu(&self, server: &ServerName, pdu_id: &[u8]) -> Result<()> {
+        let mut key = server.as_bytes().to_vec();
+        key.push(0xff);
+        key.extend_from_slice(pdu_id);
+        self.servernameevent_data.insert(&key, &[])?;
+        self.sender.unbounded_send((key, vec![])).unwrap();

        Ok(())
    }
@@ -485,7 +475,7 @@ impl Sending {
        kind: OutgoingKind,
        events: Vec<SendingEventType>,
        db: Arc<RwLock<Database>>,
-    ) -> Result<OutgoingKind, (OutgoingKind, Error)> {
+    ) -> std::result::Result<OutgoingKind, (OutgoingKind, Error)> {
        let db = db.read().await;

        match &kind {
@@ -496,7 +486,7 @@ impl Sending {
                    match event {
                        SendingEventType::Pdu(pdu_id) => {
                            pdu_jsons.push(db.rooms
-                                .get_pdu_from_id(pdu_id)
+                                .get_pdu_from_id(&pdu_id)
                                .map_err(|e| (kind.clone(), e))?
                                .ok_or_else(|| {
                                    (
@@ -553,7 +543,7 @@ impl Sending {
                        SendingEventType::Pdu(pdu_id) => {
                            pdus.push(
                                db.rooms
-                                    .get_pdu_from_id(pdu_id)
+                                    .get_pdu_from_id(&pdu_id)
                                    .map_err(|e| (kind.clone(), e))?
                                    .ok_or_else(|| {
                                        (
@@ -573,14 +563,8 @@ impl Sending {

                for pdu in pdus {
                    // Redacted events are not notification targets (we don't send push for them)
-                    if let Some(unsigned) = &pdu.unsigned {
-                        if let Ok(unsigned) =
-                            serde_json::from_str::<serde_json::Value>(unsigned.get())
-                        {
-                            if unsigned.get("redacted_because").is_some() {
-                                continue;
-                            }
-                        }
+                    if pdu.unsigned.get("redacted_because").is_some() {
+                        continue;
                    }

                    let userid =
@@ -612,9 +596,9 @@ impl Sending {

                    let rules_for_user = db
                        .account_data
-                        .get(None, &userid, EventType::PushRules)
+                        .get::<push_rules::PushRulesEvent>(None, &userid, EventType::PushRules)
                        .unwrap_or_default()
-                        .map(|ev: PushRulesEvent| ev.content.global)
+                        .map(|ev| ev.content.global)
                        .unwrap_or_else(|| push::Ruleset::server_default(&userid));

                    let unread: UInt = db
@@ -652,7 +636,7 @@ impl Sending {
                            // TODO: check room version and remove event_id if needed
                            let raw = PduEvent::convert_to_outgoing_federation_event(
                                db.rooms
-                                    .get_pdu_json_from_id(pdu_id)
+                                    .get_pdu_json_from_id(&pdu_id)
                                    .map_err(|e| (OutgoingKind::Normal(server.clone()), e))?
                                    .ok_or_else(|| {
                                        (
@@ -727,7 +711,7 @@ impl Sending {
            let event = parts
                .next()
                .ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
-            let server = utils::string_from_bytes(server).map_err(|_| {
+            let server = utils::string_from_bytes(&server).map_err(|_| {
                Error::bad_database("Invalid server bytes in server_currenttransaction")
            })?;

@@ -766,7 +750,7 @@ impl Sending {
            let event = parts
                .next()
                .ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
-            let server = utils::string_from_bytes(server).map_err(|_| {
+            let server = utils::string_from_bytes(&server).map_err(|_| {
                Error::bad_database("Invalid server bytes in server_currenttransaction")
            })?;

@@ -5,8 +5,7 @@ use ruma::{
    api::client::{
        error::ErrorKind,
        r0::uiaa::{
-            AuthType, IncomingAuthData, IncomingPassword, IncomingUserIdentifier::MatrixId,
-            UiaaInfo,
+            IncomingAuthData, IncomingPassword, IncomingUserIdentifier::MatrixId, UiaaInfo,
        },
    },
    signatures::CanonicalJsonValue,
@@ -55,7 +54,7 @@ impl Uiaa {
    ) -> Result<(bool, UiaaInfo)> {
        let mut uiaainfo = auth
            .session()
-            .map(|session| self.get_uiaa_session(user_id, device_id, session))
+            .map(|session| self.get_uiaa_session(&user_id, &device_id, session))
            .unwrap_or_else(|| Ok(uiaainfo.clone()))?;

        if uiaainfo.session.is_none() {
@@ -100,10 +99,10 @@ impl Uiaa {
                }

                // Password was correct! Let's add it to `completed`
-                uiaainfo.completed.push(AuthType::Password);
+                uiaainfo.completed.push("m.login.password".to_owned());
            }
            IncomingAuthData::Dummy(_) => {
-                uiaainfo.completed.push(AuthType::Dummy);
+                uiaainfo.completed.push("m.login.dummy".to_owned());
            }
            k => error!("type not supported: {:?}", k),
        }
@@ -175,14 +174,16 @@ impl Uiaa {

        self.userdevicesessionid_uiaarequest
            .get(&userdevicesessionid)?
-            .map(|bytes| {
-                serde_json::from_str::<CanonicalJsonValue>(
-                    &utils::string_from_bytes(&bytes)
-                        .map_err(|_| Error::bad_database("Invalid uiaa request bytes in db."))?,
-                )
-                .map_err(|_| Error::bad_database("Invalid uiaa request in db."))
+            .map_or(Ok(None), |bytes| {
+                Ok::<_, Error>(Some(
+                    serde_json::from_str::<CanonicalJsonValue>(
+                        &utils::string_from_bytes(&bytes).map_err(|_| {
+                            Error::bad_database("Invalid uiaa request bytes in db.")
+                        })?,
+                    )
+                    .map_err(|_| Error::bad_database("Invalid uiaa request in db."))?,
+                ))
            })
-            .transpose()
    }

    fn update_uiaa_session(
@@ -223,7 +224,7 @@ impl Uiaa {
        userdevicesessionid.push(0xff);
        userdevicesessionid.extend_from_slice(session.as_bytes());

-        serde_json::from_slice(
+        let uiaainfo = serde_json::from_slice::<UiaaInfo>(
            &self
                .userdevicesessionid_uiaainfo
                .get(&userdevicesessionid)?
@@ -232,6 +233,8 @@ impl Uiaa {
                    "UIAA session does not exist.",
                ))?,
        )
-        .map_err(|_| Error::bad_database("UiaaInfo in userdeviceid_uiaainfo is invalid."))
+        .map_err(|_| Error::bad_database("UiaaInfo in userdeviceid_uiaainfo is invalid."))?;
+
+        Ok(uiaainfo)
    }
 }
@@ -5,8 +5,7 @@ use ruma::{
    events::{AnyToDeviceEvent, EventType},
    identifiers::MxcUri,
    serde::Raw,
-    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, RoomAliasId, UInt,
-    UserId,
+    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, UInt, UserId,
 };
 use std::{collections::BTreeMap, convert::TryFrom, mem, sync::Arc};
 use tracing::warn;
@@ -54,22 +53,6 @@ impl Users {
            .is_empty())
    }

-    /// Check if a user is an admin
-    #[tracing::instrument(skip(self, user_id, rooms, globals))]
-    pub fn is_admin(
-        &self,
-        user_id: &UserId,
-        rooms: &super::rooms::Rooms,
-        globals: &super::globals::Globals,
-    ) -> Result<bool> {
-        let admin_room_alias_id =
-            RoomAliasId::try_from(format!("#admins:{}", globals.server_name()))
-                .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid alias."))?;
-        let admin_room_id = rooms.id_from_alias(&admin_room_alias_id)?.unwrap();
-
-        Ok(rooms.is_joined(user_id, &admin_room_id)?)
-    }
-
    /// Create a new user account on this homeserver.
    #[tracing::instrument(skip(self, user_id, password))]
    pub fn create(&self, user_id: &UserId, password: Option<&str>) -> Result<()> {
@@ -98,13 +81,13 @@ impl Users {
                })?;

                Ok(Some((
-                    UserId::try_from(utils::string_from_bytes(user_bytes).map_err(|_| {
+                    UserId::try_from(utils::string_from_bytes(&user_bytes).map_err(|_| {
                        Error::bad_database("User ID in token_userdeviceid is invalid unicode.")
                    })?)
                    .map_err(|_| {
                        Error::bad_database("User ID in token_userdeviceid is invalid.")
                    })?,
-                    utils::string_from_bytes(device_bytes).map_err(|_| {
+                    utils::string_from_bytes(&device_bytes).map_err(|_| {
                        Error::bad_database("Device ID in token_userdeviceid is invalid.")
                    })?,
                )))
@@ -138,7 +121,7 @@ impl Users {
    #[tracing::instrument(skip(self, user_id, password))]
    pub fn set_password(&self, user_id: &UserId, password: Option<&str>) -> Result<()> {
        if let Some(password) = password {
-            if let Ok(hash) = utils::calculate_hash(password) {
+            if let Ok(hash) = utils::calculate_hash(&password) {
                self.userid_password
                    .insert(user_id.as_bytes(), hash.as_bytes())?;
                Ok(())
@@ -262,7 +245,7 @@ impl Users {
            .expect("Device::to_string never fails."),
        )?;

-        self.set_token(user_id, device_id, token)?;
+        self.set_token(user_id, &device_id, token)?;

        Ok(())
    }
@@ -311,7 +294,7 @@ impl Users {
            .scan_prefix(prefix)
            .map(|(bytes, _)| {
                Ok(utils::string_from_bytes(
-                    bytes
+                    &bytes
                        .rsplit(|&b| b == 0xff)
                        .next()
                        .ok_or_else(|| Error::bad_database("UserDevice ID in db is invalid."))?,
@@ -374,7 +357,7 @@ impl Users {
        // TODO: Use DeviceKeyId::to_string when it's available (and update everything,
        // because there are no wrapping quotation marks anymore)
        key.extend_from_slice(
-            serde_json::to_string(one_time_key_key)
+            &serde_json::to_string(one_time_key_key)
                .expect("DeviceKeyId::to_string always works")
                .as_bytes(),
        );
@@ -385,7 +368,7 @@ impl Users {
        )?;

        self.userid_lastonetimekeyupdate
-            .insert(user_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;
+            .insert(&user_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;

        Ok(())
    }
@@ -393,7 +376,7 @@ impl Users {
    #[tracing::instrument(skip(self, user_id))]
    pub fn last_one_time_keys_update(&self, user_id: &UserId) -> Result<u64> {
        self.userid_lastonetimekeyupdate
-            .get(user_id.as_bytes())?
+            .get(&user_id.as_bytes())?
            .map(|bytes| {
                utils::u64_from_bytes(&bytes).map_err(|_| {
                    Error::bad_database("Count in roomid_lastroomactiveupdate is invalid.")
@@ -419,7 +402,7 @@ impl Users {
        prefix.push(b':');

        self.userid_lastonetimekeyupdate
-            .insert(user_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;
+            .insert(&user_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;

        self.onetimekeyid_onetimekeys
            .scan_prefix(prefix)
@@ -620,11 +603,10 @@ impl Users {
        key.push(0xff);
        key.extend_from_slice(key_id.as_bytes());

-        let mut cross_signing_key: serde_json::Value =
-            serde_json::from_slice(&self.keyid_key.get(&key)?.ok_or(Error::BadRequest(
-                ErrorKind::InvalidParam,
-                "Tried to sign nonexistent key.",
-            ))?)
+        let mut cross_signing_key =
+            serde_json::from_slice::<serde_json::Value>(&self.keyid_key.get(&key)?.ok_or(
+                Error::BadRequest(ErrorKind::InvalidParam, "Tried to sign nonexistent key."),
+            )?)
            .map_err(|_| Error::bad_database("key in keyid_key is invalid."))?;

        let signatures = cross_signing_key
@@ -698,7 +680,7 @@ impl Users {
        globals: &super::globals::Globals,
    ) -> Result<()> {
        let count = globals.next_count()?.to_be_bytes();
-        for room_id in rooms.rooms_joined(user_id).filter_map(|r| r.ok()) {
+        for room_id in rooms.rooms_joined(&user_id).filter_map(|r| r.ok()) {
            // Don't send key updates to unencrypted rooms
            if rooms
                .room_state_get(&room_id, &EventType::RoomEncryption, "")?
@@ -979,7 +961,7 @@ impl Users {
    pub fn deactivate_account(&self, user_id: &UserId) -> Result<()> {
        // Remove all associated devices
        for device_id in self.all_device_ids(user_id) {
-            self.remove_device(user_id, &device_id?)?;
+            self.remove_device(&user_id, &device_id?)?;
        }

        // Set the password to "" to indicate a deactivated account. Hashes will never result in an
@@ -20,7 +20,7 @@ use {
    tracing::error,
 };

-pub type Result<T, E = Error> = std::result::Result<T, E>;
+pub type Result<T> = std::result::Result<T, Error>;

 #[derive(Error, Debug)]
 pub enum Error {
@@ -1,9 +1,3 @@
-#![warn(
-    rust_2018_idioms,
-    unused_qualifications,
-    clippy::cloned_instead_of_copied,
-    clippy::str_to_string
-)]
 #![allow(clippy::suspicious_else_formatting)]
 #![deny(clippy::dbg_macro)]

@@ -1,16 +1,10 @@
-#![warn(
-    rust_2018_idioms,
-    unused_qualifications,
-    clippy::cloned_instead_of_copied,
-    clippy::str_to_string
-)]
+#![warn(rust_2018_idioms)]
 #![allow(clippy::suspicious_else_formatting)]
 #![deny(clippy::dbg_macro)]

 pub mod appservice_server;
 pub mod client_server;
 pub mod server_server;
-pub mod well_known;

 mod database;
 mod error;
@@ -41,17 +35,8 @@ use tokio::sync::RwLock;
 use tracing_subscriber::{prelude::*, EnvFilter};

 fn setup_rocket(config: Figment, data: Arc<RwLock<Database>>) -> rocket::Rocket<rocket::Build> {
-    let rocket_builder = rocket::custom(config).manage(data);
-
-    // If configured, serve .well-known/matrix files
-    if data.lock().globals.serve_wellknown() {
-        rocket_builder.mount(
-            "/",
-            routes![well_known::well_known_server, well_known::well_known_client,],
-        );
-    }
-
-    rocket_builder
+    rocket::custom(config)
+        .manage(data)
        .mount(
            "/",
            routes![
@@ -214,27 +199,16 @@ async fn main() {

    std::env::set_var("RUST_LOG", "warn");

-    let config = match raw_config.extract::<Config>() {
-        Ok(s) => s,
-        Err(e) => {
-            eprintln!("It looks like your config is invalid. The following error occured while parsing it: {}", e);
-            std::process::exit(1);
-        }
-    };
+    let config = raw_config
+        .extract::<Config>()
+        .expect("It looks like your config is invalid. Please take a look at the error");

    let start = async {
        config.warn_deprecated();

-        let db = match Database::load_or_create(&config).await {
-            Ok(db) => db,
-            Err(e) => {
-                eprintln!(
-                    "The database couldn't be loaded or created. The following error occured: {}",
-                    e
-                );
-                std::process::exit(1);
-            }
-        };
+        let db = Database::load_or_create(&config)
+            .await
+            .expect("config is valid");

        let rocket = setup_rocket(raw_config, Arc::clone(&db))
            .ignite()
@@ -1,28 +1,19 @@
 use crate::Error;
 use ruma::{
    events::{
-        room::member::RoomMemberEventContent, AnyEphemeralRoomEvent, AnyInitialStateEvent,
-        AnyRoomEvent, AnyStateEvent, AnyStrippedStateEvent, AnySyncRoomEvent, AnySyncStateEvent,
-        EventType, StateEvent,
+        pdu::EventHash, room::member::MemberEventContent, AnyEphemeralRoomEvent,
+        AnyInitialStateEvent, AnyRoomEvent, AnyStateEvent, AnyStrippedStateEvent, AnySyncRoomEvent,
+        AnySyncStateEvent, EventType, StateEvent,
    },
    serde::{CanonicalJsonObject, CanonicalJsonValue, Raw},
-    state_res, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, UInt, UserId,
+    state_res, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, ServerName,
+    ServerSigningKeyId, UInt, UserId,
 };
 use serde::{Deserialize, Serialize};
-use serde_json::{
-    json,
-    value::{to_raw_value, RawValue as RawJsonValue},
-};
+use serde_json::json;
 use std::{cmp::Ordering, collections::BTreeMap, convert::TryFrom};
 use tracing::warn;

-/// Content hashes of a PDU.
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct EventHash {
-    /// The SHA-256 hash.
-    pub sha256: String,
-}
-
 #[derive(Clone, Deserialize, Serialize, Debug)]
 pub struct PduEvent {
    pub event_id: EventId,
@@ -31,7 +22,7 @@ pub struct PduEvent {
    pub origin_server_ts: UInt,
    #[serde(rename = "type")]
    pub kind: EventType,
-    pub content: Box<RawJsonValue>,
+    pub content: serde_json::Value,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub state_key: Option<String>,
    pub prev_events: Vec<EventId>,
@@ -39,17 +30,16 @@ pub struct PduEvent {
    pub auth_events: Vec<EventId>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub redacts: Option<EventId>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub unsigned: Option<Box<RawJsonValue>>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub unsigned: BTreeMap<String, serde_json::Value>,
    pub hashes: EventHash,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub signatures: Option<Box<RawJsonValue>>, // BTreeMap<Box<ServerName>, BTreeMap<ServerSigningKeyId, String>>
+    pub signatures: BTreeMap<Box<ServerName>, BTreeMap<ServerSigningKeyId, String>>,
 }

 impl PduEvent {
    #[tracing::instrument(skip(self))]
    pub fn redact(&mut self, reason: &PduEvent) -> crate::Result<()> {
-        self.unsigned = None;
+        self.unsigned.clear();

        let allowed: &[&str] = match self.kind {
            EventType::RoomMember => &["membership"],
@@ -69,9 +59,10 @@ impl PduEvent {
            _ => &[],
        };

-        let mut old_content: BTreeMap<String, serde_json::Value> =
-            serde_json::from_str(self.content.get())
-                .map_err(|_| Error::bad_database("PDU in db has invalid content."))?;
+        let old_content = self
+            .content
+            .as_object_mut()
+            .ok_or_else(|| Error::bad_database("PDU in db has invalid content."))?;

        let mut new_content = serde_json::Map::new();

@@ -81,23 +72,12 @@ impl PduEvent {
            }
        }

-        self.unsigned = Some(to_raw_value(&json!({
-            "redacted_because": serde_json::to_value(reason).expect("to_value(PduEvent) always works")
-        })).expect("to string always works"));
+        self.unsigned.insert(
+            "redacted_because".to_owned(),
+            serde_json::to_value(reason).expect("to_value(PduEvent) always works"),
+        );

-        self.content = to_raw_value(&new_content).expect("to string always works");
-
-        Ok(())
-    }
-
-    pub fn remove_transaction_id(&mut self) -> crate::Result<()> {
-        if let Some(unsigned) = &self.unsigned {
-            let mut unsigned: BTreeMap<String, Box<RawJsonValue>> =
-                serde_json::from_str(unsigned.get())
-                    .map_err(|_| Error::bad_database("Invalid unsigned in pdu event"))?;
-            unsigned.remove("transaction_id");
-            self.unsigned = Some(to_raw_value(&unsigned).expect("unsigned is valid"));
-        }
+        self.content = new_content.into();

        Ok(())
    }
@@ -212,7 +192,7 @@ impl PduEvent {
    }

    #[tracing::instrument(skip(self))]
-    pub fn to_member_event(&self) -> Raw<StateEvent<RoomMemberEventContent>> {
+    pub fn to_member_event(&self) -> Raw<StateEvent<MemberEventContent>> {
        let json = json!({
            "content": self.content,
            "type": self.kind,
@@ -232,7 +212,7 @@ impl PduEvent {
    #[tracing::instrument]
    pub fn convert_to_outgoing_federation_event(
        mut pdu_json: CanonicalJsonObject,
-    ) -> Box<RawJsonValue> {
+    ) -> Raw<ruma::events::pdu::Pdu> {
        if let Some(unsigned) = pdu_json
            .get_mut("unsigned")
            .and_then(|val| val.as_object_mut())
@@ -249,7 +229,10 @@ impl PduEvent {
        // )
        // .expect("Raw::from_value always works")

-        to_raw_value(&pdu_json).expect("CanonicalJson is valid serde_json::Value")
+        serde_json::from_value::<Raw<_>>(
+            serde_json::to_value(pdu_json).expect("CanonicalJson is valid serde_json::Value"),
+        )
+        .expect("Raw::from_value always works")
    }

    pub fn from_id_val(
@@ -257,7 +240,7 @@ impl PduEvent {
        mut json: CanonicalJsonObject,
    ) -> Result<Self, serde_json::Error> {
        json.insert(
-            "event_id".to_owned(),
+            "event_id".to_string(),
            CanonicalJsonValue::String(event_id.as_str().to_owned()),
        );

@@ -277,34 +260,40 @@ impl state_res::Event for PduEvent {
    fn sender(&self) -> &UserId {
        &self.sender
    }
-
-    fn event_type(&self) -> &EventType {
-        &self.kind
+    fn kind(&self) -> EventType {
+        self.kind.clone()
    }

-    fn content(&self) -> &RawJsonValue {
-        &self.content
+    fn content(&self) -> serde_json::Value {
+        self.content.clone()
    }
-
    fn origin_server_ts(&self) -> MilliSecondsSinceUnixEpoch {
        MilliSecondsSinceUnixEpoch(self.origin_server_ts)
    }
-
-    fn state_key(&self) -> Option<&str> {
-        self.state_key.as_deref()
+    fn state_key(&self) -> Option<String> {
+        self.state_key.clone()
    }
-
-    fn prev_events(&self) -> Box<dyn DoubleEndedIterator<Item = &EventId> + '_> {
-        Box::new(self.prev_events.iter())
+    fn prev_events(&self) -> Vec<EventId> {
+        self.prev_events.to_vec()
    }
-
-    fn auth_events(&self) -> Box<dyn DoubleEndedIterator<Item = &EventId> + '_> {
-        Box::new(self.auth_events.iter())
+    fn depth(&self) -> &UInt {
+        &self.depth
+    }
+    fn auth_events(&self) -> Vec<EventId> {
+        self.auth_events.to_vec()
    }
-
    fn redacts(&self) -> Option<&EventId> {
        self.redacts.as_ref()
    }
+    fn hashes(&self) -> &EventHash {
+        &self.hashes
+    }
+    fn signatures(&self) -> BTreeMap<Box<ServerName>, BTreeMap<ruma::ServerSigningKeyId, String>> {
+        self.signatures.clone()
+    }
+    fn unsigned(&self) -> &BTreeMap<String, serde_json::Value> {
+        &self.unsigned
+    }
 }

 // These impl's allow us to dedup state snapshots when resolving state
@@ -330,9 +319,9 @@ impl Ord for PduEvent {
 ///
 /// Returns a tuple of the new `EventId` and the PDU as a `BTreeMap<String, CanonicalJsonValue>`.
 pub(crate) fn gen_event_id_canonical_json(
-    pdu: &RawJsonValue,
+    pdu: &Raw<ruma::events::pdu::Pdu>,
 ) -> crate::Result<(EventId, CanonicalJsonObject)> {
-    let value = serde_json::from_str(pdu.get()).map_err(|e| {
+    let value = serde_json::from_str(pdu.json().get()).map_err(|e| {
        warn!("Error parsing incoming event {:?}: {:?}", pdu, e);
        Error::BadServerResponse("Invalid PDU in server response")
    })?;
@@ -353,7 +342,7 @@ pub(crate) fn gen_event_id_canonical_json(
 pub struct PduBuilder {
    #[serde(rename = "type")]
    pub event_type: EventType,
-    pub content: Box<RawJsonValue>,
+    pub content: serde_json::Value,
    pub unsigned: Option<BTreeMap<String, serde_json::Value>>,
    pub state_key: Option<String>,
    pub redacts: Option<EventId>,
@@ -364,7 +353,7 @@ impl From<AnyInitialStateEvent> for PduBuilder {
    fn from(event: AnyInitialStateEvent) -> Self {
        Self {
            event_type: EventType::from(event.event_type()),
-            content: to_raw_value(&event.content())
+            content: serde_json::value::to_value(event.content())
                .expect("AnyStateEventContent came from JSON and can thus turn back into JSON."),
            unsigned: None,
            state_key: Some(event.state_key().to_owned()),
@@ -66,11 +66,7 @@ where
        let limit = db.globals.max_request_size();
        let mut handle = data.open(ByteUnit::Byte(limit.into()));
        let mut body = Vec::new();
-        if handle.read_to_end(&mut body).await.is_err() {
-            // Client disconnected
-            // Missing Token
-            return Failure((Status::new(582), ()));
-        }
+        handle.read_to_end(&mut body).await.unwrap();

        let mut json_body = serde_json::from_slice::<CanonicalJsonValue>(&body).ok();

@@ -123,7 +119,7 @@ where
            match metadata.authentication {
                AuthScheme::AccessToken | AuthScheme::QueryOnlyAccessToken => {
                    if let Some(token) = token {
-                        match db.users.find_from_token(token).unwrap() {
+                        match db.users.find_from_token(&token).unwrap() {
                            // Unknown Token
                            None => return Failure((Status::new(581), ())),
                            Some((user_id, device_id)) => (
@@ -344,7 +340,7 @@ impl<T: Outgoing> Deref for Ruma<T> {
 }

 /// This struct converts ruma responses into rocket http responses.
-pub type ConduitResult<T> = Result<RumaResponse<T>, Error>;
+pub type ConduitResult<T> = std::result::Result<RumaResponse<T>, Error>;

 pub fn response<T: OutgoingResponse>(response: RumaResponse<T>) -> response::Result<'static> {
    let http_response = response
@@ -123,7 +123,7 @@ pub fn deserialize_from_str<
    E: std::fmt::Display,
 >(
    deserializer: D,
-) -> Result<T, D::Error> {
+) -> std::result::Result<T, D::Error> {
    struct Visitor<T: FromStr<Err = E>, E>(std::marker::PhantomData<T>);
    impl<'de, T: FromStr<Err = Err>, Err: std::fmt::Display> serde::de::Visitor<'de>
        for Visitor<T, Err>
@@ -1,27 +0,0 @@
-#[cfg(feature = "conduit_bin")]
-use rocket::get;
-use rocket::response::content;
-use crate::database::DatabaseGuard;
-//use serde::Serialize;
-
-//#[derive(Serialize)]
-//pub struct WellKnownServerInfo {
-//    m_server: String,
-//}
-
-#[cfg_attr(feature = "conduit_bin", get("/.well-known/matrix/server"))]
-#[tracing::instrument(skip(db))]
-pub fn well_known_server(db: DatabaseGuard) -> content::Json<String> {
-    // Pull the server_name from config
-    let server_name = db.globals.server_name().clone();
-    content::Json(format!("{{\"m.server\": \"{}:443\"}}", server_name))
-}
-
-
-#[cfg_attr(feature = "conduit_bin", get("/.well-known/matrix/client"))]
-#[tracing::instrument(skip(db))]
-pub fn well_known_client(db: DatabaseGuard) -> content::Json<String> {
-    // Pull the server_name from config
-    let server_name = db.globals.server_name().clone();
-    content::Json(format!("{{\"m.homeserver\": {{ \"base_url\": \"https://{}\"}}}}", server_name))
-}
@@ -0,0 +1,101 @@
+const puppeteer = require('puppeteer');
+
+run().then(() => console.log('Done')).catch(error => {
+    console.error("Registration test failed.");
+    console.error("There might be a screenshot of the failure in the artifacts.\n");
+    console.error(error);
+    process.exit(111);
+});
+
+async function run() {
+
+    const elementUrl = process.argv[process.argv.length - 2];
+    console.debug("Testing registration with ElementWeb hosted at "+ elementUrl);
+
+    const homeserverUrl = process.argv[process.argv.length - 1];
+    console.debug("Homeserver url: "+ homeserverUrl);
+
+    const username = "testuser" + String(Math.floor(Math.random() * 100000));
+    const password = "testpassword" + String(Math.floor(Math.random() * 100000));
+    console.debug("Testuser for this run:\n  User: " + username + "\n  Password: " + password);
+
+    const browser = await puppeteer.launch({
+        headless: true, args: [
+            "--no-sandbox"
+        ]
+    });
+
+    const page = await browser.newPage();
+    await page.goto(elementUrl);
+
+    await page.screenshot({ path: '01-element-web-opened.png' });
+
+    console.debug("Click [Create Account] button");
+    await page.waitForSelector('a.mx_ButtonCreateAccount');
+    await page.click('a.mx_ButtonCreateAccount');
+
+    await page.screenshot({ path: '02-clicked-create-account-button.png' });
+
+    // The webapp should have loaded right now, if anything takes more than 5 seconds, something probably broke
+    page.setDefaultTimeout(5000);
+
+    console.debug("Click [Edit] to switch homeserver");
+    await page.waitForSelector('div.mx_ServerPicker_change');
+    await page.click('div.mx_ServerPicker_change');
+
+    await page.screenshot({ path: '03-clicked-edit-homeserver-button.png' });
+
+    console.debug("Type in local homeserver url");
+    await page.waitForSelector('input#mx_homeserverInput');
+    await page.click('input#mx_homeserverInput');
+    await page.click('input#mx_homeserverInput');
+    await page.keyboard.type(homeserverUrl);
+
+    await page.screenshot({ path: '04-typed-in-homeserver.png' });
+
+    console.debug("[Continue] with changed homeserver");
+    await page.waitForSelector("div.mx_ServerPickerDialog_continue");
+    await page.click('div.mx_ServerPickerDialog_continue');
+
+    await page.screenshot({ path: '05-back-to-enter-user-credentials.png' });
+
+    console.debug("Type in username");
+    await page.waitForSelector("input#mx_RegistrationForm_username");
+    await page.click('input#mx_RegistrationForm_username');
+    await page.keyboard.type(username);
+
+    await page.screenshot({ path: '06-typed-in-username.png' });
+
+    console.debug("Type in password");
+    await page.waitForSelector("input#mx_RegistrationForm_password");
+    await page.click('input#mx_RegistrationForm_password');
+    await page.keyboard.type(password);
+
+    await page.screenshot({ path: '07-typed-in-password-once.png' });
+
+    console.debug("Type in password again");
+    await page.waitForSelector("input#mx_RegistrationForm_passwordConfirm");
+    await page.click('input#mx_RegistrationForm_passwordConfirm');
+    await page.keyboard.type(password);
+
+    await page.screenshot({ path: '08-typed-in-password-twice.png' });
+
+    console.debug("Click on [Register] to finish the account creation");
+    await page.waitForSelector("input.mx_Login_submit");
+    await page.click('input.mx_Login_submit');
+
+    await page.screenshot({ path: '09-clicked-on-register-button.png' });
+
+    // Waiting for the app to login can take some time, so be patient.
+    page.setDefaultTimeout(10000);
+
+    console.debug("Wait for chat window to show up");
+    await page.waitForSelector("div.mx_HomePage_default_buttons");
+    console.debug("Apparently the registration worked.");
+
+    await page.screenshot({ path: '10-logged-in-homescreen.png' });
+
+
+    // Close the browser and exit the script
+    await browser.close();
+}
@@ -510,4 +510,3 @@ remote user can join room with version 5
 remote user can join room with version 6
 setting 'm.room.name' respects room powerlevel
 setting 'm.room.power_levels' respects room powerlevel
-Federation publicRoom Name/topic keys are correct
@@ -1 +1 @@
 .53
 .52