Newsfile

At least for vscode this allows click through / type checking / syntax
highlighting.

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -86,7 +86,7 @@ body:
 
         If PostgreSQL, please also answer the following:
          - are you using a single PostgreSQL server
-        or [separate servers for `main` and `state`](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#databases)?
+        or [separate servers for `main` and `state`](https://vector-im.github.io/synapse/latest/usage/configuration/config_documentation.html#databases)?
          - have you previously ported from SQLite using the Synapse "portdb" script?
          - have you previously restored from a backup?
     validations:
@@ -97,7 +97,7 @@ body:
       label: Workers
       description: |
         Are you running a single Synapse process, or are you running
-        [2 or more workers](https://element-hq.github.io/synapse/latest/workers.html)?
+        [2 or more workers](https://vector-im.github.io/synapse/latest/workers.html)?
       options:
         - Single process
         - Multiple workers
@@ -121,9 +121,9 @@ body:
         Do you have any unusual config options turned on? If so, please provide details.
 
         - Experimental or undocumented features
-        - [Presence](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#presence)
-        - [Message retention](https://element-hq.github.io/synapse/latest/message_retention_policies.html)
-        - [Synapse modules](https://element-hq.github.io/synapse/latest/modules/index.html)
+        - [Presence](https://vector-im.github.io/synapse/latest/usage/configuration/config_documentation.html#presence)
+        - [Message retention](https://vector-im.github.io/synapse/latest/message_retention_policies.html)
+        - [Synapse modules](https://vector-im.github.io/synapse/latest/modules/index.html)
   - type: textarea
     id: logs
     attributes:

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,5 +9,6 @@
   - End with either a period (.) or an exclamation mark (!).
   - Start with a capital letter.
   - Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
+* [ ] Pull request includes a [sign off](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#sign-off)
 * [ ] [Code style](https://element-hq.github.io/synapse/latest/code_style.html) is correct
   (run the [linters](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#run-the-linters))

.github/workflows/docker.yml

@@ -11,7 +11,7 @@ on:
 permissions:
   contents: read
   packages: write
-  id-token: write # needed for signing the images with GitHub OIDC Token
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -29,9 +29,6 @@ jobs:
       - name: Inspect builder
         run: docker buildx inspect
 
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.4.0
-
       - name: Checkout repository
         uses: actions/checkout@v4
 
@@ -71,7 +68,6 @@ jobs:
             type=pep440,pattern={{raw}}
 
       - name: Build and push all platforms
-        id: build-and-push
         uses: docker/build-push-action@v5
         with:
           push: true
@@ -86,14 +82,3 @@ jobs:
           # https://github.com/rust-lang/cargo/issues/10583
           build-args: |
             CARGO_NET_GIT_FETCH_WITH_CLI=true
-
-      - name: Sign the images with GitHub OIDC Token
-        env:
-          DIGEST: ${{ steps.build-and-push.outputs.digest }}
-          TAGS: ${{ steps.set-tag.outputs.tags }}
-        run: |
-          images=""
-          for tag in ${TAGS}; do
-            images+="${tag}@${DIGEST} "
-          done
-          cosign sign --yes ${images}

.github/workflows/docs-add-version-picker.yaml

@@ -0,0 +1,90 @@
+name: Add Version Picker (RUN ONCE)
+
+on:
+  workflow_dispatch:
+
+jobs:
+  add-version-picker:
+    name: Add Version Picker
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Configure Git
+        run: |
+          git config user.email "action@synapse.bot.com"
+          git config user.name "Action Bot"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup mdbook
+        uses: peaceiris/actions-mdbook@adeb05db28a0c0004681db83893d56c0388ea9ea # v1.2.0
+        with:
+          mdbook-version: '0.4.17'
+
+      - name: Copy files to release branches
+        run: |
+          for version in "v1.98" "v1.97" "v1.96" "v1.95" "v1.94" "v1.93" "v1.92" "v1.91" "v1.90" "v1.89" "v1.88" "v1.87" "v1.86" "v1.85" "v1.84" "v1.83" "v1.82" "v1.81" "v1.80" "v1.79" "v1.78" "v1.77" "v1.76" "v1.75" "v1.74" "v1.73" "v1.72" "v1.71" "v1.70" "v1.69" "v1.68" "v1.67" "v1.66" "v1.65" "v1.64" "v1.63" "v1.62" "v1.61" "v1.60" "v1.59" "v1.58" "v1.57" "v1.56" "v1.55" "v1.54" "v1.53" "v1.52" "v1.51" "v1.50" "v1.49" "v1.48" "v1.47" "v1.46" "v1.45" "v1.44" "v1.43" "v1.42" "v1.41" "v1.40" "v1.39" "v1.38" "v1.37"
+          do
+            git fetch
+            git checkout -b release-$version origin/release-$version
+
+            git checkout develop -- ./book.toml
+            git checkout develop -- ./docs/website_files/version-picker.js
+            git checkout develop -- ./docs/website_files/version-picker.css
+            git checkout develop -- ./docs/website_files/README.md
+
+            echo "window.SYNAPSE_VERSION = '$version';" > ./docs/website_files/version.js
+
+            # Adding version-picker element to index.hbs
+            awk '/<button id="search-toggle" class="icon-button" type="button" title="Search. \(Shortkey: s\)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">/{
+                print; getline; print; getline; print; getline; print;
+                print "\
+                                  <div class=\"version-picker\">\n\
+                                      <div class=\"dropdown\">\n\
+                                          <div class=\"select\">\n\
+                                              <span></span>\n\
+                                              <i class=\"fa fa-chevron-down\"></i>\n\
+                                          </div>\n\
+                                          <input type=\"hidden\" name=\"version\">\n\
+                                          <ul class=\"dropdown-menu\">\n\
+                                              <!-- Versions will be added dynamically in version-picker.js -->\n\
+                                          </ul>\n\
+                                      </div>\n\
+                                  </div>\
+                ";
+                next
+            } 1' ./docs/website_files/theme/index.hbs > output.html && mv output.html ./docs/website_files/theme/index.hbs
+
+            git add ./book.toml ./docs/website_files/version-picker.js ./docs/website_files/version-picker.css ./docs/website_files/version.js ./docs/website_files/README.md ./docs/website_files/theme/index.hbs
+            git commit -m "Version picker added for $version docs"
+            git push
+          done
+
+      - name: Build docs for Github Pages
+        run: |
+          git fetch
+          git branch gh-pages origin/gh-pages
+
+          for version in "v1.98" "v1.97" "v1.96" "v1.95" "v1.94" "v1.93" "v1.92" "v1.91" "v1.90" "v1.89" "v1.88" "v1.87" "v1.86" "v1.85" "v1.84" "v1.83" "v1.82" "v1.81" "v1.80" "v1.79" "v1.78" "v1.77" "v1.76" "v1.75" "v1.74" "v1.73" "v1.72" "v1.71" "v1.70" "v1.69" "v1.68" "v1.67" "v1.66" "v1.65" "v1.64" "v1.63" "v1.62" "v1.61" "v1.60" "v1.59" "v1.58" "v1.57" "v1.56" "v1.55" "v1.54" "v1.53" "v1.52" "v1.51" "v1.50" "v1.49" "v1.48" "v1.47" "v1.46" "v1.45" "v1.44" "v1.43" "v1.42" "v1.41" "v1.40" "v1.39" "v1.38" "v1.37"
+          do
+            git checkout release-$version
+
+            mdbook build && cp book/welcome_and_overview.html book/index.html
+            mkdir ver-temp && cp -r book/* ver-temp/
+            rm -r ./book
+
+            git checkout gh-pages
+            rm -r $version
+            mv ver-temp $version
+
+            git add ./$version
+            git commit -m "Version picker deployed for $version docs to Github Pages"
+          done
+
+      - name: Push to gh-pages
+        run: |
+          git checkout gh-pages
+          git status
+          git push

.github/workflows/docs-pr-netlify.yaml

@@ -14,7 +14,7 @@ jobs:
       # There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
       # (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
       - name: 📥 Download artifact
-        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
+        uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e # v2.28.0
         with:
           workflow: docs-pr.yaml
           run_id: ${{ github.event.workflow_run.id }}

.github/workflows/docs-pr.yaml

@@ -39,7 +39,7 @@ jobs:
           cp book/welcome_and_overview.html book/index.html
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: book
           path: book

.github/workflows/latest_deps.yml

@@ -164,7 +164,7 @@ jobs:
         if: ${{ always() }}
         run: /sytest/scripts/tap_to_gha.pl /logs/results.tap
       - name: Upload SyTest logs
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
           name: Sytest Logs - ${{ job.status }} - (${{ join(matrix.*, ', ') }})
@@ -226,7 +226,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
+      - uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/release-artifacts.yml

@@ -66,7 +66,7 @@ jobs:
           install: true
 
       - name: Set up docker layer caching
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -92,7 +92,7 @@ jobs:
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
       - name: Upload debs as artifacts
-        uses: actions/upload-artifact@v3 # Don't upgrade to v4; broken: https://github.com/actions/upload-artifact#breaking-changes
+        uses: actions/upload-artifact@v3
         with:
           name: debs
           path: debs/*
@@ -156,7 +156,7 @@ jobs:
           CARGO_NET_GIT_FETCH_WITH_CLI: true
           CIBW_ENVIRONMENT_PASS_LINUX: CARGO_NET_GIT_FETCH_WITH_CLI
 
-      - uses: actions/upload-artifact@v3 # Don't upgrade to v4; broken: https://github.com/actions/upload-artifact#breaking-changes
+      - uses: actions/upload-artifact@v3
         with:
           name: Wheel
           path: ./wheelhouse/*.whl
@@ -177,7 +177,7 @@ jobs:
       - name: Build sdist
         run: python -m build --sdist
 
-      - uses: actions/upload-artifact@v3 # Don't upgrade to v4; broken: https://github.com/actions/upload-artifact#breaking-changes
+      - uses: actions/upload-artifact@v3
         with:
           name: Sdist
           path: dist/*.tar.gz
@@ -194,7 +194,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v3 # Don't upgrade to v4, it should match upload-artifact
+        uses: actions/download-artifact@v3
       - name: Build a tarball for the debs
         run: tar -cvJf debs.tar.xz debs
       - name: Attach to release

.github/workflows/tests.yml

@@ -12,6 +12,10 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  check-signoff:
+    if: "github.event_name == 'pull_request'"
+    uses: "matrix-org/backend-meta/.github/workflows/sign-off.yml@v2"
+
   # Job to detect what has changed so we don't run e.g. Rust checks on PRs that
   # don't modify Rust code.
   changes:
@@ -22,7 +26,7 @@ jobs:
       integration: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.integration }}
       linting: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.linting }}
     steps:
-    - uses: dorny/paths-filter@v3
+    - uses: dorny/paths-filter@v2
       id: filter
       # We only check on PRs
       if: startsWith(github.ref, 'refs/pull/')
@@ -81,7 +85,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.65.0
+        uses: dtolnay/rust-toolchain@1.61.0
       - uses: Swatinem/rust-cache@v2
       - uses: matrix-org/setup-python-poetry@v1
         with:
@@ -148,7 +152,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.65.0
+        uses: dtolnay/rust-toolchain@1.61.0
       - uses: Swatinem/rust-cache@v2
 
       - name: Setup Poetry
@@ -165,7 +169,7 @@ jobs:
       # Cribbed from
       # https://github.com/AustinScola/mypy-cache-github-action/blob/85ea4f2972abed39b33bd02c36e341b28ca59213/src/restore.ts#L10-L17
       - name: Restore/persist mypy's cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: |
             .mypy_cache
@@ -208,7 +212,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.65.0
+        uses: dtolnay/rust-toolchain@1.61.0
       - uses: Swatinem/rust-cache@v2
       - uses: matrix-org/setup-python-poetry@v1
         with:
@@ -225,7 +229,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.65.0
+        uses: dtolnay/rust-toolchain@1.61.0
         with:
             components: clippy
       - uses: Swatinem/rust-cache@v2
@@ -282,26 +286,10 @@ jobs:
       - check-schema-delta
       - check-lockfile
       - lint-clippy
-      - lint-clippy-nightly
       - lint-rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: matrix-org/done-action@v2
-        with:
-          needs: ${{ toJSON(needs) }}
-
-          # Various bits are skipped if there was no applicable changes.
-          skippable: |
-            check-sampleconfig
-            check-schema-delta
-            lint
-            lint-mypy
-            lint-newsfile
-            lint-pydantic
-            lint-clippy
-            lint-clippy-nightly
-            lint-rustfmt
-
+      - run: "true"
 
   calculate-test-jobs:
     if: ${{ !cancelled() && !failure() }} # Allow previous steps to be skipped, but not fail
@@ -344,7 +332,7 @@ jobs:
             postgres:${{ matrix.job.postgres-version }}
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.65.0
+        uses: dtolnay/rust-toolchain@1.61.0
       - uses: Swatinem/rust-cache@v2
 
       - uses: matrix-org/setup-python-poetry@v1
@@ -386,7 +374,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.65.0
+        uses: dtolnay/rust-toolchain@1.61.0
       - uses: Swatinem/rust-cache@v2
 
       # There aren't wheels for some of the older deps, so we need to install
@@ -498,7 +486,7 @@ jobs:
         run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.65.0
+        uses: dtolnay/rust-toolchain@1.61.0
       - uses: Swatinem/rust-cache@v2
 
       - name: Run SyTest
@@ -508,7 +496,7 @@ jobs:
         if: ${{ always() }}
         run: /sytest/scripts/tap_to_gha.pl /logs/results.tap
       - name: Upload SyTest logs
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
           name: Sytest Logs - ${{ job.status }} - (${{ join(matrix.job.*, ', ') }})
@@ -606,7 +594,7 @@ jobs:
           PGPASSWORD: postgres
           PGDATABASE: postgres
       - name: "Upload schema differences"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         if: ${{ failure() && !cancelled() && steps.run_tester_script.outcome == 'failure' }}
         with:
           name: Schema dumps
@@ -642,7 +630,7 @@ jobs:
           path: synapse
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.65.0
+        uses: dtolnay/rust-toolchain@1.61.0
       - uses: Swatinem/rust-cache@v2
 
       - name: Prepare Complement's Prerequisites
@@ -674,7 +662,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.65.0
+        uses: dtolnay/rust-toolchain@1.61.0
       - uses: Swatinem/rust-cache@v2
 
       - run: cargo test
@@ -711,7 +699,6 @@ jobs:
       - complement
       - cargo-test
       - cargo-bench
-      - linting-done
     runs-on: ubuntu-latest
     steps:
       - uses: matrix-org/done-action@v2
@@ -719,7 +706,7 @@ jobs:
           needs: ${{ toJSON(needs) }}
 
           # Various bits are skipped if there was no applicable changes.
-          # The newsfile lint may be skipped on non PR builds.
+          # The newsfile and signoff lint may be skipped on non PR builds.
           skippable: |
             trial
             trial-olddeps
@@ -727,6 +714,7 @@ jobs:
             portdb
             export-data
             complement
+            check-signoff
             lint-newsfile
             cargo-test
             cargo-bench

.github/workflows/triage-incoming.yml

@@ -1,8 +1,9 @@
 name: Move new issues into the issue triage board
 
 on:
-  issues:
-    types: [ opened ]
+  # issues:
+  #   types: [ opened ]
+  workflow_dispatch:
 
 jobs:
   triage:

.github/workflows/twisted_trunk.yml

@@ -136,7 +136,7 @@ jobs:
         if: ${{ always() }}
         run: /sytest/scripts/tap_to_gha.pl /logs/results.tap
       - name: Upload SyTest logs
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
           name: Sytest Logs - ${{ job.status }} - (${{ join(matrix.*, ', ') }})
@@ -207,7 +207,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
+      - uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

CHANGES.md

@@ -1,335 +1,3 @@
-# Synapse 1.104.0 (2024-04-02)
-
-### Bugfixes
-
-- Fix regression when using OIDC provider. Introduced in v1.104.0rc1. ([\#17031](https://github.com/element-hq/synapse/issues/17031))
-
-
-# Synapse 1.104.0rc1 (2024-03-26)
-
-### Features
-
-- Add an OIDC config to specify extra parameters for the authorization grant URL. IT can be useful to pass an ACR value for example. ([\#16971](https://github.com/element-hq/synapse/issues/16971))
-- Add support for OIDC provider returning JWT. ([\#16972](https://github.com/element-hq/synapse/issues/16972), [\#17031](https://github.com/element-hq/synapse/issues/17031))
-
-### Bugfixes
-
-- Fix a bug which meant that, under certain circumstances, we might never retry sending events or to-device messages over federation after a failure. ([\#16925](https://github.com/element-hq/synapse/issues/16925))
-- Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations. ([\#16949](https://github.com/element-hq/synapse/issues/16949))
-- Fix case in which `m.fully_read` marker would not get updated. Contributed by @SpiritCroc. ([\#16990](https://github.com/element-hq/synapse/issues/16990))
-- Fix bug which did not retract a user's pending knocks at rooms when their account was deactivated. Contributed by @hanadi92. ([\#17010](https://github.com/element-hq/synapse/issues/17010))
-
-### Updates to the Docker image
-
-- Updated `start.py` to generate config using the correct user ID when running as root (fixes [\#16824](https://github.com/element-hq/synapse/issues/16824), [\#15202](https://github.com/element-hq/synapse/issues/15202)). ([\#16978](https://github.com/element-hq/synapse/issues/16978))
-
-### Improved Documentation
-
-- Add a query to force a refresh of a remote user's device list to the "Useful SQL for Admins" documentation page. ([\#16892](https://github.com/element-hq/synapse/issues/16892))
-- Minor grammatical corrections to the upgrade documentation. ([\#16965](https://github.com/element-hq/synapse/issues/16965))
-- Fix the sort order for the documentation version picker, so that newer releases appear above older ones. ([\#16966](https://github.com/element-hq/synapse/issues/16966))
-- Remove recommendation for a specific poetry version from contributing guide. ([\#17002](https://github.com/element-hq/synapse/issues/17002))
-
-### Internal Changes
-
-- Improve lock performance when a lot of locks are all waiting for a single lock to be released. ([\#16840](https://github.com/element-hq/synapse/issues/16840))
-- Update power level default for public rooms. ([\#16907](https://github.com/element-hq/synapse/issues/16907))
-- Improve event validation. ([\#16908](https://github.com/element-hq/synapse/issues/16908))
-- Multi-worker-docker-container: disable log buffering. ([\#16919](https://github.com/element-hq/synapse/issues/16919))
-- Refactor state delta calculation in `/sync` handler. ([\#16929](https://github.com/element-hq/synapse/issues/16929))
-- Clarify docs for some room state functions. ([\#16950](https://github.com/element-hq/synapse/issues/16950))
-- Specify IP subnets in canonical form. ([\#16953](https://github.com/element-hq/synapse/issues/16953))
-- As done for SAML mapping provider, let's pass the module API to the OIDC one so the mapper can do more logic in its code. ([\#16974](https://github.com/element-hq/synapse/issues/16974))
-- Allow containers building on top of Synapse's Complement container is use the included PostgreSQL cluster. ([\#16985](https://github.com/element-hq/synapse/issues/16985))
-- Raise poetry-core version cap to 1.9.0. ([\#16986](https://github.com/element-hq/synapse/issues/16986))
-- Patch the db conn pool sooner in tests. ([\#17017](https://github.com/element-hq/synapse/issues/17017))
-
-
-
-### Updates to locked dependencies
-
-* Bump anyhow from 1.0.80 to 1.0.81. ([\#17009](https://github.com/element-hq/synapse/issues/17009))
-* Bump black from 23.10.1 to 24.2.0. ([\#16936](https://github.com/element-hq/synapse/issues/16936))
-* Bump cryptography from 41.0.7 to 42.0.5. ([\#16958](https://github.com/element-hq/synapse/issues/16958))
-* Bump dawidd6/action-download-artifact from 3.1.1 to 3.1.2. ([\#16960](https://github.com/element-hq/synapse/issues/16960))
-* Bump dawidd6/action-download-artifact from 3.1.2 to 3.1.4. ([\#17008](https://github.com/element-hq/synapse/issues/17008))
-* Bump jinja2 from 3.1.2 to 3.1.3. ([\#17005](https://github.com/element-hq/synapse/issues/17005))
-* Bump log from 0.4.20 to 0.4.21. ([\#16977](https://github.com/element-hq/synapse/issues/16977))
-* Bump mypy from 1.5.1 to 1.8.0. ([\#16901](https://github.com/element-hq/synapse/issues/16901))
-* Bump netaddr from 0.9.0 to 1.2.1. ([\#17006](https://github.com/element-hq/synapse/issues/17006))
-* Bump pydantic from 2.6.0 to 2.6.4. ([\#17004](https://github.com/element-hq/synapse/issues/17004))
-* Bump pyo3 from 0.20.2 to 0.20.3. ([\#16962](https://github.com/element-hq/synapse/issues/16962))
-* Bump ruff from 0.1.14 to 0.3.2. ([\#16994](https://github.com/element-hq/synapse/issues/16994))
-* Bump serde from 1.0.196 to 1.0.197. ([\#16963](https://github.com/element-hq/synapse/issues/16963))
-* Bump serde_json from 1.0.113 to 1.0.114. ([\#16961](https://github.com/element-hq/synapse/issues/16961))
-* Bump types-jsonschema from 4.21.0.20240118 to 4.21.0.20240311. ([\#17007](https://github.com/element-hq/synapse/issues/17007))
-* Bump types-psycopg2 from 2.9.21.16 to 2.9.21.20240311. ([\#16995](https://github.com/element-hq/synapse/issues/16995))
-* Bump types-pyopenssl from 23.3.0.0 to 24.0.0.20240311. ([\#17003](https://github.com/element-hq/synapse/issues/17003))
-
-# Synapse 1.103.0 (2024-03-19)
-
-No significant changes since 1.103.0rc1.
-
-
-
-
-# Synapse 1.103.0rc1 (2024-03-12)
-
-### Features
-
-- Add a new [List Accounts v3](https://element-hq.github.io/synapse/v1.103/admin_api/user_admin_api.html#list-accounts-v3) Admin API with improved deactivated user filtering capabilities. ([\#16874](https://github.com/element-hq/synapse/issues/16874))
-- Include `Retry-After` header by default per [MSC4041](https://github.com/matrix-org/matrix-spec-proposals/pull/4041). Contributed by @clokep. ([\#16947](https://github.com/element-hq/synapse/issues/16947))
-
-### Bugfixes
-
-- Fix joining remote rooms when a module uses the `on_new_event` callback. This callback may now pass partial state events instead of the full state for remote rooms. Introduced in v1.76.0. ([\#16973](https://github.com/element-hq/synapse/issues/16973))
-- Fix performance issue when joining very large rooms that can cause the server to lock up. Introduced in v1.100.0. Contributed by @ggogel. ([\#16968](https://github.com/element-hq/synapse/issues/16968))
-
-### Improved Documentation
-
-- Add HAProxy example for single port operation to reverse proxy documentation. Contributed by Georg Pfuetzenreuter (@tacerus). ([\#16768](https://github.com/element-hq/synapse/issues/16768))
-- Improve the documentation around running Complement tests with new configuration parameters. ([\#16946](https://github.com/element-hq/synapse/issues/16946))
-- Add docs on upgrading from a very old version. ([\#16951](https://github.com/element-hq/synapse/issues/16951))
-
-
-### Updates to locked dependencies
-
-* Bump JasonEtco/create-an-issue from 2.9.1 to 2.9.2. ([\#16934](https://github.com/element-hq/synapse/issues/16934))
-* Bump anyhow from 1.0.79 to 1.0.80. ([\#16935](https://github.com/element-hq/synapse/issues/16935))
-* Bump dawidd6/action-download-artifact from 3.0.0 to 3.1.1. ([\#16933](https://github.com/element-hq/synapse/issues/16933))
-* Bump furo from 2023.9.10 to 2024.1.29. ([\#16939](https://github.com/element-hq/synapse/issues/16939))
-* Bump pyopenssl from 23.3.0 to 24.0.0. ([\#16937](https://github.com/element-hq/synapse/issues/16937))
-* Bump types-netaddr from 0.10.0.20240106 to 1.2.0.20240219. ([\#16938](https://github.com/element-hq/synapse/issues/16938))
-
-
-# Synapse 1.102.0 (2024-03-05)
-
-### Bugfixes
-
-- Revert https://github.com/element-hq/synapse/pull/16756, which caused incorrect notification counts on mobile clients since v1.100.0. ([\#16979](https://github.com/element-hq/synapse/issues/16979))
-
-
-# Synapse 1.102.0rc1 (2024-02-20)
-
-### Features
-
-- A metric was added for emails sent by Synapse, broken down by type: `synapse_emails_sent_total`. Contributed by Remi Rampin. ([\#16881](https://github.com/element-hq/synapse/issues/16881))
-
-### Bugfixes
-
-- Do not send multiple concurrent requests for keys for the same server. ([\#16894](https://github.com/element-hq/synapse/issues/16894))
-- Fix performance issue when joining very large rooms that can cause the server to lock up. Introduced in v1.100.0. ([\#16903](https://github.com/element-hq/synapse/issues/16903))
-- Always prefer unthreaded receipt when >1 exist ([MSC4102](https://github.com/matrix-org/matrix-spec-proposals/pull/4102)). ([\#16927](https://github.com/element-hq/synapse/issues/16927))
-
-### Improved Documentation
-
-- Fix a small typo in the Rooms section of the Admin API documentation. Contributed by @RainerZufall187. ([\#16857](https://github.com/element-hq/synapse/issues/16857))
-
-### Internal Changes
-
-- Don't invalidate the entire event cache when we purge history. ([\#16905](https://github.com/element-hq/synapse/issues/16905))
-- Add experimental config option to not send device list updates for specific users. ([\#16909](https://github.com/element-hq/synapse/issues/16909))
-- Fix incorrect docker hub link in release script. ([\#16910](https://github.com/element-hq/synapse/issues/16910))
-
-
-
-### Updates to locked dependencies
-
-* Bump attrs from 23.1.0 to 23.2.0. ([\#16899](https://github.com/element-hq/synapse/issues/16899))
-* Bump bcrypt from 4.0.1 to 4.1.2. ([\#16900](https://github.com/element-hq/synapse/issues/16900))
-* Bump pygithub from 2.1.1 to 2.2.0. ([\#16902](https://github.com/element-hq/synapse/issues/16902))
-* Bump sentry-sdk from 1.40.0 to 1.40.3. ([\#16898](https://github.com/element-hq/synapse/issues/16898))
-
-# Synapse 1.101.0 (2024-02-13)
-
-### Bugfixes
-
-- Fix performance regression when fetching auth chains from the DB. Introduced in v1.100.0. ([\#16893](https://github.com/element-hq/synapse/issues/16893))
-
-
-
-
-# Synapse 1.101.0rc1 (2024-02-06)
-
-### Improved Documentation
-
-- Fix broken links in the documentation. ([\#16853](https://github.com/element-hq/synapse/issues/16853))
-- Update MacOS installation instructions to mention that libicu is optional. ([\#16854](https://github.com/element-hq/synapse/issues/16854))
-- The version picker now correctly lists versions after `v1.98.0`. ([\#16880](https://github.com/element-hq/synapse/issues/16880))
-
-### Internal Changes
-
-- Add support for stabilised [MSC3981](https://github.com/matrix-org/matrix-spec-proposals/pull/3981) that adds a `recurse` parameter on the `/relations` API. ([\#16842](https://github.com/element-hq/synapse/issues/16842))
-
-
-
-### Updates to locked dependencies
-
-* Bump dorny/paths-filter from 2 to 3. ([\#16869](https://github.com/element-hq/synapse/issues/16869))
-* Bump gitpython from 3.1.40 to 3.1.41. ([\#16850](https://github.com/element-hq/synapse/issues/16850))
-* Bump hiredis from 2.2.3 to 2.3.2. ([\#16862](https://github.com/element-hq/synapse/issues/16862))
-* Bump jsonschema from 4.20.0 to 4.21.1. ([\#16887](https://github.com/element-hq/synapse/issues/16887))
-* Bump lxml-stubs from 0.4.0 to 0.5.1. ([\#16885](https://github.com/element-hq/synapse/issues/16885))
-* Bump mypy-zope from 1.0.1 to 1.0.3. ([\#16865](https://github.com/element-hq/synapse/issues/16865))
-* Bump phonenumbers from 8.13.26 to 8.13.29. ([\#16868](https://github.com/element-hq/synapse/issues/16868))
-* Bump pydantic from 2.5.3 to 2.6.0. ([\#16888](https://github.com/element-hq/synapse/issues/16888))
-* Bump sentry-sdk from 1.39.1 to 1.40.0. ([\#16889](https://github.com/element-hq/synapse/issues/16889))
-* Bump serde from 1.0.195 to 1.0.196. ([\#16867](https://github.com/element-hq/synapse/issues/16867))
-* Bump serde_json from 1.0.111 to 1.0.113. ([\#16866](https://github.com/element-hq/synapse/issues/16866))
-* Bump sigstore/cosign-installer from 3.3.0 to 3.4.0. ([\#16890](https://github.com/element-hq/synapse/issues/16890))
-* Bump types-pillow from 10.1.0.2 to 10.2.0.20240125. ([\#16864](https://github.com/element-hq/synapse/issues/16864))
-* Bump types-requests from 2.31.0.10 to 2.31.0.20240125. ([\#16886](https://github.com/element-hq/synapse/issues/16886))
-* Bump types-setuptools from 69.0.0.0 to 69.0.0.20240125. ([\#16863](https://github.com/element-hq/synapse/issues/16863))
-
-# Synapse 1.100.0 (2024-01-30)
-
-No significant changes since 1.100.0rc3.
-
-
-
-
-# Synapse 1.100.0rc3 (2024-01-24)
-
-### Bugfixes
-
-- Fix database performance regression due to changing Postgres table statistics. Introduced in v1.100.0rc1. ([\#16849](https://github.com/element-hq/synapse/issues/16849))
-
-
-
-
-# Synapse 1.100.0rc2 (2024-01-24)
-
-This version is the same as 1.100.0rc1 but with fixes to the release process.
-
-### Internal Changes
-
-- Downgrade the `download-artifact` and `upload-artifact` actions to v3 due to breaking changes. ([\#16847](https://github.com/element-hq/synapse/issues/16847))
-
-
-# Synapse 1.100.0rc1 (2024-01-23)
-
-*This version was never released to PyPI or the Debian repository due to failures in the automatic part of the release process.*
-
-### Features
-
-- Advertise experimental support for [MSC4028](https://github.com/matrix-org/matrix-spec-proposals/pull/4028) through `/_matrix/clients/versions` if enabled. Contributed by @hanadi92. ([\#16787](https://github.com/element-hq/synapse/issues/16787))
-
-### Bugfixes
-
-- Handle wildcard type filters properly for room messages endpoint. Contributed by Mo Balaa. ([\#14984](https://github.com/element-hq/synapse/issues/14984))
-
-### Improved Documentation
-
-- Add a link to the "Request log format" explainer on the "Logging sample config" documentation page. ([\#16778](https://github.com/element-hq/synapse/issues/16778))
-- Fix broken links in issue templates and documentation. ([\#16810](https://github.com/element-hq/synapse/issues/16810))
-- NGINX listen http2 deprecation in documentation template for reverse proxy. ([\#16831](https://github.com/element-hq/synapse/issues/16831))
-
-### Internal Changes
-
-- Faster partial join to room with complex auth graph. ([\#7](https://github.com/element-hq/synapse/issues/7))
-- Improve DB performance of calculating badge counts for push. ([\#16756](https://github.com/element-hq/synapse/issues/16756))
-- Split up deleting devices into batches. ([\#16766](https://github.com/element-hq/synapse/issues/16766))
-- Remove CI check for sign-off as we require a CLA signature instead. ([\#16776](https://github.com/element-hq/synapse/issues/16776))
-- Ensure CI fails when linting fails to make sure auto-merge does the correct thing. ([\#16781](https://github.com/element-hq/synapse/issues/16781))
-- Faster load recents for sync by reducing amount of state pulled out. ([\#16783](https://github.com/element-hq/synapse/issues/16783))
-- Reduce amount of state pulled out when querying federation hierachy. ([\#16785](https://github.com/element-hq/synapse/issues/16785))
-- Pull less state out of the DB when we retry fetching old events during backfill. ([\#16788](https://github.com/element-hq/synapse/issues/16788))
-- Optimize query for fetching to-device messages in `/sync`. ([\#16805](https://github.com/element-hq/synapse/issues/16805))
-- Reject OIDC config when `client_secret` isn't specified, but the auth method requires one. ([\#16806](https://github.com/element-hq/synapse/issues/16806))
-- Allow room creation but not publishing to continue if room publication rules are violated when creating
-  a new room. ([\#16811](https://github.com/element-hq/synapse/issues/16811))
-- Bump minimum supported Rust version to 1.65.0. ([\#16818](https://github.com/element-hq/synapse/issues/16818))
-- Fixup copyright lines in file headers after the licensing change. ([\#16820](https://github.com/element-hq/synapse/issues/16820))
-- Add a `--generate-only` option to the internal configuration/launch script for Complement. ([\#16828](https://github.com/element-hq/synapse/issues/16828))
-- Preparatory work for tweaking performance of auth chain lookups. ([\#16833](https://github.com/element-hq/synapse/issues/16833))
-- Speed up e2e device keys queries for bot accounts. ([\#16841](https://github.com/element-hq/synapse/issues/16841))
-
-### Updates to locked dependencies
-
-* Bump actions/cache from 3 to 4. ([\#16832](https://github.com/element-hq/synapse/issues/16832))
-* Bump actions/download-artifact from 3 to 4. ([\#16795](https://github.com/element-hq/synapse/issues/16795))
-* Bump actions/upload-artifact from 3 to 4. ([\#16796](https://github.com/element-hq/synapse/issues/16796))
-* Bump anyhow from 1.0.75 to 1.0.79. ([\#16789](https://github.com/element-hq/synapse/issues/16789))
-* Bump authlib from 1.2.1 to 1.3.0. ([\#16801](https://github.com/element-hq/synapse/issues/16801))
-* Bump dawidd6/action-download-artifact from 2.28.0 to 3.0.0. ([\#16794](https://github.com/element-hq/synapse/issues/16794))
-* Bump immutabledict from 4.0.0 to 4.1.0. ([\#16812](https://github.com/element-hq/synapse/issues/16812))
-* Bump isort from 5.13.1 to 5.13.2. ([\#16835](https://github.com/element-hq/synapse/issues/16835))
-* Bump lxml from 4.9.3 to 5.1.0. ([\#16813](https://github.com/element-hq/synapse/issues/16813))
-* Bump pillow from 10.1.0 to 10.2.0. ([\#16802](https://github.com/element-hq/synapse/issues/16802))
-* Bump pydantic from 2.5.2 to 2.5.3. ([\#16836](https://github.com/element-hq/synapse/issues/16836))
-* Bump pyo3 from 0.20.0 to 0.20.2. ([\#16791](https://github.com/element-hq/synapse/issues/16791))
-* Bump regex from 1.9.6 to 1.10.3. ([\#16837](https://github.com/element-hq/synapse/issues/16837))
-* Bump ruff from 0.1.13 to 0.1.14. ([\#16838](https://github.com/element-hq/synapse/issues/16838))
-* Bump ruff from 0.1.7 to 0.1.13. ([\#16814](https://github.com/element-hq/synapse/issues/16814))
-* Bump sentry-sdk from 1.35.0 to 1.39.1. ([\#16799](https://github.com/element-hq/synapse/issues/16799))
-* Bump serde_json from 1.0.108 to 1.0.111. ([\#16792](https://github.com/element-hq/synapse/issues/16792))
-* Bump service-identity from 23.1.0 to 24.1.0. ([\#16816](https://github.com/element-hq/synapse/issues/16816))
-* Bump types-commonmark from 0.9.2.4 to 0.9.2.20240106. ([\#16797](https://github.com/element-hq/synapse/issues/16797))
-* Bump types-jsonschema from 4.20.0.0 to 4.20.0.20240105. ([\#16800](https://github.com/element-hq/synapse/issues/16800))
-* Bump types-jsonschema from 4.20.0.20240105 to 4.21.0.20240118. ([\#16834](https://github.com/element-hq/synapse/issues/16834))
-* Bump types-netaddr from 0.9.0.1 to 0.10.0.20240106. ([\#16839](https://github.com/element-hq/synapse/issues/16839))
-* Bump typing-extensions from 4.8.0 to 4.9.0. ([\#16815](https://github.com/element-hq/synapse/issues/16815))
-
-
-# Synapse 1.99.0 (2024-01-16)
-
-Synapse 1.99.0 is the first Synapse release under an AGPLv3.0 licence (with CLA to enable Element to sell AGPL
-exceptions). You can read more about this here:
-
- - https://matrix.org/blog/2023/11/06/future-of-synapse-dendrite/
- - https://element.io/blog/element-to-adopt-agplv3/
- - https://element.io/blog/synapse-now-lives-at-github-com-element-hq-synapse/
-
-No significant changes since 1.99.0rc1.
-
-
-# Synapse 1.99.0rc1 (2024-01-09)
-
-### Features
-
-- Add [config options](https://element-hq.github.io/synapse/v1.99/usage/configuration/config_documentation.html#server_notices) to set the avatar and the topic of the server notices room, as well as the avatar of the server notices user. ([\#16679](https://github.com/matrix-org/synapse/issues/16679))
-- Add config option [`email.notif_delay_before_mail`](https://element-hq.github.io/synapse/v1.99/usage/configuration/config_documentation.html#email) to tweak the delay before an email is sent following a notification. ([\#16696](https://github.com/matrix-org/synapse/issues/16696))
-- Add new configuration option [`sentry.environment`](https://element-hq.github.io/synapse/v1.99/usage/configuration/config_documentation.html#sentry) for improved system monitoring. Contributed by @zeeshanrafiqrana. ([\#16738](https://github.com/matrix-org/synapse/issues/16738))
-- Filter out rooms from the room directory being served to other homeservers when those rooms block that homeserver by their Access Control Lists. ([\#16759](https://github.com/element-hq/synapse/issues/16759))
-
-### Bugfixes
-
-- Fix a long-standing bug where the signing keys generated by Synapse were world-readable. Contributed by Fabian Klemp. ([\#16740](https://github.com/matrix-org/synapse/issues/16740))
-- Fix email verification redirection. Contributed by Fadhlan Ridhwanallah. ([\#16761](https://github.com/element-hq/synapse/issues/16761))
-- Fixed a bug that prevented users from being queried by display name if it contains non-ASCII characters. ([\#16767](https://github.com/element-hq/synapse/issues/16767))
-- Allow reactivate user without password with Admin API in some edge cases. ([\#16770](https://github.com/element-hq/synapse/issues/16770))
-- Adds the `recursion_depth` parameter to the response of the /relations endpoint if MSC3981 recursion is being performed. ([\#16775](https://github.com/element-hq/synapse/issues/16775))
-
-### Improved Documentation
-
-- Added version picker for Synapse documentation. Contributed by @Dmytro27Ind. ([\#16533](https://github.com/matrix-org/synapse/issues/16533))
-- Clarify that `password_config.enabled: "only_for_reauth"` does not allow new logins to be created using password auth. ([\#16737](https://github.com/matrix-org/synapse/issues/16737))
-- Remove value from header in configuration documentation for `refresh_token_lifetime`. ([\#16763](https://github.com/element-hq/synapse/issues/16763))
-- Add another custom statistics collection server to the documentation. Contributed by @loelkes. ([\#16769](https://github.com/element-hq/synapse/issues/16769))
-
-### Internal Changes
-
-- Remove run-once workflow after adding the version picker to the documentation. ([\#9453](https://github.com/element-hq/synapse/issues/9453))
-- Update the implementation of [MSC2965](https://github.com/matrix-org/matrix-spec-proposals/pull/2965) (OIDC Provider discovery). ([\#16726](https://github.com/matrix-org/synapse/issues/16726))
-- Move the rust stubs inline for better IDE integration. ([\#16757](https://github.com/element-hq/synapse/issues/16757))
-- Fix sample config doc CI. ([\#16758](https://github.com/element-hq/synapse/issues/16758))
-- Simplify event internal metadata class. ([\#16762](https://github.com/element-hq/synapse/issues/16762), [\#16780](https://github.com/element-hq/synapse/issues/16780))
-- Sign the published docker image using [cosign](https://docs.sigstore.dev/). ([\#16774](https://github.com/element-hq/synapse/issues/16774))
-- Port `EventInternalMetadata` class to Rust. ([\#16782](https://github.com/element-hq/synapse/issues/16782))
-
-
-
-### Updates to locked dependencies
-
-* Bump actions/setup-go from 4 to 5. ([\#16749](https://github.com/matrix-org/synapse/issues/16749))
-* Bump actions/setup-python from 4 to 5. ([\#16748](https://github.com/matrix-org/synapse/issues/16748))
-* Bump immutabledict from 3.0.0 to 4.0.0. ([\#16743](https://github.com/matrix-org/synapse/issues/16743))
-* Bump isort from 5.12.0 to 5.13.0. ([\#16745](https://github.com/matrix-org/synapse/issues/16745))
-* Bump isort from 5.13.0 to 5.13.1. ([\#16752](https://github.com/matrix-org/synapse/issues/16752))
-* Bump pydantic from 2.5.1 to 2.5.2. ([\#16747](https://github.com/matrix-org/synapse/issues/16747))
-* Bump ruff from 0.1.6 to 0.1.7. ([\#16746](https://github.com/matrix-org/synapse/issues/16746))
-* Bump types-setuptools from 68.2.0.2 to 69.0.0.0. ([\#16744](https://github.com/matrix-org/synapse/issues/16744))
-
 # Synapse 1.98.0 (2023-12-12)
 
 Synapse 1.98.0 will be the last Synapse release in 2023; the regular release cadence will resume in January 2024.

CONTRIBUTING.md

@@ -1,3 +1,3 @@
 # Welcome to Synapse
 
-Please see the [contributors' guide](https://element-hq.github.io/synapse/latest/development/contributing_guide.html) in our rendered documentation.
+Please see the [contributors' guide](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html) in our rendered documentation.

Cargo.lock

@@ -13,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "arc-swap"
@@ -138,9 +138,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "memchr"
@@ -186,26 +186,20 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "portable-atomic"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.76"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
+checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.20.3"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233"
+checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -213,7 +207,6 @@ dependencies = [
  "libc",
  "memoffset",
  "parking_lot",
- "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
@@ -222,9 +215,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.20.3"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7"
+checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -232,9 +225,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.20.3"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
+checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -253,9 +246,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.20.3"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158"
+checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -265,13 +258,12 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.20.3"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
+checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424"
 dependencies = [
  "heck",
  "proc-macro2",
- "pyo3-build-config",
  "quote",
  "syn",
 ]
@@ -288,9 +280,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
 dependencies = [
  "proc-macro2",
 ]
@@ -306,9 +298,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -318,9 +310,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.4"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
+checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -329,9 +321,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "ryu"
@@ -347,18 +339,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -367,9 +359,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
  "itoa",
  "ryu",
@@ -390,9 +382,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
 dependencies = [
  "proc-macro2",
  "quote",

changelog.d/16533.doc

@@ -0,0 +1 @@
+Added version picker for Synapse documentation. Contributed by @Dmytro27Ind.

changelog.d/16679.feature

@@ -0,0 +1 @@
+Add config options to set the avatar and the topic of the server notices room.

changelog.d/16696.feature

@@ -0,0 +1 @@
+Add a setting to be able to tweak the delay without interaction before an email is sent following a notification.

changelog.d/16726.misc

@@ -0,0 +1 @@
+Update the implementation of [MSC2965](https://github.com/matrix-org/matrix-spec-proposals/pull/2965) (OIDC Provider discovery).

changelog.d/16737.doc

@@ -0,0 +1 @@
+Clarify that `password_config.enabled: "only_for_reauth"` does not allow new logins to be created using password auth.

changelog.d/16738.feature

@@ -0,0 +1 @@
+Add new Sentry configuration option `environment` for improved system monitoring. Contributed by @zeeshanrafiqrana.

changelog.d/16740.bugfix

@@ -0,0 +1 @@
+Fix a long-standing bug where the signing keys generated by Synapse were world-readable. Contributed by Fabian Klemp.

changelog.d/16757.misc

@@ -0,0 +1 @@
+Move the rust stubs inline for better IDE integration.

changelog.d/16930.bugfix

@@ -1 +0,0 @@
-Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.

changelog.d/16932.bugfix

@@ -1 +0,0 @@
-Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.

changelog.d/16942.bugfix

@@ -1 +0,0 @@
-Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.

changelog.d/17037.feature

@@ -1 +0,0 @@
-Add support for moving `/pushrules` off of main process.

changelog.d/17038.feature

@@ -1 +0,0 @@
-Add support for moving `/pushrules` off of main process.

changelog.d/17044.misc

@@ -1 +0,0 @@
-Refactor auth chain fetching to reduce duplication.

changelog.d/17045.misc

@@ -1 +0,0 @@
-Improve database performance by adding a missing index to `access_tokens.refresh_token_id`.

changelog.d/17049.misc

@@ -1 +0,0 @@
-Improve database performance by reducing number of receipts fetched when sending push notifications.

changelog.d/17058.doc

@@ -1 +0,0 @@
-Document [`/v1/make_knock`](https://spec.matrix.org/v1.10/server-server-api/#get_matrixfederationv1make_knockroomiduserid) and [`/v1/send_knock/](https://spec.matrix.org/v1.10/server-server-api/#put_matrixfederationv1send_knockroomideventid) federation endpoints as worker-compatible.

contrib/cmdclient/console.py

@@ -3,7 +3,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2014-2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

contrib/cmdclient/http.py

@@ -1,7 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2014-2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

contrib/graph/graph.py

@@ -1,7 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2014-2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

contrib/graph/graph2.py

@@ -1,7 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2014-2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

contrib/graph/graph3.py

@@ -1,7 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

debian/changelog

@@ -1,88 +1,3 @@
-matrix-synapse-py3 (1.104.0) stable; urgency=medium
-
-  * New Synapse release 1.104.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 02 Apr 2024 17:15:45 +0100
-
-matrix-synapse-py3 (1.104.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.104.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 26 Mar 2024 11:48:58 +0000
-
-matrix-synapse-py3 (1.103.0) stable; urgency=medium
-
-  * New Synapse release 1.103.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 19 Mar 2024 12:24:36 +0000
-
-matrix-synapse-py3 (1.103.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.103.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 12 Mar 2024 15:02:56 +0000
-
-matrix-synapse-py3 (1.102.0) stable; urgency=medium
-
-  * New Synapse release 1.102.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 05 Mar 2024 14:47:03 +0000
-
-matrix-synapse-py3 (1.102.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.102.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 20 Feb 2024 15:50:36 +0000
-
-matrix-synapse-py3 (1.101.0) stable; urgency=medium
-
-  * New Synapse release 1.101.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 13 Feb 2024 10:45:35 +0000
-
-matrix-synapse-py3 (1.101.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.101.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 06 Feb 2024 16:02:02 +0000
-
-matrix-synapse-py3 (1.100.0) stable; urgency=medium
-
-  * New Synapse release 1.100.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 30 Jan 2024 16:58:19 +0000
-
-matrix-synapse-py3 (1.100.0~rc3) stable; urgency=medium
-
-  * New Synapse release 1.100.0rc3.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 24 Jan 2024 14:18:15 +0000
-
-matrix-synapse-py3 (1.100.0~rc2) stable; urgency=medium
-
-  * New Synapse release 1.100.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 24 Jan 2024 11:59:51 +0000
-
-matrix-synapse-py3 (1.100.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.100.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 23 Jan 2024 14:24:16 +0000
-
-matrix-synapse-py3 (1.99.0) stable; urgency=medium
-
-  * Fix copyright file with new licensing
-  * New Synapse release 1.99.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 16 Jan 2024 11:58:34 +0000
-
-matrix-synapse-py3 (1.99.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.99.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 09 Jan 2024 13:43:56 +0000
-
 matrix-synapse-py3 (1.98.0) stable; urgency=medium
 
   * New Synapse release 1.98.0.

debian/copyright

@@ -6,10 +6,6 @@ Files: *
 Copyright: 2014-2017, OpenMarket Ltd, 2017-2018 New Vector Ltd
 License: Apache-2.0
 
-Files: *
-Copyright: 2023 New Vector Ltd
-License: AGPL-3.0-or-later
-
 Files: synapse/config/saml2.py
 Copyright: 2015, Ericsson
 License: Apache-2.0

debian/rules

@@ -40,9 +40,9 @@ override_dh_shlibdeps:
         # to be self-contained, but they have interdependencies and
         # dpkg-shlibdeps doesn't know how to resolve them.
         #
-        # As of Pillow 7.1.0, these libraries are in site-packages/Pillow.libs.
-        # Previously, they were in site-packages/PIL/.libs. As of Pillow 10.2.0
-        # the package name is lowercased to site-packages/pillow.libs.
+        # As of Pillow 7.1.0, these libraries are in
+        # site-packages/Pillow.libs. Previously, they were in
+        # site-packages/PIL/.libs.
         #
         # (we also need to exclude psycopg2, of course, since we've already
         # dealt with that.)
@@ -50,7 +50,6 @@ override_dh_shlibdeps:
 	dh_shlibdeps \
 	    -X site-packages/PIL/.libs \
 	    -X site-packages/Pillow.libs \
-	    -X site-packages/pillow.libs \
 	    -X site-packages/psycopg2
 
 override_dh_virtualenv:

docker/complement/README.md

@@ -30,14 +30,3 @@ Consult `scripts-dev/complement.sh` in the repository root for a real example.
 
 [complement]: https://github.com/matrix-org/complement
 [complementEnv]: https://github.com/matrix-org/complement/pull/382
-
-## How to modify homeserver.yaml for Complement tests
-
-It's common for MSCs to be gated behind a feature flag like this:
-```yaml
-experimental_features:
-  faster_joins: true
-```
-To modify this for the Complement image, modify `./conf/workers-shared-extra.yaml.j2`. Despite the name,
-this will affect non-worker mode as well. Remember to _rebuild_ the image (so don't use `-e` if using
-`complement.sh`).

docker/complement/conf/postgres.supervisord.conf

@@ -1,7 +1,7 @@
 [program:postgres]
 command=/usr/local/bin/prefix-log gosu postgres postgres
 
-# Only start if START_POSTGRES=true
+# Only start if START_POSTGRES=1
 autostart=%(ENV_START_POSTGRES)s
 
 # Lower priority number = starts first

docker/complement/conf/start_for_complement.sh

@@ -32,9 +32,8 @@ case "$SYNAPSE_COMPLEMENT_DATABASE" in
     ;;
 
   sqlite|"")
-    # Set START_POSTGRES to false unless it has already been set
-    # (i.e. by another container image inheriting our own).
-    export START_POSTGRES=${START_POSTGRES:-false}
+    # Configure supervisord not to start Postgres, as we don't need it
+    export START_POSTGRES=false
     ;;
 
   *)

docker/configure_workers_and_start.py

@@ -2,7 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2021 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify
@@ -59,7 +58,6 @@ import platform
 import re
 import subprocess
 import sys
-from argparse import ArgumentParser
 from collections import defaultdict
 from itertools import chain
 from pathlib import Path
@@ -310,13 +308,6 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
         "shared_extra_conf": {},
         "worker_extra_conf": "",
     },
-    "push_rules": {
-        "app": "synapse.app.generic_worker",
-        "listener_resources": ["client", "replication"],
-        "endpoint_patterns": ["^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/"],
-        "shared_extra_conf": {},
-        "worker_extra_conf": "",
-    },
 }
 
 # Templates for sections that may be inserted multiple times in config files
@@ -408,7 +399,6 @@ def add_worker_roles_to_shared_config(
         "receipts",
         "to_device",
         "typing",
-        "push_rules",
     ]
 
     # Worker-type specific sharding config. Now a single worker can fulfill multiple
@@ -1034,14 +1024,6 @@ def generate_worker_log_config(
 
 
 def main(args: List[str], environ: MutableMapping[str, str]) -> None:
-    parser = ArgumentParser()
-    parser.add_argument(
-        "--generate-only",
-        action="store_true",
-        help="Only generate configuration; don't run Synapse.",
-    )
-    opts = parser.parse_args(args)
-
     config_dir = environ.get("SYNAPSE_CONFIG_DIR", "/data")
     config_path = environ.get("SYNAPSE_CONFIG_PATH", config_dir + "/homeserver.yaml")
     data_dir = environ.get("SYNAPSE_DATA_DIR", "/data")
@@ -1083,10 +1065,6 @@ def main(args: List[str], environ: MutableMapping[str, str]) -> None:
     else:
         log("Worker config exists—not regenerating")
 
-    if opts.generate_only:
-        log("--generate-only: won't run Synapse")
-        return
-
     # Lifted right out of start.py
     jemallocpath = "/usr/lib/%s-linux-gnu/libjemalloc.so.2" % (platform.machine(),)
 
@@ -1109,4 +1087,4 @@ def main(args: List[str], environ: MutableMapping[str, str]) -> None:
 
 
 if __name__ == "__main__":
-    main(sys.argv[1:], os.environ)
+    main(sys.argv, os.environ)

docker/prefix-log

@@ -7,9 +7,6 @@
 #   prefix-log command [args...]
 #
 
-# '-W interactive' is a `mawk` extension which disables buffering on stdout and sets line-buffered reads on
-# stdin. The effect is that the output is flushed after each line, rather than being batched, which helps reduce
-# confusion due to to interleaving of the different processes.
-exec 1> >(awk -W interactive '{print "'"${SUPERVISOR_PROCESS_NAME}"' | "$0 }' >&1)
-exec 2> >(awk -W interactive '{print "'"${SUPERVISOR_PROCESS_NAME}"' | "$0 }' >&2)
+exec 1> >(awk '{print "'"${SUPERVISOR_PROCESS_NAME}"' | "$0}' >&1)
+exec 2> >(awk '{print "'"${SUPERVISOR_PROCESS_NAME}"' | "$0}' >&2)
 exec "$@"

docker/start.py

@@ -160,6 +160,11 @@ def run_generate_config(environ: Mapping[str, str], ownership: Optional[str]) ->
     config_path = environ.get("SYNAPSE_CONFIG_PATH", config_dir + "/homeserver.yaml")
     data_dir = environ.get("SYNAPSE_DATA_DIR", "/data")
 
+    if ownership is not None:
+        # make sure that synapse has perms to write to the data dir.
+        log(f"Setting ownership on {data_dir} to {ownership}")
+        subprocess.run(["chown", ownership, data_dir], check=True)
+
     # create a suitable log config from our template
     log_config_file = "%s/%s.log.config" % (config_dir, server_name)
     if not os.path.exists(log_config_file):
@@ -184,15 +189,9 @@ def run_generate_config(environ: Mapping[str, str], ownership: Optional[str]) ->
         "--generate-config",
         "--open-private-ports",
     ]
-
-    if ownership is not None:
-        # make sure that synapse has perms to write to the data dir.
-        log(f"Setting ownership on {data_dir} to {ownership}")
-        subprocess.run(["chown", ownership, data_dir], check=True)
-        args = ["gosu", ownership] + args
-
     # log("running %s" % (args, ))
-    subprocess.run(args, check=True)
+    flush_buffers()
+    os.execv(sys.executable, args)
 
 
 def main(args: List[str], environ: MutableMapping[str, str]) -> None:

docs/.sample_config_header.yaml

@@ -9,4 +9,3 @@
 # https://element-hq.github.io/synapse/latest/setup/installation.html.
 #
 ################################################################################
-

docs/admin_api/rooms.md

@@ -913,7 +913,7 @@ With all that being said, if you still want to try and recover the room:
    them handle rejoining themselves.
 
 4. If `new_room_user_id` was given, a 'Content Violation' will have been
-   created. Consider whether you want to delete that room.
+   created. Consider whether you want to delete that roomm.
 
 # Make Room Admin API
 

docs/admin_api/user_admin_api.md

@@ -149,11 +149,10 @@ Body parameters:
   granting them access to the Admin API, among other things.
 - `deactivated` - **bool**, optional. If unspecified, deactivation state will be left unchanged.
 
-  Note:
-  - For the password field there is no strict check of the necessity for its presence.
-    It is possible to have active users without a password, e.g. when authenticating with OIDC is configured.
-    You must check yourself whether a password is required when reactivating a user or not.
-  - It is not possible to set a password if the config option `password_config.localdb_enabled` is set `false`.
+  Note: the `password` field must also be set if both of the following are true:
+  - `deactivated` is set to `false` and the user was previously deactivated (you are reactivating this user)
+  - Users are allowed to set their password on this homeserver (both `password_config.enabled` and
+    `password_config.localdb_enabled` config options are set to `true`).
   Users' passwords are wiped upon account deactivation, hence the need to set a new one here.
 
   Note: a user cannot be erased with this API. For more details on
@@ -164,7 +163,6 @@ Body parameters:
   Other allowed options are: `bot` and `support`.
 
 ## List Accounts
-### List Accounts (V2)
 
 This API returns all local user accounts.
 By default, the response is ordered by ascending user ID.
@@ -225,7 +223,7 @@ The following parameters should be set in the URL:
   **or** displaynames that contain this value.
 - `guests` - string representing a bool - Is optional and if `false` will **exclude** guest users.
   Defaults to `true` to include guest users. This parameter is not supported when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
-- `admins` - Optional flag to filter admins. If `true`, only admins are queried. If `false`, admins are excluded from
+- `admins` - Optional flag to filter admins. If `true`, only admins are queried. If `false`, admins are excluded from 
   the query. When the flag is absent (the default), **both** admins and non-admins are included in the search results.
 - `deactivated` - string representing a bool - Is optional and if `true` will **include** deactivated users.
   Defaults to `false` to exclude deactivated users.
@@ -274,7 +272,7 @@ The following fields are returned in the JSON response body:
   - `is_guest` - bool - Status if that user is a guest account.
   - `admin` - bool - Status if that user is a server administrator.
   - `user_type` - string - Type of the user. Normal users are type `None`.
-    This allows user type specific behaviour. There are also types `support` and `bot`.
+    This allows user type specific behaviour. There are also types `support` and `bot`. 
   - `deactivated` - bool - Status if that user has been marked as deactivated.
   - `erased` - bool - Status if that user has been marked as erased.
   - `shadow_banned` - bool - Status if that user has been marked as shadow banned.
@@ -288,19 +286,6 @@ The following fields are returned in the JSON response body:
 
 *Added in Synapse 1.93:* the `locked` query parameter and response field.
 
-### List Accounts (V3)
-
-This API returns all local user accounts (see v2). In contrast to v2, the query parameter `deactivated` is handled differently.
-
-```
-GET /_synapse/admin/v3/users
-```
-
-**Parameters**
-- `deactivated` - Optional flag to filter deactivated users. If `true`, only deactivated users are returned.
-  If `false`, deactivated users are excluded from the query. When the flag is absent (the default),
-  users are not filtered by deactivation status.
-
 ## Query current sessions for a user
 
 This API returns information about the active sessions for a specific user.
@@ -902,7 +887,7 @@ The following fields are returned in the JSON response body:
 
 ### Create a device
 
-Creates a new device for a specific `user_id` and `device_id`. Does nothing if the `device_id`
+Creates a new device for a specific `user_id` and `device_id`. Does nothing if the `device_id` 
 exists already.
 
 The API is:
@@ -1269,11 +1254,11 @@ The following parameters should be set in the URL:
 
 ## Check username availability
 
-Checks to see if a username is available, and valid, for the server. See [the client-server
+Checks to see if a username is available, and valid, for the server. See [the client-server 
 API](https://matrix.org/docs/spec/client_server/r0.6.0#get-matrix-client-r0-register-available)
 for more information.
 
-This endpoint will work even if registration is disabled on the server, unlike
+This endpoint will work even if registration is disabled on the server, unlike 
 `/_matrix/client/r0/register/available`.
 
 The API is:

docs/development/contributing_guide.md

@@ -4,16 +4,16 @@ This document aims to get you started with contributing to Synapse!
 
 # 1. Who can contribute to Synapse?
 
-Everyone is welcome to contribute code to
-[Synapse](https://github.com/element-hq/synapse), provided that they are willing
-to license their contributions to Element under a [Contributor License
-Agreement](https://cla-assistant.io/element-hq/synapse) (CLA). This ensures that
-their contribution will be made available under an OSI-approved open-source
-license, currently Affero General Public License v3 (AGPLv3).
+Everyone is welcome to contribute code to [Synapse](https://github.com/element-hq/synapse),
+provided that they are willing to
+license their contributions under the same license as the project itself. We
+follow a simple 'inbound=outbound' model for contributions: the act of
+submitting an 'inbound' contribution means that the contributor agrees to
+license the code under the same terms as the project's overall 'outbound'
+license - in our case, this is almost always Apache Software License v2 (see
+[LICENSE](https://github.com/element-hq/synapse/blob/develop/LICENSE)).
 
-Please see the
-[Element blog post](https://element.io/blog/synapse-now-lives-at-github-com-element-hq-synapse/)
-for the full rationale.
+TODO THIS NEEDS UPDATING
 
 # 2. What do I need?
 
@@ -68,7 +68,7 @@ Of their installation methods, we recommend
 
 ```shell
 pip install --user pipx
-pipx install poetry
+pipx install poetry==1.5.1  # Problems with Poetry 1.6, see https://github.com/matrix-org/synapse/issues/16147
 ```
 
 but see poetry's [installation instructions](https://python-poetry.org/docs/#installation)
@@ -99,8 +99,8 @@ Now edit `homeserver.yaml`, things you might want to change include:
 
 - Set a `server_name`
 - Adjusting paths to be correct for your system like the `log_config` to point to the log config you just copied
-- Using a [PostgreSQL database instead of SQLite](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#database)
-- Adding a [`registration_shared_secret`](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#registration_shared_secret) so you can use [`register_new_matrix_user` command](https://element-hq.github.io/synapse/latest/setup/installation.html#registering-a-user).
+- Using a [PostgreSQL database instead of SQLite](https://vector-im.github.io/synapse/latest/usage/configuration/config_documentation.html#database)
+- Adding a [`registration_shared_secret`](https://vector-im.github.io/synapse/latest/usage/configuration/config_documentation.html#registration_shared_secret) so you can use [`register_new_matrix_user` command](https://vector-im.github.io/synapse/latest/setup/installation.html#registering-a-user).
 
 And then run Synapse with the following command:
 
@@ -132,7 +132,7 @@ to work on.
 
 There is a growing amount of documentation located in the
 [`docs`](https://github.com/element-hq/synapse/tree/develop/docs)
-directory, with a rendered version [available online](https://element-hq.github.io/synapse).
+directory, with a rendered version [available online](https://vector-im.github.io/synapse).
 This documentation is intended primarily for sysadmins running their
 own Synapse instance, as well as developers interacting externally with
 Synapse.
@@ -329,7 +329,7 @@ This configuration should generally cover your needs.
 - To run with Postgres, supply the `-e POSTGRES=1 -e MULTI_POSTGRES=1` environment flags.
 - To run with Synapse in worker mode, supply the `-e WORKERS=1 -e REDIS=1` environment flags (in addition to the Postgres flags).
 
-For more details about other configurations, see the [Docker-specific documentation in the SyTest repo](https://github.com/matrix-org/sytest/blob/develop/docker/README.md).
+For more details about other configurations, see the [Docker-specific documentation in the SyTest repo](https://github.com/vector-im/sytest/blob/develop/docker/README.md).
 
 
 ## Run the integration tests ([Complement](https://github.com/matrix-org/complement)).
@@ -499,19 +499,81 @@ separate pull requests.)
 
 ## Sign off
 
-After you make a PR a comment from @CLAassistant will appear asking you to sign
-the [CLA](https://cla-assistant.io/element-hq/synapse).
-This will link a page to allow you to confirm that you have read and agreed to
-the CLA by signing in with GitHub.
+In order to have a concrete record that your contribution is intentional
+and you agree to license it under the same terms as the project's license, we've adopted the
+same lightweight approach that the Linux Kernel
+[submitting patches process](
+https://www.kernel.org/doc/html/latest/process/submitting-patches.html#sign-your-work-the-developer-s-certificate-of-origin>),
+[Docker](https://github.com/docker/docker/blob/master/CONTRIBUTING.md), and many other
+projects use: the DCO ([Developer Certificate of Origin](http://developercertificate.org/)).
+This is a simple declaration that you wrote
+the contribution or otherwise have the right to contribute it to Matrix:
 
-Alternatively, you can sign off before opening a PR by going to
-<https://cla-assistant.io/element-hq/synapse>.
+```
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+```
+
+If you agree to this for your contribution, then all that's needed is to
+include the line in your commit or pull request comment:
+
+```
+Signed-off-by: Your Name <your@email.example.org>
+```
 
 We accept contributions under a legally identifiable name, such as
 your name on government documentation or common-law names (names
 claimed by legitimate usage or repute). Unfortunately, we cannot
 accept anonymous contributions at this time.
 
+Git allows you to add this signoff automatically when using the `-s`
+flag to `git commit`, which uses the name and email set in your
+`user.name` and `user.email` git configs.
+
+### Private Sign off
+
+If you would like to provide your legal name privately to the Matrix.org
+Foundation (instead of in a public commit or comment), you can do so
+by emailing your legal name and a link to the pull request to
+[dco@matrix.org](mailto:dco@matrix.org?subject=Private%20sign%20off).
+It helps to include "sign off" or similar in the subject line. You will then
+be instructed further.
+
+Once private sign off is complete, doing so for future contributions will not
+be required.
 
 # 10. Turn feedback into better code.
 

docs/modules/third_party_rules_callbacks.md

@@ -142,10 +142,6 @@ Called after sending an event into a room. The module is passed the event, as we
 as the state of the room _after_ the event. This means that if the event is a state event,
 it will be included in this state.
 
-The state map may not be complete if Synapse hasn't yet loaded the full state
-of the room. This can happen for events in rooms that were just joined from
-a remote server.
-
 Note that this callback is called when the event has already been processed and stored
 into the room, which means this callback cannot be used to deny persisting the event. To
 deny an incoming event, see [`check_event_for_spam`](spam_checker_callbacks.md#check_event_for_spam) instead.

docs/other/running_synapse_on_single_board_computers.md

@@ -12,7 +12,7 @@ This is the main reason people have a poor matrix experience on resource constra
 
 While synapse does have some performance issues with presence [#3971](https://github.com/matrix-org/synapse/issues/3971), the fundamental problem is that this is an easy feature to implement for a centralised service at nearly no overhead, but federation makes it combinatorial [#8055](https://github.com/matrix-org/synapse/issues/8055). There is also a client-side config option which disables the UI and idle tracking [enable_presence_by_hs_url] to blacklist the largest instances but I didn't notice much difference, so I recommend disabling the feature entirely at the server level as well.
 
-[enable_presence_by_hs_url]: https://github.com/element-hq/element-web/blob/v1.7.8/config.sample.json#L45
+[enable_presence_by_hs_url]: https://github.com/vector-im/element-web/blob/v1.7.8/config.sample.json#L45
 
 ### Joining
 

docs/postgres.md

@@ -182,7 +182,7 @@ synapse_port_db --sqlite-database homeserver.db.snapshot \
     --postgres-config homeserver-postgres.yaml
 ```
 
-The flag `--curses` displays a coloured curses progress UI. (NOTE: if your terminal is too small the script will error out)
+The flag `--curses` displays a coloured curses progress UI.
 
 If the script took a long time to complete, or time has otherwise passed
 since the original snapshot was taken, repeat the previous steps with a

docs/reverse_proxy.md

@@ -58,12 +58,12 @@ reverse proxy is using.
 
 ```nginx
 server {
-    listen 443 ssl;
-    listen [::]:443 ssl;
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
 
     # For the federation port
-    listen 8448 ssl default_server;
-    listen [::]:8448 ssl default_server;
+    listen 8448 ssl http2 default_server;
+    listen [::]:8448 ssl http2 default_server;
 
     server_name matrix.example.com;
 
@@ -186,25 +186,6 @@ Example configuration, if using a UNIX socket. The configuration lines regarding
 backend matrix
   server matrix unix@/run/synapse/main_public.sock
 ```
-Example configuration when using a single port for both client and federation traffic.
-```
-frontend https
-  bind *:443,[::]:443 ssl crt /etc/ssl/haproxy/ strict-sni alpn h2,http/1.1
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-  http-request set-header X-Forwarded-Proto http  if !{ ssl_fc }
-  http-request set-header X-Forwarded-For %[src]
-
-  acl matrix-host hdr(host) -i matrix.example.com matrix.example.com:443
-  acl matrix-sni  ssl_fc_sni   matrix.example.com
-  acl matrix-path path_beg     /_matrix
-  acl matrix-path path_beg     /_synapse/client
-
-  use_backend matrix if matrix-host matrix-path
-  use_backend matrix if matrix-sni
-
-backend matrix
-  server matrix 127.0.0.1:8008
-```
 
 [Delegation](delegate.md) example:
 ```

docs/setup/installation.md

@@ -26,7 +26,7 @@ for most users.
 #### Docker images and Ansible playbooks
 
 There is an official synapse image available at
-<https://hub.docker.com/r/matrixdotorg/synapse> or at [`ghcr.io/element-hq/synapse`](https://ghcr.io/element-hq/synapse)
+<https://hub.docker.com/r/vectorim/synapse> or at [`ghcr.io/element-hq/synapse`](https://ghcr.io/element-hq/synapse)
 which can be used with the docker-compose file available at
 [contrib/docker](https://github.com/element-hq/synapse/tree/develop/contrib/docker).
 Further information on this including configuration options is available in the README
@@ -326,17 +326,6 @@ Some extra dependencies may be needed. You can use Homebrew (https://brew.sh) fo
 You may need to install icu, and make the icu binaries and libraries accessible.
 Please follow [the official instructions of PyICU](https://pypi.org/project/PyICU/) to do so.
 
-If you're struggling to get icu discovered, and see:
-```
-  RuntimeError:
-  Please install pkg-config on your system or set the ICU_VERSION environment
-  variable to the version of ICU you have installed.
-```
-despite it being installed and having your `PATH` updated, you can omit this dependency by
-not specifying `--extras all` to `poetry`. If using postgres, you can install Synapse via
-`poetry install --extras saml2 --extras oidc --extras postgres --extras opentracing --extras redis --extras sentry`.
-ICU is not a hard dependency on getting a working installation.
-
 On ARM-based Macs you may also need to install libjpeg and libpq:
 ```sh
  brew install jpeg libpq

docs/setup/turn/coturn.md

@@ -136,8 +136,8 @@ This will install and start a systemd service called `coturn`.
     NB: If your TLS certificate was provided by Let's Encrypt, TLS/DTLS will
     not work with any Matrix client that uses Chromium's WebRTC library. This
     currently includes Element Android & iOS; for more details, see their
-    [respective](https://github.com/element-hq/element-android/issues/1533)
-    [issues](https://github.com/element-hq/element-ios/issues/2712) as well as the underlying
+    [respective](https://github.com/vector-im/element-android/issues/1533)
+    [issues](https://github.com/vector-im/element-ios/issues/2712) as well as the underlying
     [WebRTC issue](https://bugs.chromium.org/p/webrtc/issues/detail?id=11710).
     Consider using a ZeroSSL certificate for your TURN server as a working alternative.
 

docs/setup/turn/eturnal.md

@@ -137,8 +137,8 @@ must be edited:
     NB: If your TLS certificate was provided by Let's Encrypt, TLS/DTLS will
     not work with any Matrix client that uses Chromium's WebRTC library. This
     currently includes Element Android & iOS; for more details, see their
-    [respective](https://github.com/element-hq/element-android/issues/1533)
-    [issues](https://github.com/element-hq/element-ios/issues/2712) as well as the underlying
+    [respective](https://github.com/vector-im/element-android/issues/1533)
+    [issues](https://github.com/vector-im/element-ios/issues/2712) as well as the underlying
     [WebRTC issue](https://bugs.chromium.org/p/webrtc/issues/detail?id=11710).
     Consider using a ZeroSSL certificate for your TURN server as a working alternative.
 

docs/sso_mapping_providers.md

@@ -50,13 +50,11 @@ comment these options out and use those specified by the module instead.
 
 A custom mapping provider must specify the following methods:
 
-* `def __init__(self, parsed_config, module_api)`
+* `def __init__(self, parsed_config)`
    - Arguments:
      - `parsed_config` - A configuration object that is the return value of the
        `parse_config` method. You should set any configuration options needed by
        the module here.
-     - `module_api` - a `synapse.module_api.ModuleApi` object which provides the
-       stable API available for extension modules.
 * `def parse_config(config)`
     - This method should have the `@staticmethod` decoration.
     - Arguments:

docs/upgrade.md

@@ -88,43 +88,15 @@ process, for example:
     dpkg -i matrix-synapse-py3_1.3.0+stretch1_amd64.deb
     ```
 
-Generally Synapse database schemas are compatible across multiple versions, but once
-a version of Synapse is deployed you may not be able to roll back automatically.
+Generally Synapse database schemas are compatible across multiple versions, once
+a version of Synapse is deployed you may not be able to rollback automatically.
 The following table gives the version ranges and the earliest version they can
 be rolled back to. E.g. Synapse versions v1.58.0 through v1.61.1 can be rolled
-back safely to v1.57.0, but starting with v1.62.0 it is only safe to roll back to
+back safely to v1.57.0, but starting with v1.62.0 it is only safe to rollback to
 v1.61.0.
 
 <!-- REPLACE_WITH_SCHEMA_VERSIONS -->
 
-## Upgrading from a very old version
-
-You need to read all of the upgrade notes for each version between your current
-version and the latest so that you can update your dependencies, environment,
-config files, etc. if necessary. But you do not need to perform an
-upgrade to each individual version that was missed.
-
-We do not have a list of which versions must be installed. Instead, we recommend
-that you upgrade through each incompatible database schema version, which would
-give you the ability to roll back the maximum number of versions should anything
-go wrong. See [Rolling back to older versions](#rolling-back-to-older-versions)
-above.
-
-Additionally, new versions of Synapse will occasionally run database migrations
-and background updates to update the database. Synapse will not start until
-database migrations are complete. You should wait until background updates from
-each upgrade are complete before moving on to the next upgrade, to avoid
-stacking them up. You can monitor the currently running background updates with
-[the Admin API](usage/administration/admin_api/background_updates.html#status).
-
-# Upgrading to v1.100.0
-
-## Minimum supported Rust version
-The minimum supported Rust version has been increased from v1.61.0 to v1.65.0.
-Users building from source will need to ensure their `rustc` version is up to
-date.
-
-
 # Upgrading to v1.93.0
 
 ## Minimum supported Rust version

docs/usage/administration/admin_faq.md

@@ -120,11 +120,6 @@ for file in $source_directory/*; do
 done
 ```
 
-How do I upgrade from a very old version of Synapse to the latest?
----
-See [this](../../upgrade.html#upgrading-from-a-very-old-version) section in the
-upgrade docs.
-
 Manually resetting passwords
 ---
 Users can reset their password through their client. Alternatively, a server admin

docs/usage/administration/monitoring/reporting_homeserver_usage_statistics.md

@@ -74,4 +74,3 @@ consider using one of the following known implementations:
 
 * [Matrix.org's Panopticon](https://github.com/matrix-org/panopticon)
 * [Famedly's Barad-dûr](https://gitlab.com/famedly/infra/services/barad-dur)
-* [Synapse Usage Exporter](https://github.com/loelkes/synapse-usage-exporter) for Prometheus

docs/usage/administration/useful_sql_for_admins.md

@@ -205,12 +205,3 @@ SELECT user_id, device_id, user_agent, TO_TIMESTAMP(last_seen / 1000) AS "last_s
   FROM devices
   WHERE last_seen < DATE_PART('epoch', NOW() - INTERVAL '3 month') * 1000;
 ```
-
-## Clear the cache of a remote user's device list
-
-Forces the resync of a remote user's device list - if you have somehow cached a bad state, and the remote server is
-will not send out a device list update.
-```sql
-INSERT INTO device_lists_remote_resync
-VALUES ('USER_ID', (EXTRACT(epoch FROM NOW()) * 1000)::BIGINT);
-```

docs/usage/configuration/config_documentation.md

@@ -2680,7 +2680,7 @@ Example configuration:
 refreshable_access_token_lifetime: 10m
 ```
 ---
-### `refresh_token_lifetime`
+### `refresh_token_lifetime: 24h`
 
 Time that a refresh token remains valid for (provided that it is not
 exchanged for another one first).
@@ -3349,9 +3349,6 @@ Options for each entry include:
    not included in `scopes`. Set to `userinfo_endpoint` to always use the
    userinfo endpoint.
 
-* `additional_authorization_parameters`: String to string dictionary that will be passed as
-   additional parameters to the authorization grant URL.
-
 * `allow_existing_users`: set to true to allow a user logging in via OIDC to
    match a pre-existing account instead of failing. This could be used if
    switching from password logins to OIDC. Defaults to false.
@@ -3476,8 +3473,6 @@ oidc_providers:
     token_endpoint: "https://accounts.example.com/oauth2/token"
     userinfo_endpoint: "https://accounts.example.com/userinfo"
     jwks_uri: "https://accounts.example.com/.well-known/jwks.json"
-    additional_authorization_parameters:
-      acr_values: 2fa
     skip_verification: true
     enable_registration: true
     user_mapping_provider:
@@ -3964,9 +3959,6 @@ The first rule that matches decides if the request is allowed or denied. If no
 rule matches, the request is denied. In particular, this means that configuring
 an empty list of rules will deny every alias creation request.
 
-Requests to create a public (public as in published to the room directory) room which violates
-the configured rules will result in the room being created but not published to the room directory.
-
 Each rule is a YAML object containing four fields, each of which is an optional string:
 
 * `user_id`: a glob pattern that matches against the user publishing the room.

docs/usage/configuration/logging_sample_config.md

@@ -11,9 +11,6 @@ Note that a default logging configuration (shown below) is created automatically
 the homeserver config when following the [installation instructions](../../setup/installation.md).
 It should be named `<SERVERNAME>.log.config` by default.
 
-Hint: If you're looking for a guide on what each of the fields in the "Processed request" log lines mean,
-see [Request log format](../administration/request_log.md).
-
 ```yaml
 {{#include ../../sample_log_config.yaml}}
 ```

docs/website_files/version-picker.js

@@ -54,7 +54,7 @@ function fetchVersions(dropdown, dropdownMenu) {
     return new Promise((resolve, reject) => {
         window.addEventListener("load", () => {
 
-            fetch("https://api.github.com/repos/element-hq/synapse/git/trees/gh-pages", {
+            fetch("https://api.github.com/repos/matrix-org/synapse/git/trees/gh-pages", {
                 cache: "force-cache",
             }).then(res => 
                 res.json()
@@ -100,30 +100,10 @@ function sortVersions(a, b) {
     if (a === 'develop' || a === 'latest') return -1;
     if (b === 'develop' || b === 'latest') return 1;
 
-    // If any of the versions do not confrom to a semantic version string, they
-    // will be sorted behind a valid version.
-    const versionA = (a.match(/v(\d+(\.\d+)+)/) || [])[1]?.split('.') ?? '';
-    const versionB = (b.match(/v(\d+(\.\d+)+)/) || [])[1]?.split('.') ?? '';
+    const versionA = (a.match(/v\d+(\.\d+)+/) || [])[0];
+    const versionB = (b.match(/v\d+(\.\d+)+/) || [])[0];
 
-    for (let i = 0; i < Math.max(versionA.length, versionB.length); i++) {
-        if (versionB[i] === undefined) {
-            return -1;
-        }
-        if (versionA[i] === undefined) {
-            return 1;
-        }
-
-        const partA = parseInt(versionA[i], 10);
-        const partB = parseInt(versionB[i], 10);
-
-        if (partA > partB) {
-            return -1;
-        } else if (partB > partA) {
-            return 1;
-        }
-    }
-
-    return 0;
+    return versionB.localeCompare(versionA);
 }
 
 /**
@@ -144,4 +124,4 @@ function changeVersion(url, newVersion) {
     parsedURL.pathname = pathSegments.join('/');
   
     return parsedURL.href;
-}
+}

docs/workers.md

@@ -211,8 +211,6 @@ information.
     ^/_matrix/federation/v1/make_leave/
     ^/_matrix/federation/(v1|v2)/send_join/
     ^/_matrix/federation/(v1|v2)/send_leave/
-    ^/_matrix/federation/v1/make_knock/
-    ^/_matrix/federation/v1/send_knock/
     ^/_matrix/federation/(v1|v2)/invite/
     ^/_matrix/federation/v1/event_auth/
     ^/_matrix/federation/v1/timestamp_to_event/
@@ -534,13 +532,6 @@ the stream writer for the `presence` stream:
 
     ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/
 
-##### The `push_rules` stream
-
-The following endpoints should be routed directly to the worker configured as
-the stream writer for the `push` stream:
-
-    ^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/
-
 #### Restrict outbound federation traffic to a specific set of workers
 
 The
@@ -638,7 +629,7 @@ worker application type.
 
 You can designate generic worker to sending push notifications to
 a [push gateway](https://spec.matrix.org/v1.5/push-gateway-api/) such as
-[sygnal](https://github.com/matrix-org/sygnal) and email.
+[sygnal](https://github.com/vector-im/sygnal) and email.
 
 This will stop the main process sending push notifications.
 

pyproject.toml

@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.104.0"
+version = "1.98.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
@@ -321,7 +321,7 @@ all = [
 # This helps prevents merge conflicts when running a batch of dependabot updates.
 isort = ">=5.10.1"
 black = ">=22.7.0"
-ruff = "0.3.2"
+ruff = "0.1.7"
 # Type checking only works with the pydantic.v1 compat module from pydantic v2
 pydantic = "^2"
 
@@ -372,7 +372,7 @@ optional = true
 sphinx = {version = "^6.1", python = "^3.8"}
 sphinx-autodoc2 = {version = ">=0.4.2,<0.6.0", python = "^3.8"}
 myst-parser = {version = "^1.0.0", python = "^3.8"}
-furo = ">=2022.12.7,<2025.0.0"
+furo = ">=2022.12.7,<2024.0.0"
 
 
 [build-system]
@@ -382,7 +382,7 @@ furo = ">=2022.12.7,<2025.0.0"
 # runtime errors caused by build system changes.
 # We are happy to raise these upper bounds upon request,
 # provided we check that it's safe to do so (i.e. that CI passes).
-requires = ["poetry-core>=1.1.0,<=1.9.0", "setuptools_rust>=1.3,<=1.8.1"]
+requires = ["poetry-core>=1.1.0,<=1.8.1", "setuptools_rust>=1.3,<=1.8.1"]
 build-backend = "poetry.core.masonry.api"
 
 

rust/Cargo.toml

@@ -7,7 +7,7 @@ name = "synapse"
 version = "0.1.0"
 
 edition = "2021"
-rust-version = "1.65.0"
+rust-version = "1.61.0"
 
 [lib]
 name = "synapse"

rust/benches/evaluator.rs

@@ -1,7 +1,6 @@
 /*
  * This file is licensed under the Affero General Public License (AGPL) version 3.
  *
- * Copyright 2022 The Matrix.org Foundation C.I.C.
  * Copyright (C) 2023 New Vector, Ltd
  *
  * This program is free software: you can redistribute it and/or modify

rust/benches/glob.rs

@@ -1,7 +1,6 @@
 /*
  * This file is licensed under the Affero General Public License (AGPL) version 3.
  *
- * Copyright 2022 The Matrix.org Foundation C.I.C.
  * Copyright (C) 2023 New Vector, Ltd
  *
  * This program is free software: you can redistribute it and/or modify

rust/src/acl/mod.rs

@@ -1,7 +1,6 @@
 /*
  * This file is licensed under the Affero General Public License (AGPL) version 3.
  *
- * Copyright 2023 The Matrix.org Foundation C.I.C.
  * Copyright (C) 2023 New Vector, Ltd
  *
  * This program is free software: you can redistribute it and/or modify

rust/src/events/internal_metadata.rs

@@ -1,430 +0,0 @@
-/*
- * This file is licensed under the Affero General Public License (AGPL) version 3.
- *
- * Copyright (C) 2024 New Vector, Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * See the GNU Affero General Public License for more details:
- * <https://www.gnu.org/licenses/agpl-3.0.html>.
- *
- * Originally licensed under the Apache License, Version 2.0:
- * <http://www.apache.org/licenses/LICENSE-2.0>.
- *
- * [This file includes modifications made by New Vector Limited]
- *
- */
-
-//! Implements the internal metadata class attached to events.
-//!
-//! The internal metadata is a bit like a `TypedDict`, in that it is stored as a
-//! JSON dict in the DB. Most events have zero, or only a few, of these keys
-//! set. Therefore, since we care more about memory size than performance here,
-//! we store these fields in a mapping.
-//!
-//! We want to store (most) of the fields as Rust objects, so we implement the
-//! mapping by using a vec of enums. This is less efficient than using
-//! attributes, but for small number of keys is actually faster than using a
-//! hash or btree map.
-
-use std::{num::NonZeroI64, ops::Deref};
-
-use anyhow::Context;
-use log::warn;
-use pyo3::{
-    exceptions::PyAttributeError,
-    pyclass, pymethods,
-    types::{PyDict, PyString},
-    IntoPy, PyAny, PyObject, PyResult, Python,
-};
-
-/// Definitions of the various fields of the internal metadata.
-#[derive(Clone)]
-enum EventInternalMetadataData {
-    OutOfBandMembership(bool),
-    SendOnBehalfOf(Box<str>),
-    RecheckRedaction(bool),
-    SoftFailed(bool),
-    ProactivelySend(bool),
-    Redacted(bool),
-    TxnId(Box<str>),
-    TokenId(i64),
-    DeviceId(Box<str>),
-}
-
-impl EventInternalMetadataData {
-    /// Convert the field to its name and python object.
-    fn to_python_pair<'a>(&self, py: Python<'a>) -> (&'a PyString, PyObject) {
-        match self {
-            EventInternalMetadataData::OutOfBandMembership(o) => {
-                (pyo3::intern!(py, "out_of_band_membership"), o.into_py(py))
-            }
-            EventInternalMetadataData::SendOnBehalfOf(o) => {
-                (pyo3::intern!(py, "send_on_behalf_of"), o.into_py(py))
-            }
-            EventInternalMetadataData::RecheckRedaction(o) => {
-                (pyo3::intern!(py, "recheck_redaction"), o.into_py(py))
-            }
-            EventInternalMetadataData::SoftFailed(o) => {
-                (pyo3::intern!(py, "soft_failed"), o.into_py(py))
-            }
-            EventInternalMetadataData::ProactivelySend(o) => {
-                (pyo3::intern!(py, "proactively_send"), o.into_py(py))
-            }
-            EventInternalMetadataData::Redacted(o) => {
-                (pyo3::intern!(py, "redacted"), o.into_py(py))
-            }
-            EventInternalMetadataData::TxnId(o) => (pyo3::intern!(py, "txn_id"), o.into_py(py)),
-            EventInternalMetadataData::TokenId(o) => (pyo3::intern!(py, "token_id"), o.into_py(py)),
-            EventInternalMetadataData::DeviceId(o) => {
-                (pyo3::intern!(py, "device_id"), o.into_py(py))
-            }
-        }
-    }
-
-    /// Converts from python key/values to the field.
-    ///
-    /// Returns `None` if the key is a valid but unrecognized string.
-    fn from_python_pair(key: &PyAny, value: &PyAny) -> PyResult<Option<Self>> {
-        let key_str: &str = key.extract()?;
-
-        let e = match key_str {
-            "out_of_band_membership" => EventInternalMetadataData::OutOfBandMembership(
-                value
-                    .extract()
-                    .with_context(|| format!("'{key_str}' has invalid type"))?,
-            ),
-
-            "send_on_behalf_of" => EventInternalMetadataData::SendOnBehalfOf(
-                value
-                    .extract()
-                    .map(String::into_boxed_str)
-                    .with_context(|| format!("'{key_str}' has invalid type"))?,
-            ),
-            "recheck_redaction" => EventInternalMetadataData::RecheckRedaction(
-                value
-                    .extract()
-                    .with_context(|| format!("'{key_str}' has invalid type"))?,
-            ),
-            "soft_failed" => EventInternalMetadataData::SoftFailed(
-                value
-                    .extract()
-                    .with_context(|| format!("'{key_str}' has invalid type"))?,
-            ),
-            "proactively_send" => EventInternalMetadataData::ProactivelySend(
-                value
-                    .extract()
-                    .with_context(|| format!("'{key_str}' has invalid type"))?,
-            ),
-            "redacted" => EventInternalMetadataData::Redacted(
-                value
-                    .extract()
-                    .with_context(|| format!("'{key_str}' has invalid type"))?,
-            ),
-            "txn_id" => EventInternalMetadataData::TxnId(
-                value
-                    .extract()
-                    .map(String::into_boxed_str)
-                    .with_context(|| format!("'{key_str}' has invalid type"))?,
-            ),
-            "token_id" => EventInternalMetadataData::TokenId(
-                value
-                    .extract()
-                    .with_context(|| format!("'{key_str}' has invalid type"))?,
-            ),
-            "device_id" => EventInternalMetadataData::DeviceId(
-                value
-                    .extract()
-                    .map(String::into_boxed_str)
-                    .with_context(|| format!("'{key_str}' has invalid type"))?,
-            ),
-            _ => return Ok(None),
-        };
-
-        Ok(Some(e))
-    }
-}
-
-/// Helper macro to find the given field in internal metadata, returning None if
-/// not found.
-macro_rules! get_property_opt {
-    ($self:expr, $name:ident) => {
-        $self.data.iter().find_map(|entry| {
-            if let EventInternalMetadataData::$name(data) = entry {
-                Some(data)
-            } else {
-                None
-            }
-        })
-    };
-}
-
-/// Helper macro to find the given field in internal metadata, raising an
-/// attribute error if not found.
-macro_rules! get_property {
-    ($self:expr, $name:ident) => {
-        get_property_opt!($self, $name).ok_or_else(|| {
-            PyAttributeError::new_err(format!(
-                "'EventInternalMetadata' has no attribute '{}'",
-                stringify!($name),
-            ))
-        })
-    };
-}
-
-/// Helper macro to set the give field.
-macro_rules! set_property {
-    ($self:expr, $name:ident, $obj:expr) => {
-        for entry in &mut $self.data {
-            if let EventInternalMetadataData::$name(data) = entry {
-                *data = $obj;
-                return;
-            }
-        }
-
-        $self.data.push(EventInternalMetadataData::$name($obj))
-    };
-}
-
-#[pyclass]
-#[derive(Clone)]
-pub struct EventInternalMetadata {
-    /// The fields of internal metadata. This functions as a mapping.
-    data: Vec<EventInternalMetadataData>,
-
-    /// The stream ordering of this event. None, until it has been persisted.
-    #[pyo3(get, set)]
-    stream_ordering: Option<NonZeroI64>,
-
-    /// whether this event is an outlier (ie, whether we have the state at that
-    /// point in the DAG)
-    #[pyo3(get, set)]
-    outlier: bool,
-}
-
-#[pymethods]
-impl EventInternalMetadata {
-    #[new]
-    fn new(dict: &PyDict) -> PyResult<Self> {
-        let mut data = Vec::with_capacity(dict.len());
-
-        for (key, value) in dict.iter() {
-            match EventInternalMetadataData::from_python_pair(key, value) {
-                Ok(Some(entry)) => data.push(entry),
-                Ok(None) => {}
-                Err(err) => {
-                    warn!("Ignoring internal metadata field '{key}', as failed to convert to Rust due to {err}")
-                }
-            }
-        }
-
-        data.shrink_to_fit();
-
-        Ok(EventInternalMetadata {
-            data,
-            stream_ordering: None,
-            outlier: false,
-        })
-    }
-
-    fn copy(&self) -> Self {
-        self.clone()
-    }
-
-    fn get_dict(&self, py: Python<'_>) -> PyResult<PyObject> {
-        let dict = PyDict::new(py);
-
-        for entry in &self.data {
-            let (key, value) = entry.to_python_pair(py);
-            dict.set_item(key, value)?;
-        }
-
-        Ok(dict.into())
-    }
-
-    fn is_outlier(&self) -> bool {
-        self.outlier
-    }
-
-    /// Whether this event is an out-of-band membership.
-    ///
-    /// OOB memberships are a special case of outlier events: they are
-    /// membership events for federated rooms that we aren't full members of.
-    /// Examples include invites received over federation, and rejections for
-    /// such invites.
-    ///
-    /// The concept of an OOB membership is needed because these events need to
-    /// be processed as if they're new regular events (e.g. updating membership
-    /// state in the database, relaying to clients via /sync, etc) despite being
-    /// outliers.
-    ///
-    /// See also
-    /// https://element-hq.github.io/synapse/develop/development/room-dag-concepts.html#out-of-band-membership-events.
-    ///
-    /// (Added in synapse 0.99.0, so may be unreliable for events received
-    /// before that)
-    fn is_out_of_band_membership(&self) -> bool {
-        get_property_opt!(self, OutOfBandMembership)
-            .copied()
-            .unwrap_or(false)
-    }
-
-    /// Whether this server should send the event on behalf of another server.
-    /// This is used by the federation "send_join" API to forward the initial
-    /// join event for a server in the room.
-    ///
-    /// returns a str with the name of the server this event is sent on behalf
-    /// of.
-    fn get_send_on_behalf_of(&self) -> Option<&str> {
-        let s = get_property_opt!(self, SendOnBehalfOf);
-        s.map(|a| a.deref())
-    }
-
-    /// Whether the redaction event needs to be rechecked when fetching
-    /// from the database.
-    ///
-    /// Starting in room v3 redaction events are accepted up front, and later
-    /// checked to see if the redacter and redactee's domains match.
-    ///
-    /// If the sender of the redaction event is allowed to redact any event
-    /// due to auth rules, then this will always return false.
-    fn need_to_check_redaction(&self) -> bool {
-        get_property_opt!(self, RecheckRedaction)
-            .copied()
-            .unwrap_or(false)
-    }
-
-    /// Whether the event has been soft failed.
-    ///
-    /// Soft failed events should be handled as usual, except:
-    /// 1. They should not go down sync or event streams, or generally sent to
-    ///    clients.
-    /// 2. They should not be added to the forward extremities (and therefore
-    ///    not to current state).
-    fn is_soft_failed(&self) -> bool {
-        get_property_opt!(self, SoftFailed)
-            .copied()
-            .unwrap_or(false)
-    }
-
-    /// Whether the event, if ours, should be sent to other clients and servers.
-    ///
-    /// This is used for sending dummy events internally. Servers and clients
-    /// can still explicitly fetch the event.
-    fn should_proactively_send(&self) -> bool {
-        get_property_opt!(self, ProactivelySend)
-            .copied()
-            .unwrap_or(true)
-    }
-
-    /// Whether the event has been redacted.
-    ///
-    /// This is used for efficiently checking whether an event has been marked
-    /// as redacted without needing to make another database call.
-    fn is_redacted(&self) -> bool {
-        get_property_opt!(self, Redacted).copied().unwrap_or(false)
-    }
-
-    /// Whether this event can trigger a push notification
-    fn is_notifiable(&self) -> bool {
-        !self.outlier || self.is_out_of_band_membership()
-    }
-
-    // ** The following are the getters and setters of the various properties **
-
-    #[getter]
-    fn get_out_of_band_membership(&self) -> PyResult<bool> {
-        let bool = get_property!(self, OutOfBandMembership)?;
-        Ok(*bool)
-    }
-    #[setter]
-    fn set_out_of_band_membership(&mut self, obj: bool) {
-        set_property!(self, OutOfBandMembership, obj);
-    }
-
-    #[getter(send_on_behalf_of)]
-    fn getter_send_on_behalf_of(&self) -> PyResult<&str> {
-        let s = get_property!(self, SendOnBehalfOf)?;
-        Ok(s)
-    }
-    #[setter]
-    fn set_send_on_behalf_of(&mut self, obj: String) {
-        set_property!(self, SendOnBehalfOf, obj.into_boxed_str());
-    }
-
-    #[getter]
-    fn get_recheck_redaction(&self) -> PyResult<bool> {
-        let bool = get_property!(self, RecheckRedaction)?;
-        Ok(*bool)
-    }
-    #[setter]
-    fn set_recheck_redaction(&mut self, obj: bool) {
-        set_property!(self, RecheckRedaction, obj);
-    }
-
-    #[getter]
-    fn get_soft_failed(&self) -> PyResult<bool> {
-        let bool = get_property!(self, SoftFailed)?;
-        Ok(*bool)
-    }
-    #[setter]
-    fn set_soft_failed(&mut self, obj: bool) {
-        set_property!(self, SoftFailed, obj);
-    }
-
-    #[getter]
-    fn get_proactively_send(&self) -> PyResult<bool> {
-        let bool = get_property!(self, ProactivelySend)?;
-        Ok(*bool)
-    }
-    #[setter]
-    fn set_proactively_send(&mut self, obj: bool) {
-        set_property!(self, ProactivelySend, obj);
-    }
-
-    #[getter]
-    fn get_redacted(&self) -> PyResult<bool> {
-        let bool = get_property!(self, Redacted)?;
-        Ok(*bool)
-    }
-    #[setter]
-    fn set_redacted(&mut self, obj: bool) {
-        set_property!(self, Redacted, obj);
-    }
-
-    /// The transaction ID, if it was set when the event was created.
-    #[getter]
-    fn get_txn_id(&self) -> PyResult<&str> {
-        let s = get_property!(self, TxnId)?;
-        Ok(s)
-    }
-    #[setter]
-    fn set_txn_id(&mut self, obj: String) {
-        set_property!(self, TxnId, obj.into_boxed_str());
-    }
-
-    /// The access token ID of the user who sent this event, if any.
-    #[getter]
-    fn get_token_id(&self) -> PyResult<i64> {
-        let r = get_property!(self, TokenId)?;
-        Ok(*r)
-    }
-    #[setter]
-    fn set_token_id(&mut self, obj: i64) {
-        set_property!(self, TokenId, obj);
-    }
-
-    /// The device ID of the user who sent this event, if any.
-    #[getter]
-    fn get_device_id(&self) -> PyResult<&str> {
-        let s = get_property!(self, DeviceId)?;
-        Ok(s)
-    }
-    #[setter]
-    fn set_device_id(&mut self, obj: String) {
-        set_property!(self, DeviceId, obj.into_boxed_str());
-    }
-}

rust/src/events/mod.rs

@@ -1,41 +0,0 @@
-/*
- * This file is licensed under the Affero General Public License (AGPL) version 3.
- *
- * Copyright (C) 2024 New Vector, Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * See the GNU Affero General Public License for more details:
- * <https://www.gnu.org/licenses/agpl-3.0.html>.
- *
- * Originally licensed under the Apache License, Version 2.0:
- * <http://www.apache.org/licenses/LICENSE-2.0>.
- *
- * [This file includes modifications made by New Vector Limited]
- *
- */
-
-//! Classes for representing Events.
-
-use pyo3::{types::PyModule, PyResult, Python};
-
-mod internal_metadata;
-
-/// Called when registering modules with python.
-pub fn register_module(py: Python<'_>, m: &PyModule) -> PyResult<()> {
-    let child_module = PyModule::new(py, "events")?;
-    child_module.add_class::<internal_metadata::EventInternalMetadata>()?;
-
-    m.add_submodule(child_module)?;
-
-    // We need to manually add the module to sys.modules to make `from
-    // synapse.synapse_rust import events` work.
-    py.import("sys")?
-        .getattr("modules")?
-        .set_item("synapse.synapse_rust.events", child_module)?;
-
-    Ok(())
-}

rust/src/lib.rs

@@ -3,7 +3,6 @@ use pyo3::prelude::*;
 use pyo3_log::ResetHandle;
 
 pub mod acl;
-pub mod events;
 pub mod push;
 
 lazy_static! {
@@ -42,7 +41,6 @@ fn synapse_rust(py: Python<'_>, m: &PyModule) -> PyResult<()> {
 
     acl::register_module(py, m)?;
     push::register_module(py, m)?;
-    events::register_module(py, m)?;
 
     Ok(())
 }

rust/src/push/base_rules.rs

@@ -1,7 +1,6 @@
 /*
  * This file is licensed under the Affero General Public License (AGPL) version 3.
  *
- * Copyright 2022, 2023 The Matrix.org Foundation C.I.C.
  * Copyright (C) 2023 New Vector, Ltd
  *
  * This program is free software: you can redistribute it and/or modify

rust/src/push/evaluator.rs

@@ -1,7 +1,6 @@
 /*
  * This file is licensed under the Affero General Public License (AGPL) version 3.
  *
- * Copyright 2022 The Matrix.org Foundation C.I.C.
  * Copyright (C) 2023 New Vector, Ltd
  *
  * This program is free software: you can redistribute it and/or modify

rust/src/push/mod.rs

@@ -1,7 +1,6 @@
 /*
  * This file is licensed under the Affero General Public License (AGPL) version 3.
  *
- * Copyright 2022 The Matrix.org Foundation C.I.C.
  * Copyright (C) 2023 New Vector, Ltd
  *
  * This program is free software: you can redistribute it and/or modify

rust/src/push/utils.rs

@@ -1,7 +1,6 @@
 /*
  * This file is licensed under the Affero General Public License (AGPL) version 3.
  *
- * Copyright 2022 The Matrix.org Foundation C.I.C.
  * Copyright (C) 2023 New Vector, Ltd
  *
  * This program is free software: you can redistribute it and/or modify

scripts-dev/check_locked_deps_have_sdists.py

@@ -2,7 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2022 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

scripts-dev/check_pydantic_models.py

@@ -2,7 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2022 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

scripts-dev/federation_client.py

@@ -2,7 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2015, 2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

scripts-dev/mypy_synapse_plugin.py

@@ -1,7 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2020 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

scripts-dev/release.py

@@ -2,7 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2020 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify
@@ -660,7 +659,7 @@ def _announce() -> None:
 Hi everyone. Synapse {current_version} has just been released.
 
 [notes](https://github.com/element-hq/synapse/releases/tag/{tag_name}) | \
-[docker](https://hub.docker.com/r/matrixdotorg/synapse/tags?name={tag_name}) | \
+[docker](https://hub.docker.com/r/vectorim/synapse/tags?name={tag_name}) | \
 [debs](https://packages.matrix.org/debian/) | \
 [pypi](https://pypi.org/project/matrix-synapse/{current_version}/)"""
     )

scripts-dev/schema_versions.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # Copyright 2023 The Matrix.org Foundation C.I.C.
-# Copyright 2023 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

scripts-dev/sign_json.py

@@ -2,7 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2020 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

stubs/icu.pyi

@@ -1,5 +1,4 @@
 # Copyright 2022 The Matrix.org Foundation C.I.C.
-# Copyright 2022 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

stubs/txredisapi.pyi

@@ -1,5 +1,4 @@
 # Copyright 2020 The Matrix.org Foundation C.I.C.
-# Copyright 2020 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

synapse/__init__.py

@@ -1,8 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2023 The Matrix.org Foundation C.I.C.
-# Copyright 2014-2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/_pydantic_compat.py

@@ -1,7 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2023 Maxwell G <maxwell@gtmx.me>
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/_scripts/export_signing_key.py

@@ -2,7 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2019 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/_scripts/generate_log_config.py

@@ -3,7 +3,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2020 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/_scripts/generate_signing_key.py

@@ -2,7 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2019 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/_scripts/generate_workers_map.py

@@ -2,7 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2022-2023 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/_scripts/register_new_matrix_user.py

@@ -1,8 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2021-22 The Matrix.org Foundation C.I.C.
-# Copyright 2015, 2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/_scripts/review_recent_signups.py

@@ -1,7 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2021 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/_scripts/synapse_port_db.py

@@ -2,8 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2019 The Matrix.org Foundation C.I.C.
-# Copyright 2015, 2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify
@@ -60,7 +58,7 @@ from synapse.logging.context import (
 )
 from synapse.notifier import ReplicationNotifier
 from synapse.storage.database import DatabasePool, LoggingTransaction, make_conn
-from synapse.storage.databases.main import FilteringWorkerStore
+from synapse.storage.databases.main import FilteringWorkerStore, PushRuleStore
 from synapse.storage.databases.main.account_data import AccountDataWorkerStore
 from synapse.storage.databases.main.client_ips import ClientIpBackgroundUpdateStore
 from synapse.storage.databases.main.deviceinbox import DeviceInboxBackgroundUpdateStore
@@ -77,8 +75,10 @@ from synapse.storage.databases.main.media_repository import (
 )
 from synapse.storage.databases.main.presence import PresenceBackgroundUpdateStore
 from synapse.storage.databases.main.profile import ProfileWorkerStore
-from synapse.storage.databases.main.push_rule import PusherWorkerStore
-from synapse.storage.databases.main.pusher import PusherBackgroundUpdatesStore
+from synapse.storage.databases.main.pusher import (
+    PusherBackgroundUpdatesStore,
+    PusherWorkerStore,
+)
 from synapse.storage.databases.main.receipts import ReceiptsBackgroundUpdateStore
 from synapse.storage.databases.main.registration import (
     RegistrationBackgroundUpdateStore,
@@ -243,6 +243,7 @@ class Store(
     AccountDataWorkerStore,
     FilteringWorkerStore,
     ProfileWorkerStore,
+    PushRuleStore,
     PusherWorkerStore,
     PusherBackgroundUpdatesStore,
     PresenceBackgroundUpdateStore,
@@ -1037,10 +1038,10 @@ class Porter:
         return done, remaining + done
 
     async def _setup_state_group_id_seq(self) -> None:
-        curr_id: Optional[int] = (
-            await self.sqlite_store.db_pool.simple_select_one_onecol(
-                table="state_groups", keyvalues={}, retcol="MAX(id)", allow_none=True
-            )
+        curr_id: Optional[
+            int
+        ] = await self.sqlite_store.db_pool.simple_select_one_onecol(
+            table="state_groups", keyvalues={}, retcol="MAX(id)", allow_none=True
         )
 
         if not curr_id:
@@ -1129,13 +1130,13 @@ class Porter:
         )
 
     async def _setup_auth_chain_sequence(self) -> None:
-        curr_chain_id: Optional[int] = (
-            await self.sqlite_store.db_pool.simple_select_one_onecol(
-                table="event_auth_chains",
-                keyvalues={},
-                retcol="MAX(chain_id)",
-                allow_none=True,
-            )
+        curr_chain_id: Optional[
+            int
+        ] = await self.sqlite_store.db_pool.simple_select_one_onecol(
+            table="event_auth_chains",
+            keyvalues={},
+            retcol="MAX(chain_id)",
+            allow_none=True,
         )
 
         def r(txn: LoggingTransaction) -> None:

synapse/_scripts/synctl.py

@@ -2,7 +2,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2014-2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/_scripts/update_synapse_database.py

@@ -1,7 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2019 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/api/__init__.py

@@ -1,7 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2014-2016 OpenMarket Ltd
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify

synapse/api/auth/__init__.py

@@ -1,7 +1,6 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
-# Copyright 2023 The Matrix.org Foundation.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify