chore: Suggest vscode users to use the rust-analyzer extension

Merge branch 'ci-fix-kaniko-i-hope' into 'next'
fix(ci): Convince kaniko that it is indeed running in a container by --force-ing it. See merge request famedly/conduit!205
2021-10-29 18:42:15 +02:00 · 2021-09-15 07:05:33 +00:00 · 2021-09-14 20:44:11 +00:00 · 2021-09-14 18:35:12 +00:00 · 2021-09-14 14:33:46 +02:00 · 2021-09-14 12:09:44 +00:00
46 changed files with 657 additions and 793 deletions
@@ -18,7 +18,8 @@ variables:
  stage: "build"
  needs: []
  rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_BRANCH == "master"'
    - if: '$CI_COMMIT_BRANCH == "next"'
    - if: '$CI_COMMIT_TAG'
  interruptible: true
  image: "rust:latest"
@@ -42,6 +43,8 @@ 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:
@@ -72,12 +75,12 @@ build:release:cargo:aarch64-unknown-linux-gnu:
  extends: .build-cargo-shared-settings
  variables:
    TARGET: "aarch64-unknown-linux-gnu"
-    NEEDED_PACKAGES: "build-essential gcc-8-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross"
+    NEEDED_PACKAGES: "build-essential gcc-10-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-8"
+    TARGET_CC: "/usr/bin/aarch64-linux-gnu-gcc-10"
-    TARGET_AR: "/usr/bin/aarch64-linux-gnu-gcc-ar-8"
+    TARGET_AR: "/usr/bin/aarch64-linux-gnu-gcc-ar-10"
  artifacts:
    name: "conduit-aarch64-unknown-linux-gnu"
    paths:
@@ -113,6 +116,8 @@ build:release:cargo:x86_64-unknown-linux-musl:
  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"
@@ -152,7 +157,8 @@ build:debug:cargo:x86_64-unknown-linux-musl:
  stage: "build"
  needs: [ ]
  rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_BRANCH == "master"'
    - if: '$CI_COMMIT_BRANCH == "next"'
    - if: '$CI_COMMIT_TAG'
  interruptible: true
  image: "rust:latest"
@@ -187,11 +193,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: []
@@ -208,8 +214,31 @@ 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 a docker image by packaging up the x86_64-unknown-linux-musl binary into an alpine image
+build:docker:next:
-build:docker:main:
+  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:
  extends: .docker-shared-settings
  needs:
    - "build:release:cargo:x86_64-unknown-linux-musl"
@@ -223,13 +252,31 @@ build:docker:main:
      --build-arg "GIT_REF=$CI_COMMIT_SHORT_SHA"
      --dockerfile "$CI_PROJECT_DIR/docker/ci-binaries-packaging.Dockerfile"
      --destination "$CI_REGISTRY_IMAGE/conduit:latest"
-      --destination "$CI_REGISTRY_IMAGE/conduit:alpine"
+      --destination "$CI_REGISTRY_IMAGE/conduit:latest-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:alpine"
+      --destination "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:latest-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_BRANCH == $CI_DEFAULT_BRANCH'
    - if: '$CI_COMMIT_TAG'
@@ -294,30 +341,6 @@ 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                 #
 # --------------------------------------------------------------------- #
@@ -331,7 +354,8 @@ publish:package:
    - "build:release:cargo:x86_64-unknown-linux-musl"
    - "build:cargo-deb:x86_64-unknown-linux-gnu"
  rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_BRANCH == "master"'
    - if: '$CI_COMMIT_BRANCH == "next"'
    - if: '$CI_COMMIT_TAG'
  image: curlimages/curl:latest
  tags: ["docker"]
@@ -0,0 +1,5 @@
 {
    "recommendations": [
        "matklad.rust-analyzer"
    ]
 }
@@ -7,9 +7,32 @@ If you run into any problems while setting up an Appservice, write an email to `
 ## Tested appservices
 Here are some appservices we tested and that work with Conduit:
- matrix-appservice-discord
+- [matrix-appservice-discord](https://github.com/Half-Shot/matrix-appservice-discord)
- mautrix-hangouts
+- [mautrix-hangouts](https://github.com/mautrix/hangouts/)
- mautrix-telegram
+- [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 bridge (at least up to version `0.2.0`) to work. Before following the bridge installation guide, you need to map apply a patch to bridges `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) (don't forget to change to the correct commit/version of the file) and copy its content, create a `portal.py` on your host system and paste it in. Now you need to change two lines:
  [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
    ```
    and add a new line between [Lines 1041 and 1042](https://github.com/mautrix/signal/blob/4ea831536f154aba6419d13292479eb383ea3308/mautrix_signal/portal.py#L1041-L1042)
    ```diff
        "type": str(EventType.ROOM_POWER_LEVELS),
    +++ "state_key": "",
        "content": power_levels.serialize(),
    ```
    Now you just need to map the patched `portal.py` into the `mautrix-signal` container
    ```yml
    volumes:
      - ./<your>/<path>/<on>/<host>/portal.py:/usr/lib/python3.9/site-packages/mautrix_signal/portal.py
    ```
    and then read below and start following the bridge [installation instructions](https://docs.mau.fi/bridges/index.html).
 ## Set up the appservice
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
 version = 3
 [[package]]
 name = "adler32"
 version = "1.2.0"
@@ -251,7 +253,6 @@ dependencies = [
 "opentelemetry",
 "opentelemetry-jaeger",
 "parking_lot",
 "pretty_env_logger",
 "rand 0.8.4",
 "regex",
 "reqwest",
@@ -272,7 +273,6 @@ dependencies = [
 "tokio",
 "tracing",
 "tracing-flame",
 "tracing-opentelemetry",
 "tracing-subscriber",
 "trust-dns-resolver",
 "webpki 0.22.0",
@@ -590,19 +590,6 @@ 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"
@@ -955,15 +942,6 @@ 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"
@@ -1629,16 +1607,6 @@ 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"
@@ -2000,8 +1968,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "668031e3108d6a2cfbe6eca271d8698f4593440e71a44afdadcf67ce3cb93c1f"
 dependencies = [
 "assign",
 "js_int",
@@ -2022,8 +1989,7 @@ dependencies = [
 [[package]]
 name = "ruma-api"
 version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "f5f1843792b6749ec1ece62595cf99ad30bf9589c96bb237515235e71da396ea"
 dependencies = [
 "bytes",
 "http",
@@ -2039,8 +2005,7 @@ dependencies = [
 [[package]]
 name = "ruma-api-macros"
 version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "7b18abda5cca94178d08b622bca042e1cbb5eb7d4ebf3a2a81590a3bb3c57008"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
@@ -2051,8 +2016,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "49369332a5f299e832e19661f92d49e08c345c3c6c4ab16e09cb31c5ff6da878"
 dependencies = [
 "ruma-api",
 "ruma-common",
@@ -2066,8 +2030,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "9568a222c12cf6220e751484ab78feec28071f85965113a5bb802936a2920ff0"
 dependencies = [
 "assign",
 "bytes",
@@ -2087,8 +2050,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "41d5b7605f58dc0d9cf1848cc7f1af2bae4e4bcd1d2b7a87bbb9864c8a785b91"
 dependencies = [
 "indexmap",
 "js_int",
@@ -2103,8 +2065,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.24.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "87801e1207cfebdee02e7997ebf181a1c9837260b78c1b8ce96b896a2bcb3763"
 dependencies = [
 "indoc",
 "js_int",
@@ -2120,8 +2081,7 @@ dependencies = [
 [[package]]
 name = "ruma-events-macros"
 version = "0.24.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "5da4498845347de88adf1b7da4578e2ca7355ad4ce47b0976f6594bacf958660"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
@@ -2132,8 +2092,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "fa3d1db1a064ab26484df6ef5d96c384fc053022004f34d96c3b4939e13dc204"
 dependencies = [
 "js_int",
 "ruma-api",
@@ -2148,8 +2107,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers"
 version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "cb417d091e8dd5a633e4e5998231a156049d7fcc221045cfdc0642eb72067732"
 dependencies = [
 "paste",
 "rand 0.8.4",
@@ -2163,8 +2121,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-macros"
 version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "c708edad7f605638f26c951cbad7501fbf28ab01009e5ca65ea5a2db74a882b1"
 dependencies = [
 "quote",
 "ruma-identifiers-validation",
@@ -2174,14 +2131,12 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "42285e7fb5d5f2d5268e45bb683e36d5c6fd9fc1e11a4559ba3c3521f3bbb2cb"
 [[package]]
 name = "ruma-identity-service-api"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "e76e66e24f2d5a31511fbf6c79e79f67a7a6a98ebf48d72381b7d5bb6c09f035"
 dependencies = [
 "js_int",
 "ruma-api",
@@ -2194,8 +2149,7 @@ dependencies = [
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "5ef5b29da7065efc5b1e1a8f61add7543c9ab4ecce5ee0dd1c1c5ecec83fbeec"
 dependencies = [
 "js_int",
 "ruma-api",
@@ -2210,8 +2164,7 @@ dependencies = [
 [[package]]
 name = "ruma-serde"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "8b2b22aae842e7ecda695e42b7b39d4558959d9d9a27acc2a16acf4f4f7f00c3"
 dependencies = [
 "bytes",
 "form_urlencoded",
@@ -2225,8 +2178,7 @@ dependencies = [
 [[package]]
 name = "ruma-serde-macros"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "243e9bef188b08f94c79bc2f8fd1eb307a9e636b2b8e4571acf8c7be16381d28"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
@@ -2237,8 +2189,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "4a4f64027165b59500162d10d435b1253898bf3ad4f5002cb0d56913fe7f76d7"
 dependencies = [
 "base64 0.13.0",
 "ed25519-dalek",
@@ -2255,8 +2206,7 @@ dependencies = [
 [[package]]
 name = "ruma-state-res"
 version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2"
 checksum = "518c1afbddfcc5ffac8818a5cf0902709e6eca11aca8f24f6479df6f0601f1ba"
 dependencies = [
 "itertools 0.10.1",
 "js_int",
@@ -2721,15 +2671,6 @@ dependencies = [
 "winapi",
 ]
 [[package]]
 name = "termcolor"
 version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
 dependencies = [
 "winapi-util",
 ]
 [[package]]
 name = "thiserror"
 version = "1.0.28"
@@ -2991,19 +2932,6 @@ dependencies = [
 "tracing-core",
 ]
 [[package]]
 name = "tracing-opentelemetry"
 version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "599f388ecb26b28d9c1b2e4437ae019a7b336018b45ed911458cd9ebf91129f6"
 dependencies = [
 "opentelemetry",
 "tracing",
 "tracing-core",
 "tracing-log",
 "tracing-subscriber",
 ]
 [[package]]
 name = "tracing-serde"
 version = "0.1.2"
@@ -3345,15 +3273,6 @@ 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"
@@ -18,8 +18,8 @@ edition = "2018"
 rocket = { version = "0.5.0-rc.1", features = ["tls"] } # Used to handle requests
 # 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 = { 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 = "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/ruma/ruma", rev = "a6a1224652912a957b09f136ec5da2686be6e0e2", 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 = { 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"] }
@@ -68,11 +68,9 @@ jsonwebtoken = "7.2.0"
 # Performance measurements
 tracing = { version = "0.1.26", features = ["release_max_level_warn"] }
 tracing-subscriber = "0.2.20"
 tracing-opentelemetry = "0.15.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 }
@@ -162,9 +162,6 @@ 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>
 ```
@@ -12,7 +12,7 @@ services:
            - "traefik.http.routers.to-conduit.tls.certresolver=letsencrypt"
            - "traefik.http.routers.to-conduit.middlewares=cors-headers@docker"
-            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowOrigin=*"
+            - "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"
@@ -29,7 +29,7 @@ services:
            - "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.accessControlAllowOrigin=*"
+            - "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"
@@ -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());
@@ -572,7 +572,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,
@@ -586,24 +586,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)?;
        }
    }
@@ -664,8 +664,8 @@ pub async fn deactivate_route(
    if let Some(auth) = &body.auth {
        let (worked, uiaainfo) = db.uiaa.try_auth(
-            &sender_user,
+            sender_user,
-            &sender_device,
+            sender_device,
            auth,
            &uiaainfo,
            &db.users,
@@ -678,7 +678,7 @@ 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."));
@@ -688,10 +688,10 @@ pub async fn deactivate_route(
    // 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<_>>();
@@ -726,7 +726,7 @@ pub async fn deactivate_route(
                state_key: Some(sender_user.to_string()),
                redacts: None,
            },
-            &sender_user,
+            sender_user,
            &room_id,
            &db,
            &state_lock,
@@ -734,7 +734,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);
@@ -112,7 +112,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 +140,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;
@@ -27,7 +27,7 @@ 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()?;
@@ -48,7 +48,7 @@ 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()?;
@@ -71,7 +71,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.",
@@ -101,7 +101,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.",
@@ -132,7 +132,7 @@ 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()?;
@@ -172,11 +172,11 @@ pub async fn add_backup_keys_route(
    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,
+                room_id,
-                &session_id,
+                session_id,
-                &key_data,
+                key_data,
                &db.globals,
            )?
        }
@@ -223,11 +223,11 @@ pub async fn add_backup_key_sessions_route(
    for (session_id, key_data) in &body.sessions {
        db.key_backups.add_key(
-            &sender_user,
+            sender_user,
            &body.version,
            &body.room_id,
-            &session_id,
+            session_id,
-            &key_data,
+            key_data,
            &db.globals,
        )?
    }
@@ -272,7 +272,7 @@ pub async fn add_backup_key_session_route(
    }
    db.key_backups.add_key(
-        &sender_user,
+        sender_user,
        &body.version,
        &body.room_id,
        &body.session_id,
@@ -303,7 +303,7 @@ 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())
 }
@@ -324,7 +324,7 @@ 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())
 }
@@ -345,7 +345,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.",
@@ -368,8 +368,7 @@ 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
+    db.key_backups.delete_all_keys(sender_user, &body.version)?;
        .delete_all_keys(&sender_user, &body.version)?;
    db.flush()?;
