From b82fff66df6ea050d4d8da880c2ea2840e3fce0d Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 22 Apr 2022 16:03:46 +0100
Subject: [PATCH] MSC3202: Fix device_unused_fallback_keys ->
 device_unused_fallback_key_types (#12520)

* Fix device_unused_fallback_keys -> device_unused_fallback_key_types

* changelog
---
 changelog.d/12520.bugfix       | 1 +
 synapse/appservice/__init__.py | 2 +-
 synapse/appservice/api.py      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/12520.bugfix

diff --git a/changelog.d/12520.bugfix b/changelog.d/12520.bugfix
new file mode 100644
index 000000000..c73005fde
--- /dev/null
+++ b/changelog.d/12520.bugfix
@@ -0,0 +1 @@
+Fix a bug in the implementation of MSC3202 where Synapse would use the field name `device_unused_fallback_keys`, rather than `device_unused_fallback_key_types`.
\ No newline at end of file
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py
index d23d9221b..a610fb785 100644
--- a/synapse/appservice/__init__.py
+++ b/synapse/appservice/__init__.py
@@ -42,7 +42,7 @@ logger = logging.getLogger(__name__)
 #   user ID -> {device ID -> {algorithm -> count}}
 TransactionOneTimeKeyCounts = Dict[str, Dict[str, Dict[str, int]]]
 
-# Type for the `device_unused_fallback_keys` field in an appservice transaction
+# Type for the `device_unused_fallback_key_types` field in an appservice transaction
 #   user ID -> {device ID -> [algorithm]}
 TransactionUnusedFallbackKeys = Dict[str, Dict[str, List[str]]]
 
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py
index 0cdbb04bf..adc6b074d 100644
--- a/synapse/appservice/api.py
+++ b/synapse/appservice/api.py
@@ -278,7 +278,7 @@ class ApplicationServiceApi(SimpleHttpClient):
                 ] = one_time_key_counts
             if unused_fallback_keys:
                 body[
-                    "org.matrix.msc3202.device_unused_fallback_keys"
+                    "org.matrix.msc3202.device_unused_fallback_key_types"
                 ] = unused_fallback_keys
             if device_list_summary:
                 body["org.matrix.msc3202.device_lists"] = {