@@ -395,7 +394,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()?;
@@ -421,7 +420,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,5 +1,4 @@
-use crate::ConduitResult;
+use crate::{ConduitResult, Ruma};
 use crate::Ruma;
 use ruma::{
    api::client::r0::capabilities::{
        get_capabilities, Capabilities, RoomVersionStability, RoomVersionsCapability,
@@ -50,7 +50,7 @@ pub async fn get_context_route(
    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.")
@@ -72,7 +72,7 @@ pub async fn get_context_route(
    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.")
@@ -50,7 +50,7 @@ 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())
@@ -72,13 +72,13 @@ 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()?;
@@ -119,8 +119,8 @@ pub async fn delete_device_route(
    if let Some(auth) = &body.auth {
        let (worked, uiaainfo) = db.uiaa.try_auth(
-            &sender_user,
+            sender_user,
-            &sender_device,
+            sender_device,
            auth,
            &uiaainfo,
            &db.users,
@@ -133,13 +133,13 @@ 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()?;
@@ -182,8 +182,8 @@ pub async fn delete_devices_route(
    if let Some(auth) = &body.auth {
        let (worked, uiaainfo) = db.uiaa.try_auth(
-            &sender_user,
+            sender_user,
-            &sender_device,
+            sender_device,
            auth,
            &uiaainfo,
            &db.users,
@@ -196,14 +196,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()?;
@@ -158,8 +158,8 @@ pub async fn upload_signing_keys_route(
    if let Some(auth) = &body.auth {
        let (worked, uiaainfo) = db.uiaa.try_auth(
-            &sender_user,
+            sender_user,
-            &sender_device,
+            sender_device,
            auth,
            &uiaainfo,
            &db.users,
@@ -172,7 +172,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 +181,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,
@@ -242,10 +242,10 @@ pub async fn upload_signatures_route(
                        .to_owned(),
                );
                db.users.sign_key(
-                    &user_id,
+                    user_id,
-                    &key_id,
+                    key_id,
                    signature,
-                    &sender_user,
+                    sender_user,
                    &db.rooms,
                    &db.globals,
                )?;
@@ -359,8 +359,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)? {
+                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(
+                    let metadata = db.users.get_device_metadata(user_id, device_id)?.ok_or(
                        Error::BadRequest(
                            ErrorKind::InvalidParam,
                            "Tried to get keys for nonexistent device.",
@@ -1,5 +1,6 @@
 use crate::{
-    database::media::FileMeta, database::DatabaseGuard, utils, ConduitResult, Error, Ruma,
+    database::{media::FileMeta, DatabaseGuard},
    utils, ConduitResult, Error, Ruma,
 };
 use ruma::api::client::{
    error::ErrorKind,
@@ -56,7 +56,7 @@ pub async fn join_room_by_id_route(
    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| {
@@ -105,7 +105,7 @@ pub async fn join_room_by_id_or_alias_route(
        Ok(room_id) => {
            let mut servers = db
                .rooms
-                .invite_state(&sender_user, &room_id)?
+                .invite_state(sender_user, &room_id)?
                .unwrap_or_default()
                .iter()
                .filter_map(|event| {
@@ -243,7 +243,7 @@ pub async fn kick_user_route(
            state_key: Some(body.user_id.to_string()),
            redacts: None,
        },
-        &sender_user,
+        sender_user,
        &body.room_id,
        &db,
        &state_lock,
@@ -319,7 +319,7 @@ pub async fn ban_user_route(
            state_key: Some(body.user_id.to_string()),
            redacts: None,
        },
-        &sender_user,
+        sender_user,
        &body.room_id,
        &db,
        &state_lock,
@@ -384,7 +384,7 @@ pub async fn unban_user_route(
            state_key: Some(body.user_id.to_string()),
            redacts: None,
        },
-        &sender_user,
+        sender_user,
        &body.room_id,
        &db,
        &state_lock,
@@ -416,7 +416,7 @@ 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()?;
@@ -440,7 +440,7 @@ 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(),
    }
@@ -500,7 +500,7 @@ 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)? {
        return Err(Error::BadRequest(
            ErrorKind::Forbidden,
            "You aren't a member of the room.",
@@ -545,7 +545,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.",
        ));
@@ -606,11 +606,11 @@ async fn join_room_by_id_helper(
            "content".to_owned(),
            to_canonical_value(member::MemberEventContent {
                membership: member::MembershipState::Join,
-                displayname: db.users.displayname(&sender_user)?,
+                displayname: db.users.displayname(sender_user)?,
-                avatar_url: db.users.avatar_url(&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"),
@@ -658,7 +658,7 @@ async fn join_room_by_id_helper(
            )
            .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."))?;
@@ -670,7 +670,7 @@ async fn join_room_by_id_helper(
            &send_join_response,
            &room_version,
            &pub_key_map,
-            &db,
+            db,
        )
        .await?;
@@ -678,7 +678,7 @@ async fn join_room_by_id_helper(
            .room_state
            .state
            .iter()
-            .map(|pdu| validate_and_add_event_id(pdu, &room_version, &pub_key_map, &db))
+            .map(|pdu| validate_and_add_event_id(pdu, &room_version, &pub_key_map, db))
        {
            let (event_id, value) = match result {
                Ok(t) => t,
@@ -724,14 +724,14 @@ async fn join_room_by_id_helper(
                .into_iter()
                .map(|(k, id)| db.rooms.compress_state_event(k, &id, &db.globals))
                .collect::<Result<HashSet<_>>>()?,
-            &db,
+            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))
+            .map(|pdu| validate_and_add_event_id(pdu, &room_version, &pub_key_map, db))
        {
            let (event_id, value) = match result {
                Ok(t) => t,
@@ -754,15 +754,15 @@ 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 = member::MemberEventContent {
            membership: member::MembershipState::Join,
-            displayname: db.users.displayname(&sender_user)?,
+            displayname: db.users.displayname(sender_user)?,
-            avatar_url: db.users.avatar_url(&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,
        };
@@ -774,9 +774,9 @@ async fn join_room_by_id_helper(
                state_key: Some(sender_user.to_string()),
                redacts: None,
            },
-            &sender_user,
+            sender_user,
-            &room_id,
+            room_id,
-            &db,
+            db,
            &state_lock,
        )?;
    }
@@ -800,7 +800,7 @@ fn validate_and_add_event_id(
    })?;
    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");
@@ -927,7 +927,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,
            )?;
@@ -976,10 +976,10 @@ pub(crate) async fn invite_helper<'a>(
            let auth_check = state_res::auth_check(
                &room_version,
-                &Arc::new(pdu.clone()),
+                &pdu,
                create_prev_event,
-                None, // TODO: third_party_invite
+                None::<PduEvent>, // TODO: third_party_invite
-                |k, s| auth_events.get(&(k.clone(), s.to_owned())).map(Arc::clone),
+                |k, s| auth_events.get(&(k.clone(), s.to_owned())),
            )
            .map_err(|e| {
                error!("{:?}", e);
@@ -1074,10 +1074,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
@@ -1092,14 +1092,13 @@ pub(crate) async fn invite_helper<'a>(
            "Could not accept incoming PDU as timeline event.",
        ))?;
-        for server in db
+        let servers = db
            .rooms
            .room_servers(room_id)
            .filter_map(|r| r.ok())
-            .filter(|server| &**server != db.globals.server_name())
+            .filter(|server| &**server != db.globals.server_name());
-        {
+
-            db.sending.send_pdu(&server, &pdu_id)?;
+        db.sending.send_pdu(servers, &pdu_id)?;
        }
        return Ok(());
    }
@@ -1119,11 +1118,11 @@ pub(crate) async fn invite_helper<'a>(
            event_type: EventType::RoomMember,
            content: serde_json::to_value(member::MemberEventContent {
                membership: member::MembershipState::Invite,
-                displayname: db.users.displayname(&user_id)?,
+                displayname: db.users.displayname(user_id)?,
-                avatar_url: db.users.avatar_url(&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"),
@@ -1131,9 +1130,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,
    )?;
@@ -79,7 +79,7 @@ pub async fn send_message_event_route(
            state_key: None,
            redacts: None,
        },
-        &sender_user,
+        sender_user,
        &body.room_id,
        &db,
        &state_lock,
@@ -141,7 +141,7 @@ pub async fn get_message_events_route(
        get_message_events::Direction::Forward => {
            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)| {
@@ -171,7 +171,7 @@ pub async fn get_message_events_route(
        get_message_events::Direction::Backward => {
            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)| {
@@ -19,17 +19,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()
@@ -76,7 +76,7 @@ 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;
@@ -34,12 +34,12 @@ 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)
+        .rooms_joined(sender_user)
        .filter_map(|r| r.ok())
        .map(|room_id| {
            Ok::<_, Error>((
@@ -89,19 +89,19 @@ pub async fn set_displayname_route(
        );
        let state_lock = mutex_state.lock().await;
-        let _ =
+        let _ = db
-            db.rooms
+            .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);
        // 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()
@@ -177,14 +177,14 @@ 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)
+        .rooms_joined(sender_user)
        .filter_map(|r| r.ok())
        .map(|room_id| {
            Ok::<_, Error>((
@@ -234,19 +234,19 @@ pub async fn set_avatar_url_route(
        );
        let state_lock = mutex_state.lock().await;
-        let _ =
+        let _ = db
-            db.rooms
+            .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);
        // 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()
@@ -31,7 +31,7 @@ pub async fn get_pushrules_all_route(
    let event = db
        .account_data
-        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -59,7 +59,7 @@ pub async fn get_pushrule_route(
    let event = db
        .account_data
-        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -124,7 +124,7 @@ pub async fn set_pushrule_route(
    let mut event = db
        .account_data
-        .get::<push_rules::PushRulesEvent>(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,13 +193,8 @@ pub async fn set_pushrule_route(
        _ => {}
    }
-    db.account_data.update(
+    db.account_data
-        None,
+        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
        &sender_user,
        EventType::PushRules,
        &event,
        &db.globals,
    )?;
    db.flush()?;
@@ -229,7 +224,7 @@ pub async fn get_pushrule_actions_route(
    let mut event = db
        .account_data
-        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -291,7 +286,7 @@ pub async fn set_pushrule_actions_route(
    let mut event = db
        .account_data
-        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -332,13 +327,8 @@ pub async fn set_pushrule_actions_route(
        _ => {}
    };
-    db.account_data.update(
+    db.account_data
-        None,
+        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
        &sender_user,
        EventType::PushRules,
        &event,
        &db.globals,
    )?;
    db.flush()?;
@@ -368,7 +358,7 @@ pub async fn get_pushrule_enabled_route(
    let mut event = db
        .account_data
-        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -432,7 +422,7 @@ pub async fn set_pushrule_enabled_route(
    let mut event = db
        .account_data
-        .get::<ruma::events::push_rules::PushRulesEvent>(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.",
@@ -478,13 +468,8 @@ pub async fn set_pushrule_enabled_route(
        _ => {}
    }
-    db.account_data.update(
+    db.account_data
-        None,
+        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
        &sender_user,
        EventType::PushRules,
        &event,
        &db.globals,
    )?;
    db.flush()?;
@@ -514,7 +499,7 @@ pub async fn delete_pushrule_route(
    let mut event = db
        .account_data
-        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, sender_user, EventType::PushRules)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "PushRules event not found.",
@@ -550,13 +535,8 @@ pub async fn delete_pushrule_route(
        _ => {}
    }
-    db.account_data.update(
+    db.account_data
-        None,
+        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
        &sender_user,
        EventType::PushRules,
        &event,
        &db.globals,
    )?;
    db.flush()?;
@@ -37,7 +37,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 +46,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 +54,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 +71,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),
@@ -102,7 +102,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 +112,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 +128,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),
@@ -46,7 +46,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,
@@ -106,7 +106,7 @@ pub async fn create_room_route(
            state_key: Some("".to_owned()),
            redacts: None,
        },
-        &sender_user,
+        sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -118,11 +118,11 @@ pub async fn create_room_route(
            event_type: EventType::RoomMember,
            content: serde_json::to_value(member::MemberEventContent {
                membership: member::MembershipState::Join,
-                displayname: db.users.displayname(&sender_user)?,
+                displayname: db.users.displayname(sender_user)?,
-                avatar_url: db.users.avatar_url(&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"),
@@ -130,7 +130,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,
@@ -185,7 +185,7 @@ pub async fn create_room_route(
            state_key: Some("".to_owned()),
            redacts: None,
        },
-        &sender_user,
+        sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -207,7 +207,7 @@ pub async fn create_room_route(
                state_key: Some("".to_owned()),
                redacts: None,
            },
-            &sender_user,
+            sender_user,
            &room_id,
            &db,
            &state_lock,
@@ -235,7 +235,7 @@ pub async fn create_room_route(
            state_key: Some("".to_owned()),
            redacts: None,
        },
-        &sender_user,
+        sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -253,7 +253,7 @@ pub async fn create_room_route(
            state_key: Some("".to_owned()),
            redacts: None,
        },
-        &sender_user,
+        sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -279,7 +279,7 @@ pub async fn create_room_route(
            state_key: Some("".to_owned()),
            redacts: None,
        },
-        &sender_user,
+        sender_user,
        &room_id,
        &db,
        &state_lock,
@@ -298,7 +298,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,7 +312,7 @@ pub async fn create_room_route(
                state_key: Some("".to_owned()),
                redacts: None,
            },
-            &sender_user,
+            sender_user,
            &room_id,
            &db,
            &state_lock,
@@ -331,7 +331,7 @@ pub async fn create_room_route(
                state_key: Some("".to_owned()),
                redacts: None,
            },
-            &sender_user,
+            sender_user,
            &room_id,
            &db,
            &state_lock,
@@ -551,11 +551,11 @@ pub async fn upgrade_room_route(
            event_type: EventType::RoomMember,
            content: serde_json::to_value(member::MemberEventContent {
                membership: member::MembershipState::Join,
-                displayname: db.users.displayname(&sender_user)?,
+                displayname: db.users.displayname(sender_user)?,
-                avatar_url: db.users.avatar_url(&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"),
@@ -27,7 +27,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()
    });
@@ -88,7 +88,7 @@ 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()),
            })
        })
@@ -100,8 +100,8 @@ pub async fn login_route(
        login::IncomingLoginInfo::Token { token } => {
            if let Some(jwt_decoding_key) = db.globals.jwt_decoding_key() {
                let token = jsonwebtoken::decode::<Claims>(
-                    &token,
+                    token,
-                    &jwt_decoding_key,
+                    jwt_decoding_key,
                    &jsonwebtoken::Validation::default(),
                )
                .map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Token is invalid."))?;
@@ -179,7 +179,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()?;
@@ -209,7 +209,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()?;
@@ -308,9 +308,9 @@ async fn send_state_event_for_key_helper(
            state_key: Some(state_key),
            redacts: None,
        },
-        &sender_user,
+        sender_user,
-        &room_id,
+        room_id,
-        &db,
+        db,
        &state_lock,
    )?;
@@ -68,8 +68,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_user_id,
-                    &target_device_id,
+                    target_device_id,
                    &body.event_type,
                    event.deserialize_as().map_err(|_| {
                        Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid")
@@ -78,10 +78,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(|_| {
@@ -21,7 +21,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 +29,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())
@@ -196,9 +196,14 @@ 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)?;
-        let builder = Engine::open(&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)?;
        if config.max_request_size < 1024 {
            eprintln!("ERROR: Max request size is less than 1KB. Please increase it.");
@@ -613,7 +618,7 @@ impl Database {
                    let short_room_id = db
                        .rooms
                        .roomid_shortroomid
-                        .get(&room_id)
+                        .get(room_id)
                        .unwrap()
                        .expect("shortroomid should exist");
@@ -636,7 +641,7 @@ impl Database {
                    let short_room_id = db
                        .rooms
                        .roomid_shortroomid
-                        .get(&room_id)
+                        .get(room_id)
                        .unwrap()
                        .expect("shortroomid should exist");
@@ -672,7 +677,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;
@@ -752,7 +757,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)
@@ -810,12 +815,21 @@ 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(&roomid_prefix));
+            futures.push(self.rooms.pduid_pdu.watch_prefix(&short_roomid));
            // EDUs
            futures.push(
@@ -950,7 +964,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(())
    }
 }
@@ -4,14 +4,14 @@ use parking_lot::{Mutex, MutexGuard, RwLock};
 use rusqlite::{Connection, DatabaseName::Main, OptionalExtension};
 use std::{
    cell::RefCell,
-    collections::HashMap,
+    collections::{hash_map, HashMap},
    future::Future,
    path::{Path, PathBuf},
    pin::Pin,
    sync::Arc,
 };
 use thread_local::ThreadLocal;
-use tokio::sync::oneshot::Sender;
+use tokio::sync::watch;
 use tracing::debug;
 thread_local! {
@@ -56,7 +56,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", &2000)?;
+        conn.pragma_update(Some(Main), "wal_autocheckpoint", &0)?;
        Ok(conn)
    }
@@ -77,7 +77,7 @@ impl Engine {
    pub fn flush_wal(self: &Arc<Self>) -> Result<()> {
        self.write_lock()
-            .pragma_update(Some(Main), "wal_checkpoint", &"TRUNCATE")?;
+            .pragma_update(Some(Main), "wal_checkpoint", &"RESTART")?;
        Ok(())
    }
 }
@@ -126,7 +126,7 @@ impl DatabaseEngine for Engine {
 pub struct SqliteTable {
    engine: Arc<Engine>,
    name: String,
-    watchers: RwLock<HashMap<Vec<u8>, Vec<Sender<()>>>>,
+    watchers: RwLock<HashMap<Vec<u8>, (watch::Sender<()>, watch::Receiver<()>)>>,
 }
 type TupleOfBytes = (Vec<u8>, Vec<u8>);
@@ -192,7 +192,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,10 +215,8 @@ impl Tree for SqliteTable {
        if !triggered.is_empty() {
            let mut watchers = self.watchers.write();
            for prefix in triggered {
-                if let Some(txs) = watchers.remove(prefix) {
+                if let Some(tx) = watchers.remove(prefix) {
-                    for tx in txs {
+                    let _ = tx.0.send(());
                        let _ = tx.send(());
                    }
                }
            }
        };
@@ -275,7 +273,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))]
@@ -367,17 +365,18 @@ 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 (tx, rx) = tokio::sync::oneshot::channel();
+        let mut rx = match self.watchers.write().entry(prefix.to_vec()) {
-
+            hash_map::Entry::Occupied(o) => o.get().1.clone(),
-        self.watchers
+            hash_map::Entry::Vacant(v) => {
-            .write()
+                let (tx, rx) = tokio::sync::watch::channel(());
-            .entry(prefix.to_vec())
+                v.insert((tx, rx.clone()));
-            .or_default()
+                rx
-            .push(tx);
+            }
        };
        Box::pin(async move {
            // Tx is never destroyed
-            rx.await.unwrap();
+            rx.changed().await.unwrap();
        })
    }
@@ -32,13 +32,13 @@ 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;
        key.extend_from_slice(event_type.as_bytes());
@@ -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
@@ -113,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."))
        });
@@ -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,7 +75,7 @@ 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(),
        )?;
@@ -192,7 +192,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
@@ -223,7 +223,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(|_| {
@@ -231,7 +231,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."))?,
@@ -280,7 +280,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(|_| {
@@ -325,7 +325,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) {
@@ -343,9 +343,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) {
@@ -364,11 +364,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,7 +4,10 @@ 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, io::AsyncWriteExt};
+use tokio::{
    fs::File,
    io::{AsyncReadExt, AsyncWriteExt},
 };
 pub struct FileMeta {
    pub content_disposition: Option<String>,
@@ -236,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,
@@ -302,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?;
@@ -332,7 +332,7 @@ async fn send_notice(
        send_request(
            &db.globals,
-            &url,
+            url,
            send_event_notification::v1::Request::new(notifi),
        )
        .await?;
@@ -252,12 +252,7 @@ impl Rooms {
                return Ok(HashMap::new());
            };
-        let auth_events = state_res::auth_types_for_event(
+        let auth_events = state_res::auth_types_for_event(kind, sender, state_key, content);
            kind,
            sender,
            state_key.map(|s| s.to_string()),
            content.clone(),
        );
        let mut sauthevents = auth_events
            .into_iter()
@@ -344,7 +339,7 @@ impl Rooms {
        new_state_ids_compressed: HashSet<CompressedStateEvent>,
        db: &Database,
    ) -> Result<()> {
-        let previous_shortstatehash = self.current_shortstatehash(&room_id)?;
+        let previous_shortstatehash = self.current_shortstatehash(room_id)?;
        let state_hash = self.calculate_hash(
            &new_state_ids_compressed
@@ -429,7 +424,7 @@ impl Rooms {
            }
        }
-        self.update_joined_count(room_id, &db)?;
+        self.update_joined_count(room_id, db)?;
        self.roomid_shortstatehash
            .insert(room_id.as_bytes(), &new_shortstatehash.to_be_bytes())?;
@@ -709,7 +704,7 @@ impl Rooms {
        event_id: &EventId,
        globals: &super::globals::Globals,
    ) -> Result<u64> {
-        if let Some(short) = self.eventidshort_cache.lock().unwrap().get_mut(&event_id) {
+        if let Some(short) = self.eventidshort_cache.lock().unwrap().get_mut(event_id) {
            return Ok(*short);
        }
@@ -737,7 +732,7 @@ impl Rooms {
    #[tracing::instrument(skip(self))]
    pub fn get_shortroomid(&self, room_id: &RoomId) -> Result<Option<u64>> {
        self.roomid_shortroomid
-            .get(&room_id.as_bytes())?
+            .get(room_id.as_bytes())?
            .map(|bytes| {
                utils::u64_from_bytes(&bytes)
                    .map_err(|_| Error::bad_database("Invalid shortroomid in db."))
@@ -762,7 +757,7 @@ impl Rooms {
        let mut statekey = event_type.as_ref().as_bytes().to_vec();
        statekey.push(0xff);
-        statekey.extend_from_slice(&state_key.as_bytes());
+        statekey.extend_from_slice(state_key.as_bytes());
        let short = self
            .statekey_shortstatekey
@@ -789,13 +784,13 @@ impl Rooms {
        room_id: &RoomId,
        globals: &super::globals::Globals,
    ) -> Result<u64> {
-        Ok(match self.roomid_shortroomid.get(&room_id.as_bytes())? {
+        Ok(match self.roomid_shortroomid.get(room_id.as_bytes())? {
            Some(short) => utils::u64_from_bytes(&short)
                .map_err(|_| Error::bad_database("Invalid shortroomid in db."))?,
            None => {
                let short = globals.next_count()?;
                self.roomid_shortroomid
-                    .insert(&room_id.as_bytes(), &short.to_be_bytes())?;
+                    .insert(room_id.as_bytes(), &short.to_be_bytes())?;
                short
            }
        })
@@ -819,7 +814,7 @@ impl Rooms {
        let mut statekey = event_type.as_ref().as_bytes().to_vec();
        statekey.push(0xff);
-        statekey.extend_from_slice(&state_key.as_bytes());
+        statekey.extend_from_slice(state_key.as_bytes());
        let short = match self.statekey_shortstatekey.get(&statekey)? {
            Some(shortstatekey) => utils::u64_from_bytes(&shortstatekey)
@@ -896,12 +891,12 @@ impl Rooms {
            .ok_or_else(|| Error::bad_database("Invalid statekey in shortstatekey_statekey."))?;
        let event_type =
-            EventType::try_from(utils::string_from_bytes(&eventtype_bytes).map_err(|_| {
+            EventType::try_from(utils::string_from_bytes(eventtype_bytes).map_err(|_| {
                Error::bad_database("Event type in shortstatekey_statekey is invalid unicode.")
            })?)
            .map_err(|_| Error::bad_database("Event type in shortstatekey_statekey is invalid."))?;
-        let state_key = utils::string_from_bytes(&statekey_bytes).map_err(|_| {
+        let state_key = utils::string_from_bytes(statekey_bytes).map_err(|_| {
            Error::bad_database("Statekey in shortstatekey_statekey is invalid unicode.")
        })?;
@@ -961,10 +956,8 @@ impl Rooms {
    /// Returns the `count` of this pdu's id.
    #[tracing::instrument(skip(self))]
    pub fn pdu_count(&self, pdu_id: &[u8]) -> Result<u64> {
-        Ok(
+        utils::u64_from_bytes(&pdu_id[pdu_id.len() - size_of::<u64>()..])
-            utils::u64_from_bytes(&pdu_id[pdu_id.len() - size_of::<u64>()..])
+            .map_err(|_| Error::bad_database("PDU has invalid count bytes."))
                .map_err(|_| Error::bad_database("PDU has invalid count bytes."))?,
        )
    }
    /// Returns the `count` of this pdu's id.
@@ -1081,7 +1074,7 @@ impl Rooms {
    /// Checks the `eventid_outlierpdu` Tree if not found in the timeline.
    #[tracing::instrument(skip(self))]
    pub fn get_pdu(&self, event_id: &EventId) -> Result<Option<Arc<PduEvent>>> {
-        if let Some(p) = self.pdu_cache.lock().unwrap().get_mut(&event_id) {
+        if let Some(p) = self.pdu_cache.lock().unwrap().get_mut(event_id) {
            return Ok(Some(Arc::clone(p)));
        }
@@ -1143,9 +1136,9 @@ impl Rooms {
    /// Removes a pdu and creates a new one with the same id.
    #[tracing::instrument(skip(self))]
    fn replace_pdu(&self, pdu_id: &[u8], pdu: &PduEvent) -> Result<()> {
-        if self.pduid_pdu.get(&pdu_id)?.is_some() {
+        if self.pduid_pdu.get(pdu_id)?.is_some() {
            self.pduid_pdu.insert(
-                &pdu_id,
+                pdu_id,
                &serde_json::to_vec(pdu).expect("PduEvent::to_vec always works"),
            )?;
            Ok(())
@@ -1230,20 +1223,20 @@ impl Rooms {
    #[tracing::instrument(skip(self, pdu))]
    pub fn add_pdu_outlier(&self, event_id: &EventId, pdu: &CanonicalJsonObject) -> Result<()> {
        self.eventid_outlierpdu.insert(
-            &event_id.as_bytes(),
+            event_id.as_bytes(),
            &serde_json::to_vec(&pdu).expect("CanonicalJsonObject is valid"),
        )
    }
    #[tracing::instrument(skip(self))]
    pub fn mark_event_soft_failed(&self, event_id: &EventId) -> Result<()> {
-        self.softfailedeventids.insert(&event_id.as_bytes(), &[])
+        self.softfailedeventids.insert(event_id.as_bytes(), &[])
    }
    #[tracing::instrument(skip(self))]
    pub fn is_event_soft_failed(&self, event_id: &EventId) -> Result<bool> {
        self.softfailedeventids
-            .get(&event_id.as_bytes())
+            .get(event_id.as_bytes())
            .map(|o| o.is_some())
    }
@@ -1273,7 +1266,7 @@ impl Rooms {
            {
                if let Some(shortstatehash) = self.pdu_shortstatehash(&pdu.event_id).unwrap() {
                    if let Some(prev_state) = self
-                        .state_get(shortstatehash, &pdu.kind, &state_key)
+                        .state_get(shortstatehash, &pdu.kind, state_key)
                        .unwrap()
                    {
                        unsigned.insert(
@@ -1355,15 +1348,15 @@ impl Rooms {
            let rules_for_user = db
                .account_data
-                .get::<push_rules::PushRulesEvent>(None, &user, EventType::PushRules)?
+                .get::<push_rules::PushRulesEvent>(None, user, EventType::PushRules)?
                .map(|ev| ev.content.global)
-                .unwrap_or_else(|| push::Ruleset::server_default(&user));
+                .unwrap_or_else(|| push::Ruleset::server_default(user));
            let mut highlight = false;
            let mut notify = false;
            for action in pusher::get_actions(
-                &user,
+                user,
                &rules_for_user,
                &power_levels,
                &sync_pdu,
@@ -1393,7 +1386,7 @@ impl Rooms {
                highlights.push(userroom_id);
            }
-            for senderkey in db.pusher.get_pusher_senderkeys(&user) {
+            for senderkey in db.pusher.get_pusher_senderkeys(user) {
                db.sending.send_push_pdu(&*pdu_id, senderkey)?;
            }
        }
@@ -1406,7 +1399,7 @@ impl Rooms {
        match pdu.kind {
            EventType::RoomRedaction => {
                if let Some(redact_id) = &pdu.redacts {
-                    self.redact_pdu(&redact_id, &pdu)?;
+                    self.redact_pdu(redact_id, pdu)?;
                }
            }
            EventType::RoomMember => {
@@ -1746,9 +1739,9 @@ impl Rooms {
        state_ids_compressed: HashSet<CompressedStateEvent>,
        globals: &super::globals::Globals,
    ) -> Result<()> {
-        let shorteventid = self.get_or_create_shorteventid(&event_id, globals)?;
+        let shorteventid = self.get_or_create_shorteventid(event_id, globals)?;
-        let previous_shortstatehash = self.current_shortstatehash(&room_id)?;
+        let previous_shortstatehash = self.current_shortstatehash(room_id)?;
        let state_hash = self.calculate_hash(
            &state_ids_compressed
@@ -1820,7 +1813,7 @@ impl Rooms {
                .map_or_else(|| Ok(Vec::new()), |p| self.load_shortstatehash_info(p))?;
            let shortstatekey =
-                self.get_or_create_shortstatekey(&new_pdu.kind, &state_key, globals)?;
+                self.get_or_create_shortstatekey(&new_pdu.kind, state_key, globals)?;
            let new = self.compress_state_event(shortstatekey, &new_pdu.event_id, globals)?;
@@ -1845,7 +1838,7 @@ impl Rooms {
            let mut statediffremoved = HashSet::new();
            if let Some(replaces) = replaces {
-                statediffremoved.insert(replaces.clone());
+                statediffremoved.insert(*replaces);
            }
            self.save_state_from_diff(
@@ -1958,12 +1951,12 @@ impl Rooms {
        } = pdu_builder;
        let prev_events = self
-            .get_pdu_leaves(&room_id)?
+            .get_pdu_leaves(room_id)?
            .into_iter()
            .take(20)
            .collect::<Vec<_>>();
-        let create_event = self.room_state_get(&room_id, &EventType::RoomCreate, "")?;
+        let create_event = self.room_state_get(room_id, &EventType::RoomCreate, "")?;
        let create_event_content = create_event
            .as_ref()
@@ -1993,13 +1986,8 @@ impl Rooms {
            });
        let room_version = RoomVersion::new(&room_version_id).expect("room version is supported");
-        let auth_events = self.get_auth_events(
+        let auth_events =
-            &room_id,
+            self.get_auth_events(room_id, &event_type, sender, state_key.as_deref(), &content)?;
            &event_type,
            &sender,
            state_key.as_deref(),
            &content,
        )?;
        // Our depth is the maximum depth of prev_events + 1
        let depth = prev_events
@@ -2011,7 +1999,7 @@ impl Rooms {
        let mut unsigned = unsigned.unwrap_or_default();
        if let Some(state_key) = &state_key {
-            if let Some(prev_pdu) = self.room_state_get(&room_id, &event_type, &state_key)? {
+            if let Some(prev_pdu) = self.room_state_get(room_id, &event_type, state_key)? {
                unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone());
                unsigned.insert(
                    "prev_sender".to_owned(),
@@ -2046,10 +2034,10 @@ impl Rooms {
        let auth_check = state_res::auth_check(
            &room_version,
-            &Arc::new(pdu.clone()),
+            &pdu,
            create_prev_event,
-            None, // TODO: third_party_invite
+            None::<PduEvent>, // TODO: third_party_invite
-            |k, s| auth_events.get(&(k.clone(), s.to_owned())).map(Arc::clone),
+            |k, s| auth_events.get(&(k.clone(), s.to_owned())),
        )
        .map_err(|e| {
            error!("{:?}", e);
@@ -2114,15 +2102,14 @@ impl Rooms {
        // 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
-        self.set_room_state(&room_id, statehashid)?;
+        self.set_room_state(room_id, statehashid)?;
-        for server in self
+        let servers = self
            .room_servers(room_id)
            .filter_map(|r| r.ok())
-            .filter(|server| &**server != db.globals.server_name())
+            .filter(|server| &**server != db.globals.server_name());
-        {
+
-            db.sending.send_pdu(&server, &pdu_id)?;
+        db.sending.send_pdu(servers, &pdu_id)?;
        }
        for appservice in db.appservice.all()? {
            if self.appservice_in_room(room_id, &appservice, db)? {
@@ -2159,10 +2146,10 @@ impl Rooms {
                            && pdu
                                .state_key
                                .as_ref()
-                                .map_or(false, |state_key| users.is_match(&state_key))
+                                .map_or(false, |state_key| users.is_match(state_key))
                };
                let matching_aliases = |aliases: &Regex| {
-                    self.room_aliases(&room_id)
+                    self.room_aliases(room_id)
                        .filter_map(|r| r.ok())
                        .any(|room_alias| aliases.is_match(room_alias.as_str()))
                };
@@ -2305,7 +2292,7 @@ impl Rooms {
            let mut pdu = self
                .get_pdu_from_id(&pdu_id)?
                .ok_or_else(|| Error::bad_database("PDU ID points to invalid PDU."))?;
-            pdu.redact(&reason)?;
+            pdu.redact(reason)?;
            self.replace_pdu(&pdu_id, &pdu)?;
            Ok(())
        } else {
@@ -2353,13 +2340,13 @@ impl Rooms {
        match &membership {
            member::MembershipState::Join => {
                // Check if the user never joined this room
-                if !self.once_joined(&user_id, &room_id)? {
+                if !self.once_joined(user_id, room_id)? {
                    // Add the user ID to the join list then
                    self.roomuseroncejoinedids.insert(&userroom_id, &[])?;
                    // Check if the room has a predecessor
                    if let Some(predecessor) = self
-                        .room_state_get(&room_id, &EventType::RoomCreate, "")?
+                        .room_state_get(room_id, &EventType::RoomCreate, "")?
                        .and_then(|create| {
                            serde_json::from_value::<
                                Raw<ruma::events::room::create::CreateEventContent>,
@@ -2460,12 +2447,12 @@ impl Rooms {
                let is_ignored = db
                    .account_data
                    .get::<ignored_user_list::IgnoredUserListEvent>(
-                        None,     // Ignored users are in global account data
+                        None,    // Ignored users are in global account data
-                        &user_id, // Receiver
+                        user_id, // Receiver
                        EventType::IgnoredUserList,
                    )?
                    .map_or(false, |ignored| {
-                        ignored.content.ignored_users.contains(&sender)
+                        ignored.content.ignored_users.contains(sender)
                    });
                if is_ignored {
@@ -2527,7 +2514,7 @@ impl Rooms {
        let mut joined_servers = HashSet::new();
        let mut real_users = HashSet::new();
-        for joined in self.room_members(&room_id).filter_map(|r| r.ok()) {
+        for joined in self.room_members(room_id).filter_map(|r| r.ok()) {
            joined_servers.insert(joined.server_name().to_owned());
            if joined.server_name() == db.globals.server_name()
                && !db.users.is_deactivated(&joined).unwrap_or(true)
@@ -2537,7 +2524,7 @@ impl Rooms {
            joinedcount += 1;
        }
-        for invited in self.room_members_invited(&room_id).filter_map(|r| r.ok()) {
+        for invited in self.room_members_invited(room_id).filter_map(|r| r.ok()) {
            joined_servers.insert(invited.server_name().to_owned());
            invitedcount += 1;
        }
@@ -2606,7 +2593,7 @@ impl Rooms {
        if let Some(users) = maybe {
            Ok(users)
        } else {
-            self.update_joined_count(room_id, &db)?;
+            self.update_joined_count(room_id, db)?;
            Ok(Arc::clone(
                self.our_real_users_cache
                    .read()
@@ -2655,7 +2642,7 @@ impl Rooms {
            let in_room = bridge_user_id
                .map_or(false, |id| self.is_joined(&id, room_id).unwrap_or(false))
-                || self.room_members(&room_id).any(|userid| {
+                || self.room_members(room_id).any(|userid| {
                    userid.map_or(false, |userid| {
                        users.iter().any(|r| r.is_match(userid.as_str()))
                    })
@@ -2895,21 +2882,21 @@ impl Rooms {
        if let Some(room_id) = room_id {
            // New alias
            self.alias_roomid
-                .insert(&alias.alias().as_bytes(), room_id.as_bytes())?;
+                .insert(alias.alias().as_bytes(), room_id.as_bytes())?;
            let mut aliasid = room_id.as_bytes().to_vec();
            aliasid.push(0xff);
            aliasid.extend_from_slice(&globals.next_count()?.to_be_bytes());
            self.aliasid_alias.insert(&aliasid, &*alias.as_bytes())?;
        } else {
            // room_id=None means remove alias
-            if let Some(room_id) = self.alias_roomid.get(&alias.alias().as_bytes())? {
+            if let Some(room_id) = self.alias_roomid.get(alias.alias().as_bytes())? {
                let mut prefix = room_id.to_vec();
                prefix.push(0xff);
                for (key, _) in self.aliasid_alias.scan_prefix(prefix) {
                    self.aliasid_alias.remove(&key)?;
                }
-                self.alias_roomid.remove(&alias.alias().as_bytes())?;
+                self.alias_roomid.remove(alias.alias().as_bytes())?;
            } else {
                return Err(Error::BadRequest(
                    ErrorKind::NotFound,
@@ -3082,7 +3069,7 @@ impl Rooms {
        self.roomserverids.scan_prefix(prefix).map(|(key, _)| {
            Box::<ServerName>::try_from(
                utils::string_from_bytes(
-                    &key.rsplit(|&b| b == 0xff)
+                    key.rsplit(|&b| b == 0xff)
                        .next()
                        .expect("rsplit always returns an element"),
                )
@@ -3115,7 +3102,7 @@ impl Rooms {
        self.serverroomids.scan_prefix(prefix).map(|(key, _)| {
            RoomId::try_from(
                utils::string_from_bytes(
-                    &key.rsplit(|&b| b == 0xff)
+                    key.rsplit(|&b| b == 0xff)
                        .next()
                        .expect("rsplit always returns an element"),
                )
@@ -3137,7 +3124,7 @@ impl Rooms {
        self.roomuserid_joined.scan_prefix(prefix).map(|(key, _)| {
            UserId::try_from(
                utils::string_from_bytes(
-                    &key.rsplit(|&b| b == 0xff)
+                    key.rsplit(|&b| b == 0xff)
                        .next()
                        .expect("rsplit always returns an element"),
                )
@@ -3151,26 +3138,24 @@ impl Rooms {
    #[tracing::instrument(skip(self))]
    pub fn room_joined_count(&self, room_id: &RoomId) -> Result<Option<u64>> {
-        Ok(self
+        self.roomid_joinedcount
            .roomid_joinedcount
            .get(room_id.as_bytes())?
            .map(|b| {
                utils::u64_from_bytes(&b)
                    .map_err(|_| Error::bad_database("Invalid joinedcount in db."))
            })
-            .transpose()?)
+            .transpose()
    }
    #[tracing::instrument(skip(self))]
    pub fn room_invited_count(&self, room_id: &RoomId) -> Result<Option<u64>> {
-        Ok(self
+        self.roomid_invitedcount
            .roomid_invitedcount
            .get(room_id.as_bytes())?
            .map(|b| {
                utils::u64_from_bytes(&b)
                    .map_err(|_| Error::bad_database("Invalid joinedcount in db."))
            })
-            .transpose()?)
+            .transpose()
    }
    /// Returns an iterator over all User IDs who ever joined a room.
@@ -3187,7 +3172,7 @@ impl Rooms {
            .map(|(key, _)| {
                UserId::try_from(
                    utils::string_from_bytes(
-                        &key.rsplit(|&b| b == 0xff)
+                        key.rsplit(|&b| b == 0xff)
                            .next()
                            .expect("rsplit always returns an element"),
                    )
@@ -3213,7 +3198,7 @@ impl Rooms {
            .map(|(key, _)| {
                UserId::try_from(
                    utils::string_from_bytes(
-                        &key.rsplit(|&b| b == 0xff)
+                        key.rsplit(|&b| b == 0xff)
                            .next()
                            .expect("rsplit always returns an element"),
                    )
@@ -3266,7 +3251,7 @@ impl Rooms {
            .map(|(key, _)| {
                RoomId::try_from(
                    utils::string_from_bytes(
-                        &key.rsplit(|&b| b == 0xff)
+                        key.rsplit(|&b| b == 0xff)
                            .next()
                            .expect("rsplit always returns an element"),
                    )
@@ -3292,7 +3277,7 @@ impl Rooms {
            .map(|(key, state)| {
                let room_id = RoomId::try_from(
                    utils::string_from_bytes(
-                        &key.rsplit(|&b| b == 0xff)
+                        key.rsplit(|&b| b == 0xff)
                            .next()
                            .expect("rsplit always returns an element"),
                    )
@@ -3317,7 +3302,7 @@ impl Rooms {
    ) -> Result<Option<Vec<Raw<AnyStrippedStateEvent>>>> {
        let mut key = user_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(&room_id.as_bytes());
+        key.extend_from_slice(room_id.as_bytes());
        self.userroomid_invitestate
            .get(&key)?
@@ -3338,7 +3323,7 @@ impl Rooms {
    ) -> Result<Option<Vec<Raw<AnyStrippedStateEvent>>>> {
        let mut key = user_id.as_bytes().to_vec();
        key.push(0xff);
-        key.extend_from_slice(&room_id.as_bytes());
+        key.extend_from_slice(room_id.as_bytes());
        self.userroomid_leftstate
            .get(&key)?
@@ -3365,7 +3350,7 @@ impl Rooms {
            .map(|(key, state)| {
                let room_id = RoomId::try_from(
                    utils::string_from_bytes(
-                        &key.rsplit(|&b| b == 0xff)
+                        key.rsplit(|&b| b == 0xff)
                            .next()
                            .expect("rsplit always returns an element"),
                    )
@@ -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,7 +157,7 @@ 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
@@ -193,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(())
    }
@@ -224,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(())
@@ -268,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(())
@@ -285,7 +285,7 @@ impl RoomEdus {
        Ok(self
            .roomid_lasttypingupdate
-            .get(&room_id.as_bytes())?
+            .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.")
@@ -342,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,
@@ -361,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(),
        )?;
@@ -371,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.")
@@ -394,7 +394,7 @@ 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)?
@@ -480,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(),
            )?;
        }
@@ -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>, // ServernamEvent = (+ / $)SenderKey / ServerName / UserId + PduId / Id (for edus), Data = EDU content
+    pub(super) servernameevent_data: Arc<dyn Tree>, // ServernameEvent = (+ / $)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>)>,
@@ -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.servercurrentevent_data.insert(key, value).unwrap();
-                                        guard.sending.servernameevent_data.remove(&key).unwrap();
+                                        guard.sending.servernameevent_data.remove(key).unwrap();
                                    }
                                    drop(guard);
@@ -345,7 +345,7 @@ impl Sending {
                }
                let event =
-                    serde_json::from_str::<AnySyncEphemeralRoomEvent>(&read_receipt.json().get())
+                    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) => {
@@ -423,13 +423,23 @@ impl Sending {
        Ok(())
    }
-    #[tracing::instrument(skip(self, server, pdu_id))]
+    #[tracing::instrument(skip(self, servers, pdu_id))]
-    pub fn send_pdu(&self, server: &ServerName, pdu_id: &[u8]) -> Result<()> {
+    pub fn send_pdu<I: Iterator<Item = Box<ServerName>>>(
-        let mut key = server.as_bytes().to_vec();
+        &self,
-        key.push(0xff);
+        servers: I,
-        key.extend_from_slice(pdu_id);
+        pdu_id: &[u8],
-        self.servernameevent_data.insert(&key, &[])?;
+    ) -> Result<()> {
-        self.sender.unbounded_send((key, vec![])).unwrap();
+        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)?;
        Ok(())
    }
@@ -486,7 +496,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(|| {
                                    (
@@ -543,7 +553,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(|| {
                                        (
@@ -636,7 +646,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(|| {
                                        (
@@ -711,7 +721,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")
            })?;
@@ -750,7 +760,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")
            })?;
@@ -54,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() {
@@ -81,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.")
                    })?,
                )))
@@ -121,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(())
@@ -245,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(())
    }
@@ -294,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."))?,
@@ -357,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(),
        );
@@ -368,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(())
    }
@@ -376,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.")
@@ -402,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)
@@ -680,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, "")?
@@ -961,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
@@ -199,16 +199,27 @@ async fn main() {
    std::env::set_var("RUST_LOG", "warn");
-    let config = raw_config
+    let config = match raw_config.extract::<Config>() {
-        .extract::<Config>()
+        Ok(s) => s,
-        .expect("It looks like your config is invalid. Please take a look at the error");
+        Err(e) => {
            eprintln!("It looks like your config is invalid. The following error occured while parsing it: {}", e);
            std::process::exit(1);
        }
    };
    let start = async {
        config.warn_deprecated();
-        let db = Database::load_or_create(&config)
+        let db = match Database::load_or_create(&config).await {
-            .await
+            Ok(db) => db,
-            .expect("config is valid");
+            Err(e) => {
                eprintln!(
                    "The database couldn't be loaded or created. The following error occured: {}",
                    e
                );
                std::process::exit(1);
            }
        };
        let rocket = setup_rocket(raw_config, Arc::clone(&db))
            .ignite()
@@ -260,37 +260,47 @@ impl state_res::Event for PduEvent {
    fn sender(&self) -> &UserId {
        &self.sender
    }
-    fn kind(&self) -> EventType {
+
-        self.kind.clone()
+    fn event_type(&self) -> &EventType {
        &self.kind
    }
-    fn content(&self) -> serde_json::Value {
+    fn content(&self) -> &serde_json::Value {
-        self.content.clone()
+        &self.content
    }
    fn origin_server_ts(&self) -> MilliSecondsSinceUnixEpoch {
        MilliSecondsSinceUnixEpoch(self.origin_server_ts)
    }
-    fn state_key(&self) -> Option<String> {
+
-        self.state_key.clone()
+    fn state_key(&self) -> Option<&str> {
        self.state_key.as_deref()
    }
-    fn prev_events(&self) -> Vec<EventId> {
+
-        self.prev_events.to_vec()
+    fn prev_events(&self) -> Box<dyn DoubleEndedIterator<Item = &EventId> + '_> {
        Box::new(self.prev_events.iter())
    }
    fn depth(&self) -> &UInt {
        &self.depth
    }
-    fn auth_events(&self) -> Vec<EventId> {
+
-        self.auth_events.to_vec()
+    fn auth_events(&self) -> Box<dyn DoubleEndedIterator<Item = &EventId> + '_> {
        Box::new(self.auth_events.iter())
    }
    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
    }
@@ -66,7 +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 let Err(_) = handle.read_to_end(&mut body).await {
+        if handle.read_to_end(&mut body).await.is_err() {
            // Client disconnected
            // Missing Token
            return Failure((Status::new(582), ()));
@@ -123,7 +123,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)) => (
@@ -150,7 +150,7 @@ where
    } else {
        write_destination_to_cache = true;
-        let result = find_actual_destination(globals, &destination).await;
+        let result = find_actual_destination(globals, destination).await;
        (result.0, result.1.into_uri_string())
    };
@@ -359,7 +359,7 @@ async fn find_actual_destination(
                let (host, port) = destination_str.split_at(pos);
                FedDest::Named(host.to_string(), port.to_string())
            } else {
-                match request_well_known(globals, &destination.as_str()).await {
+                match request_well_known(globals, destination.as_str()).await {
                    // 3: A .well-known file is available
                    Some(delegated_hostname) => {
                        hostname = add_port_to_hostname(&delegated_hostname).into_uri_string();
@@ -806,7 +806,7 @@ pub async fn send_transaction_message_route(
                            .event_ids
                            .iter()
                            .filter_map(|id| {
-                                db.rooms.get_pdu_count(&id).ok().flatten().map(|r| (id, r))
+                                db.rooms.get_pdu_count(id).ok().flatten().map(|r| (id, r))
                            })
                            .max_by_key(|(_, count)| *count)
                        {
@@ -875,8 +875,8 @@ pub async fn send_transaction_message_route(
                            DeviceIdOrAllDevices::DeviceId(target_device_id) => {
                                db.users.add_to_device_event(
                                    &sender,
-                                    &target_user_id,
+                                    target_user_id,
-                                    &target_device_id,
+                                    target_device_id,
                                    &ev_type.to_string(),
                                    event.deserialize_as().map_err(|_| {
                                        Error::BadRequest(
@@ -889,10 +889,10 @@ pub async fn send_transaction_message_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,
-                                        &target_user_id,
+                                        target_user_id,
                                        &target_device_id?,
                                        &ev_type.to_string(),
                                        event.deserialize_as().map_err(|_| {
@@ -959,7 +959,7 @@ pub(crate) async fn handle_incoming_pdu<'a>(
    db: &'a Database,
    pub_key_map: &'a RwLock<BTreeMap<String, BTreeMap<String, String>>>,
 ) -> StdResult<Option<Vec<u8>>, String> {
-    match db.rooms.exists(&room_id) {
+    match db.rooms.exists(room_id) {
        Ok(true) => {}
        _ => {
            return Err("Room is unknown to this server.".to_string());
@@ -967,16 +967,22 @@ pub(crate) async fn handle_incoming_pdu<'a>(
    }
    // 1. Skip the PDU if we already have it as a timeline event
-    if let Ok(Some(pdu_id)) = db.rooms.get_pdu_id(&event_id) {
+    if let Ok(Some(pdu_id)) = db.rooms.get_pdu_id(event_id) {
        return Ok(Some(pdu_id.to_vec()));
    }
    let create_event = db
        .rooms
-        .room_state_get(&room_id, &EventType::RoomCreate, "")
+        .room_state_get(room_id, &EventType::RoomCreate, "")
        .map_err(|_| "Failed to ask database for event.".to_owned())?
        .ok_or_else(|| "Failed to find create event in db.".to_owned())?;
    let first_pdu_in_room = db
        .rooms
        .first_pdu_in_room(room_id)
        .map_err(|_| "Error loading first room event.".to_owned())?
        .expect("Room exists");
    let (incoming_pdu, val) = handle_outlier_pdu(
        origin,
        &create_event,
@@ -993,13 +999,7 @@ pub(crate) async fn handle_incoming_pdu<'a>(
        return Ok(None);
    }
-    if incoming_pdu.origin_server_ts
+    if incoming_pdu.origin_server_ts < first_pdu_in_room.origin_server_ts {
        < db.rooms
            .first_pdu_in_room(&room_id)
            .map_err(|_| "Error loading first room event.".to_owned())?
            .expect("Room exists")
            .origin_server_ts
    {
        return Ok(None);
    }
@@ -1021,7 +1021,7 @@ pub(crate) async fn handle_incoming_pdu<'a>(
            origin,
            &[prev_event_id.clone()],
            &create_event,
-            &room_id,
+            room_id,
            pub_key_map,
        )
        .await
@@ -1037,13 +1037,7 @@ pub(crate) async fn handle_incoming_pdu<'a>(
            if let Some(json) =
                json_opt.or_else(|| db.rooms.get_outlier_pdu_json(&prev_event_id).ok().flatten())
            {
-                if pdu.origin_server_ts
+                if pdu.origin_server_ts > first_pdu_in_room.origin_server_ts {
                    > db.rooms
                        .first_pdu_in_room(&room_id)
                        .map_err(|_| "Error loading first room event.".to_owned())?
                        .expect("Room exists")
                        .origin_server_ts
                {
                    amount += 1;
                    for prev_prev in &pdu.prev_events {
                        if !graph.contains_key(prev_prev) {
@@ -1055,12 +1049,12 @@ pub(crate) async fn handle_incoming_pdu<'a>(
                        (*prev_event_id).clone(),
                        pdu.prev_events.iter().cloned().collect(),
                    );
                    eventid_info.insert(prev_event_id.clone(), (pdu, json));
                } else {
                    // Time based check failed
                    graph.insert((*prev_event_id).clone(), HashSet::new());
                    eventid_info.insert(prev_event_id.clone(), (pdu, json));
                }
                eventid_info.insert(prev_event_id.clone(), (pdu, json));
            } else {
                // Get json failed
                graph.insert((*prev_event_id).clone(), HashSet::new());
@@ -1071,23 +1065,22 @@ pub(crate) async fn handle_incoming_pdu<'a>(
        }
    }
-    let sorted =
+    let sorted = state_res::lexicographical_topological_sort(dbg!(&graph), |event_id| {
-        state_res::StateResolution::lexicographical_topological_sort(dbg!(&graph), |event_id| {
+        // This return value is the key used for sorting events,
-            // This return value is the key used for sorting events,
+        // events are then sorted by power level, time,
-            // events are then sorted by power level, time,
+        // and lexically by event_id.
-            // and lexically by event_id.
+        println!("{}", event_id);
-            println!("{}", event_id);
+        Ok((
-            Ok((
+            0,
-                0,
+            MilliSecondsSinceUnixEpoch(
-                MilliSecondsSinceUnixEpoch(
+                eventid_info
-                    eventid_info
+                    .get(event_id)
-                        .get(event_id)
+                    .map_or_else(|| uint!(0), |info| info.0.origin_server_ts),
-                        .map_or_else(|| uint!(0), |info| info.0.origin_server_ts),
+            ),
-                ),
+            ruma::event_id!("$notimportant"),
-                ruma::event_id!("$notimportant"),
+        ))
-            ))
+    })
-        })
+    .map_err(|_| "Error sorting prev events".to_owned())?;
        .map_err(|_| "Error sorting prev events".to_owned())?;
    let mut errors = 0;
    for prev_id in dbg!(sorted) {
@@ -1095,6 +1088,10 @@ pub(crate) async fn handle_incoming_pdu<'a>(
            break;
        }
        if let Some((pdu, json)) = eventid_info.remove(&prev_id) {
            if pdu.origin_server_ts < first_pdu_in_room.origin_server_ts {
                continue;
            }
            let start_time = Instant::now();
            let event_id = pdu.event_id.clone();
            if let Err(e) = upgrade_outlier_to_timeline_pdu(
@@ -1149,7 +1146,7 @@ fn handle_outlier_pdu<'a>(
        // We go through all the signatures we see on the value and fetch the corresponding signing
        // keys
-        fetch_required_signing_keys(&value, &pub_key_map, db)
+        fetch_required_signing_keys(&value, pub_key_map, db)
            .await
            .map_err(|e| e.to_string())?;
@@ -1213,8 +1210,8 @@ fn handle_outlier_pdu<'a>(
                .cloned()
                .map(Arc::new)
                .collect::<Vec<_>>(),
-            &create_event,
+            create_event,
-            &room_id,
+            room_id,
            pub_key_map,
        )
        .await;
@@ -1259,7 +1256,7 @@ fn handle_outlier_pdu<'a>(
        if auth_events
            .get(&(EventType::RoomCreate, "".to_owned()))
            .map(|a| a.as_ref())
-            != Some(&create_event)
+            != Some(create_event)
        {
            return Err("Incoming event refers to wrong create event.".to_owned());
        }
@@ -1276,14 +1273,12 @@ fn handle_outlier_pdu<'a>(
            None
        };
        let incoming_pdu = Arc::new(incoming_pdu.clone());
        if !state_res::event_auth::auth_check(
            &room_version,
            &incoming_pdu,
            previous_create,
-            None, // TODO: third party invite
+            None::<PduEvent>, // TODO: third party invite
-            |k, s| auth_events.get(&(k.clone(), s.to_owned())).map(Arc::clone),
+            |k, s| auth_events.get(&(k.clone(), s.to_owned())),
        )
        .map_err(|_e| "Auth check failed".to_string())?
        {
@@ -1298,7 +1293,7 @@ fn handle_outlier_pdu<'a>(
            .map_err(|_| "Failed to add pdu as outlier.".to_owned())?;
        debug!("Added pdu as outlier.");
-        Ok((incoming_pdu, val))
+        Ok((Arc::new(incoming_pdu), val))
    })
 }
@@ -1398,52 +1393,48 @@ async fn upgrade_outlier_to_timeline_pdu(
        }
        if okay {
-            let fork_states: Vec<_> = extremity_sstatehashes
+            let mut fork_states = Vec::with_capacity(extremity_sstatehashes.len());
-                .into_iter()
+            let mut auth_chain_sets = Vec::with_capacity(extremity_sstatehashes.len());
-                .map(|(sstatehash, prev_event)| {
+
-                    let mut leaf_state = db
+            for (sstatehash, prev_event) in extremity_sstatehashes {
                let mut leaf_state: BTreeMap<_, _> = db
                    .rooms
                    .state_full_ids(sstatehash)
                    .map_err(|_| "Failed to ask db for room state.".to_owned())?;
                if let Some(state_key) = &prev_event.state_key {
                    let shortstatekey = db
                        .rooms
-                        .state_full_ids(sstatehash)
+                        .get_or_create_shortstatekey(&prev_event.kind, state_key, &db.globals)
-                        .map_err(|_| "Failed to ask db for room state.".to_owned())?;
+                        .map_err(|_| "Failed to create shortstatekey.".to_owned())?;
                    leaf_state.insert(shortstatekey, Arc::new(prev_event.event_id.clone()));
                    // Now it's the state after the pdu
                }
-                    if let Some(state_key) = &prev_event.state_key {
+                let mut state = StateMap::with_capacity(leaf_state.len());
-                        let shortstatekey = db
+                let mut starting_events = Vec::with_capacity(leaf_state.len());
                            .rooms
                            .get_or_create_shortstatekey(&prev_event.kind, state_key, &db.globals)
                            .map_err(|_| "Failed to create shortstatekey.".to_owned())?;
                        leaf_state.insert(shortstatekey, Arc::new(prev_event.event_id.clone()));
                        // Now it's the state after the pdu
                    }
-                    leaf_state
+                for (k, id) in leaf_state {
-                        .into_iter()
+                    let k = db
-                        .map(|(k, id)| (db.rooms.get_statekey_from_short(k).map(|k| (k, id))))
+                        .rooms
-                        .collect::<Result<StateMap<_>>>()
+                        .get_statekey_from_short(k)
-                        .map_err(|_| "Failed to get_statekey_from_short.".to_owned())
+                        .map_err(|_| "Failed to get_statekey_from_short.".to_owned())?;
-                })
+
-                .collect::<StdResult<_, _>>()?;
+                    state.insert(k, (*id).clone());
                    starting_events.push(id);
                }
            let mut auth_chain_sets = Vec::new();
            for state in &fork_states {
                auth_chain_sets.push(
-                    get_auth_chain(
+                    get_auth_chain(room_id, starting_events, db)
-                        &room_id,
+                        .map_err(|_| "Failed to load auth chain.".to_owned())?
-                        state.iter().map(|(_, id)| id.clone()).collect(),
+                        .map(|event_id| (*event_id).clone())
-                        db,
+                        .collect(),
                    )
                    .map_err(|_| "Failed to load auth chain.".to_owned())?
                    .map(|event_id| (*event_id).clone())
                    .collect(),
                );
                fork_states.push(state);
            }
-            let fork_states = &fork_states
+            state_at_incoming_event = match state_res::resolve(
                .into_iter()
                .map(|map| map.into_iter().map(|(k, id)| (k, (*id).clone())).collect())
                .collect::<Vec<_>>();
            state_at_incoming_event = match state_res::StateResolution::resolve(
                &room_id,
                room_version_id,
                &fork_states,
                auth_chain_sets,
@@ -1485,7 +1476,7 @@ async fn upgrade_outlier_to_timeline_pdu(
                &db.globals,
                origin,
                get_room_state_ids::v1::Request {
-                    room_id: &room_id,
+                    room_id,
                    event_id: &incoming_pdu.event_id,
                },
            )
@@ -1494,15 +1485,15 @@ async fn upgrade_outlier_to_timeline_pdu(
            Ok(res) => {
                warn!("Fetching state events at event.");
                let state_vec = fetch_and_handle_outliers(
-                    &db,
+                    db,
                    origin,
                    &res.pdu_ids
                        .iter()
                        .cloned()
                        .map(Arc::new)
                        .collect::<Vec<_>>(),
-                    &create_event,
+                    create_event,
-                    &room_id,
+                    room_id,
                    pub_key_map,
                )
                .await;
@@ -1571,15 +1562,15 @@ async fn upgrade_outlier_to_timeline_pdu(
    let check_result = state_res::event_auth::auth_check(
        &room_version,
        &incoming_pdu,
-        previous_create.clone(),
+        previous_create.as_deref(),
-        None, // TODO: third party invite
+        None::<PduEvent>, // TODO: third party invite
        |k, s| {
            db.rooms
-                .get_shortstatekey(&k, &s)
+                .get_shortstatekey(k, s)
                .ok()
                .flatten()
                .and_then(|shortstatekey| state_at_incoming_event.get(&shortstatekey))
-                .and_then(|event_id| db.rooms.get_pdu(&event_id).ok().flatten())
+                .and_then(|event_id| db.rooms.get_pdu(event_id).ok().flatten())
        },
    )
    .map_err(|_e| "Auth check failed.".to_owned())?;
@@ -1605,7 +1596,7 @@ async fn upgrade_outlier_to_timeline_pdu(
    // applied. We start with the previous extremities (aka leaves)
    let mut extremities = db
        .rooms
-        .get_pdu_leaves(&room_id)
+        .get_pdu_leaves(room_id)
        .map_err(|_| "Failed to load room leaves".to_owned())?;
    // Remove any forward extremities that are referenced by this incoming event's prev_events
@@ -1616,11 +1607,11 @@ async fn upgrade_outlier_to_timeline_pdu(
    }
    // Only keep those extremities were not referenced yet
-    extremities.retain(|id| !matches!(db.rooms.is_event_referenced(&room_id, id), Ok(true)));
+    extremities.retain(|id| !matches!(db.rooms.is_event_referenced(room_id, id), Ok(true)));
    let current_sstatehash = db
        .rooms
-        .current_shortstatehash(&room_id)
+        .current_shortstatehash(room_id)
        .map_err(|_| "Failed to load current state hash.".to_owned())?
        .expect("every room has state");
@@ -1632,7 +1623,7 @@ async fn upgrade_outlier_to_timeline_pdu(
    let auth_events = db
        .rooms
        .get_auth_events(
-            &room_id,
+            room_id,
            &incoming_pdu.kind,
            &incoming_pdu.sender,
            incoming_pdu.state_key.as_deref(),
@@ -1644,7 +1635,7 @@ async fn upgrade_outlier_to_timeline_pdu(
        .iter()
        .map(|(shortstatekey, id)| {
            db.rooms
-                .compress_state_event(*shortstatekey, &id, &db.globals)
+                .compress_state_event(*shortstatekey, id, &db.globals)
                .map_err(|_| "Failed to compress_state_event".to_owned())
        })
        .collect::<StdResult<_, String>>()?;
@@ -1655,15 +1646,15 @@ async fn upgrade_outlier_to_timeline_pdu(
    let soft_fail = !state_res::event_auth::auth_check(
        &room_version,
        &incoming_pdu,
-        previous_create,
+        previous_create.as_deref(),
-        None,
+        None::<PduEvent>,
-        |k, s| auth_events.get(&(k.clone(), s.to_owned())).map(Arc::clone),
+        |k, s| auth_events.get(&(k.clone(), s.to_owned())),
    )
    .map_err(|_e| "Auth check failed.".to_owned())?;
    if soft_fail {
        append_incoming_pdu(
-            &db,
+            db,
            &incoming_pdu,
            val,
            extremities,
@@ -1687,7 +1678,7 @@ async fn upgrade_outlier_to_timeline_pdu(
        for id in dbg!(&extremities) {
            match db
                .rooms
-                .get_pdu(&id)
+                .get_pdu(id)
                .map_err(|_| "Failed to ask db for pdu.".to_owned())?
            {
                Some(leaf_pdu) => {
@@ -1764,7 +1755,7 @@ async fn upgrade_outlier_to_timeline_pdu(
                .iter()
                .map(|(k, id)| {
                    db.rooms
-                        .compress_state_event(*k, &id, &db.globals)
+                        .compress_state_event(*k, id, &db.globals)
                        .map_err(|_| "Failed to compress_state_event.".to_owned())
                })
                .collect::<StdResult<_, String>>()?
@@ -1776,7 +1767,7 @@ async fn upgrade_outlier_to_timeline_pdu(
            for state in &fork_states {
                auth_chain_sets.push(
                    get_auth_chain(
-                        &room_id,
+                        room_id,
                        state.iter().map(|(_, id)| id.clone()).collect(),
                        db,
                    )
@@ -1800,8 +1791,7 @@ async fn upgrade_outlier_to_timeline_pdu(
                .collect::<Result<Vec<_>>>()
                .map_err(|_| "Failed to get_statekey_from_short.".to_owned())?;
-            let state = match state_res::StateResolution::resolve(
+            let state = match state_res::resolve(
                &room_id,
                room_version_id,
                fork_states,
                auth_chain_sets,
@@ -1836,7 +1826,7 @@ async fn upgrade_outlier_to_timeline_pdu(
        // Set the new room state to the resolved state
        if update_state {
            db.rooms
-                .force_state(&room_id, new_room_state, &db)
+                .force_state(room_id, new_room_state, db)
                .map_err(|_| "Failed to set new room state.".to_owned())?;
        }
        debug!("Updated resolved state");
@@ -1849,7 +1839,7 @@ async fn upgrade_outlier_to_timeline_pdu(
    // represent the state for this event.
    let pdu_id = append_incoming_pdu(
-        &db,
+        db,
        &incoming_pdu,
        val,
        extremities,
@@ -1894,7 +1884,7 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
        let mut pdus = vec![];
        for id in events {
-            if let Some((time, tries)) = db.globals.bad_event_ratelimiter.read().unwrap().get(&id) {
+            if let Some((time, tries)) = db.globals.bad_event_ratelimiter.read().unwrap().get(id) {
                // Exponential backoff
                let mut min_elapsed_duration = Duration::from_secs(5 * 60) * (*tries) * (*tries);
                if min_elapsed_duration > Duration::from_secs(60 * 60 * 24) {
@@ -1910,7 +1900,7 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
            // a. Look in the main timeline (pduid_pdu tree)
            // b. Look at outlier pdu tree
            // (get_pdu_json checks both)
-            let local_pdu = db.rooms.get_pdu(&id);
+            let local_pdu = db.rooms.get_pdu(id);
            let pdu = match local_pdu {
                Ok(Some(pdu)) => {
                    trace!("Found {} in db", id);
@@ -1924,7 +1914,7 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
                        .send_federation_request(
                            &db.globals,
                            origin,
-                            get_event::v1::Request { event_id: &id },
+                            get_event::v1::Request { event_id: id },
                        )
                        .await
                    {
@@ -1948,8 +1938,8 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
                            match handle_outlier_pdu(
                                origin,
                                create_event,
-                                &id,
+                                id,
-                                &room_id,
+                                room_id,
                                value.clone(),
                                db,
                                pub_key_map,
@@ -2097,7 +2087,7 @@ pub(crate) async fn fetch_signing_keys(
            .sending
            .send_federation_request(
                &db.globals,
-                &server,
+                server,
                get_remote_server_keys::v2::Request::new(
                    origin,
                    MilliSecondsSinceUnixEpoch::from_system_time(
@@ -2176,7 +2166,7 @@ fn append_incoming_pdu(
        pdu,
        pdu_json,
        &new_room_leaves.into_iter().collect::<Vec<_>>(),
-        &db,
+        db,
    )?;
    for appservice in db.appservice.all()? {
@@ -2214,7 +2204,7 @@ fn append_incoming_pdu(
                        && pdu
                            .state_key
                            .as_ref()
-                            .map_or(false, |state_key| users.is_match(&state_key))
+                            .map_or(false, |state_key| users.is_match(state_key))
            };
            let matching_aliases = |aliases: &Regex| {
                db.rooms
@@ -2281,7 +2271,7 @@ pub(crate) fn get_auth_chain<'a>(
                chunk_cache.extend(cached.iter().cloned());
            } else {
                misses2 += 1;
-                let auth_chain = Arc::new(get_auth_chain_inner(&room_id, &event_id, db)?);
+                let auth_chain = Arc::new(get_auth_chain_inner(room_id, &event_id, db)?);
                db.rooms
                    .cache_auth_chain(vec![sevent_id], Arc::clone(&auth_chain))?;
                println!(
@@ -2778,10 +2768,10 @@ pub fn create_join_event_template_route(
    let auth_check = state_res::auth_check(
        &room_version,
-        &Arc::new(pdu.clone()),
+        &pdu,
-        create_prev_event,
+        create_prev_event.as_deref(),
-        None, // TODO: third_party_invite
+        None::<PduEvent>, // TODO: third_party_invite
-        |k, s| auth_events.get(&(k.clone(), s.to_owned())).map(Arc::clone),
+        |k, s| auth_events.get(&(k.clone(), s.to_owned())),
    )
    .map_err(|e| {
        error!("{:?}", e);
@@ -2829,7 +2819,7 @@ async fn create_join_event(
    // We need to return the state prior to joining, let's keep a reference to that here
    let shortstatehash = db
        .rooms
-        .current_shortstatehash(&room_id)?
+        .current_shortstatehash(room_id)?
        .ok_or(Error::BadRequest(
            ErrorKind::NotFound,
            "Pdu state not found.",
@@ -2839,7 +2829,7 @@ async fn create_join_event(
    // let mut auth_cache = EventMap::new();
    // We do not add the event_id field to the pdu here because of signature and hashes checks
-    let (event_id, value) = match crate::pdu::gen_event_id_canonical_json(&pdu) {
+    let (event_id, value) = match crate::pdu::gen_event_id_canonical_json(pdu) {
        Ok(t) => t,
        Err(_) => {
            // Event could not be converted to canonical json
@@ -2868,7 +2858,7 @@ async fn create_join_event(
            .or_default(),
    );
    let mutex_lock = mutex.lock().await;
-    let pdu_id = handle_incoming_pdu(&origin, &event_id, &room_id, value, true, &db, &pub_key_map)
+    let pdu_id = handle_incoming_pdu(&origin, &event_id, room_id, value, true, db, &pub_key_map)
        .await
        .map_err(|e| {
            warn!("Error while handling incoming send join PDU: {}", e);
@@ -2885,19 +2875,18 @@ async fn create_join_event(
    let state_ids = db.rooms.state_full_ids(shortstatehash)?;
    let auth_chain_ids = get_auth_chain(
-        &room_id,
+        room_id,
        state_ids.iter().map(|(_, id)| id.clone()).collect(),
-        &db,
+        db,
    )?;
-    for server in db
+    let servers = db
        .rooms
-        .room_servers(&room_id)
+        .room_servers(room_id)
        .filter_map(|r| r.ok())
-        .filter(|server| &**server != db.globals.server_name())
+        .filter(|server| &**server != db.globals.server_name());
-    {
+
-        db.sending.send_pdu(&server, &pdu_id)?;
+    db.sending.send_pdu(servers, &pdu_id)?;
    }
    db.flush()?;
@@ -2908,7 +2897,7 @@ async fn create_join_event(
            .collect(),
        state: state_ids
            .iter()
-            .filter_map(|(_, id)| db.rooms.get_pdu_json(&id).ok().flatten())
+            .filter_map(|(_, id)| db.rooms.get_pdu_json(id).ok().flatten())
            .map(PduEvent::convert_to_outgoing_federation_event)
            .collect(),
    })
@@ -3304,7 +3293,7 @@ fn get_server_keys_from_cache(
    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");
@@ -3396,10 +3385,10 @@ pub(crate) async fn fetch_join_signing_keys(
        // Try to fetch keys, failure is okay
        // Servers we couldn't find in the cache will be added to `servers`
        for pdu in &event.room_state.state {
-            let _ = get_server_keys_from_cache(pdu, &mut servers, &room_version, &mut pkm, &db);
+            let _ = get_server_keys_from_cache(pdu, &mut servers, room_version, &mut pkm, db);
        }
        for pdu in &event.room_state.auth_chain {
-            let _ = get_server_keys_from_cache(pdu, &mut servers, &room_version, &mut pkm, &db);
+            let _ = get_server_keys_from_cache(pdu, &mut servers, room_version, &mut pkm, db);
        }
        drop(pkm);
@@ -1,101 +0,0 @@
 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();
 }
Author	SHA1	Message	Date
Jonas Zohren	8cbfe9d4ac	chore: Suggest vscode users to use the rust-analyzer extension	2021-10-29 18:42:15 +02:00
Timo Kösters	34fa7fee05	Merge branch 'ci-fix-kaniko-i-hope' into 'next' fix(ci): Convince kaniko that it is indeed running in a container by --force-ing it. See merge request famedly/conduit!205	2021-09-15 07:05:33 +00:00
Jonas Zohren	e8d998cedf	fix(ci): Convince kaniko that it is indeed running in a container by --force-ing it.	2021-09-14 20:44:11 +00:00
Timo Kösters	565fe3a7dd	Merge branch 'faster-sending' into 'next' improvement: batch inserts for inserting pdus See merge request famedly/conduit!204	2021-09-14 18:35:12 +00:00
Timo Kösters	5c02dc7830	improvement: batch inserts for inserting pdus	2021-09-14 14:33:46 +02:00
Timo Kösters	159e22e450	Merge branch 'ci-fix-aarch64-build' into 'next' fix(ci): Fix aarch64 build See merge request famedly/conduit!203	2021-09-14 12:09:44 +00:00
Jonas Zohren	ab472e9b7c	fix(ci): Fix aarch64 build gcc-8-aarch64-linux-gnu is not available in debian 11 (which the rust image uses), so update to gcc-10 Signed-off-by: Jonas Zohren <git-pbkyr@jzohren.de>	2021-09-14 12:32:07 +02:00
Timo Kösters	31264e3d1d	Merge branch 'ci-remove-element-web-register-test' into 'next' Remove the "register an account with element" test See merge request famedly/conduit!202	2021-09-14 09:50:24 +00:00
Jonas Zohren	422bd09e32	Remove the "register an account with element" test Broke due to a timeout and Timo does not like broken tests. Less testing means less failing tests. Also, hopefully sytest is less broken now.	2021-09-14 09:44:15 +00:00
Timo Kösters	b64538c6f1	Merge branch 'efficient-sqlite' into 'next' improvement: more efficient sqlite See merge request famedly/conduit!199	2021-09-14 07:23:02 +00:00
Timo Kösters	178451e9b5	Merge branch 'deduplicate-watchers' into 'next' improvement: deduplicate watchers See merge request famedly/conduit!201	2021-09-14 07:10:59 +00:00
Timo Kösters	583a966f6e	Merge branch 'less-alloc' into 'next' Reduce allocations in server_server See merge request famedly/conduit!190	2021-09-14 07:09:55 +00:00
Timo Kösters	cbee7fe111	improvement: deduplicate watchers	2021-09-13 23:20:30 +02:00
Jonas Platte	d68c93b5fa	Clean up (mostly automated with cargo clippy --fix)	2021-09-13 20:58:58 +02:00
Jonas Platte	979ec6b4fa	Upgrade ruma	2021-09-13 20:55:13 +02:00
Jonas Platte	910ad7fed1	Get rid of more unnecessary intermediate collections	2021-09-13 20:55:12 +02:00
Timo Kösters	2c8412fe58	improvement: more efficient sqlite	2021-09-13 20:12:42 +02:00
Timo Kösters	06b0c9267f	Merge branch 'appservice-signal' into 'next' Add mautrix-signal appservice instructions See merge request famedly/conduit!196	2021-09-13 14:07:18 +00:00
Daniel Wiesenberg	00927a7ce3	Add mautrix-signal appservice instructions	2021-09-09 10:02:11 +02:00
Timo Kösters	4aacafc298	Merge branch 'roomidshort-fix' into 'next' fix sync not firing on new events in room See merge request famedly/conduit!194	2021-09-08 13:39:05 +00:00
Jonathan de Jong	23c5ec8099	fix sync not firing on new events in room	2021-09-08 14:50:44 +02:00
Timo Kösters	562a2524d7	Merge branch 'db-errors' into 'next' fix(database): handle errors in config parsin or database creation Closes #121 See merge request famedly/conduit!193	2021-09-08 09:53:25 +00:00
Rasmus Thomsen	51245d34f1	fix(database): handle errors in config parsin or database creation Showing the user a backtrace can be pretty confusing, so just printing a nice error message makes errors easier to understand for end users. fixes #121	2021-09-08 09:08:45 +01:00
Timo Kösters	4a773a1096	Merge branch 'rm-unused-deps' into 'next' Remove unused dependencies See merge request famedly/conduit!192	2021-09-07 14:00:27 +00:00
Jonas Platte	5821b8e705	Remove unused dependencies	2021-09-07 15:41:01 +02:00
Timo Kösters	0737bc021f	Merge branch 'charludo-next-patch-31617' into 'next' apache2 sample-config error See merge request famedly/conduit!191	2021-09-06 18:38:38 +00:00
charludo	487046571c	These lines get generated by certbot. Having them in the file before running certbot results in an apache2 error, and putting them in afterwards is not necessary, since certbot places them there on its own.	2021-09-06 18:35:35 +00:00
Timo Kösters	2d242523fc	Merge branch 'next' into 'next' Fix deprecated/removed Traefik label See merge request famedly/conduit!189	2021-09-03 20:56:21 +00:00
Daniel Wiesenberg	bbe36810ec	Fix deprecated/removed Traefik label	2021-09-03 21:51:17 +02:00
Timo Kösters	a449b1d73f	Merge branch 'fix-old-events' into 'next' fix: make sure old events don't sneek into the timeline See merge request famedly/conduit!188	2021-09-03 09:47:24 +00:00
Timo Kösters	71341ea05a	fix: make sure old events don't sneek into the timeline	2021-09-03 11:26:15 +02:00
Timo Kösters	73b764322f	Merge branch 'adjust-ci-for-next-and-master-development' into 'master' CI: Adjust CI for master and next branch development model (master) See merge request famedly/conduit!187	2021-09-02 18:25:57 +00:00
Jonas Zohren	a1f51440e2	chore(CI): Adjust CI for master and next branch development model - Build release builds for branches "master" and "next" - Push docker images under different tags, depending on why the pipeline started - branch master: push to `latest` - branch next: push to `next` - tag: push to `$TAG_NAME` Signed-off-by: Jonas Zohren <git-pbkyr@jzohren.de>	2021-09-02 17:17:51 +02:00