Check that a appservice protocol has at least one service

matrix-org · Aug 4, 2021 · 1cc4a3d · 1cc4a3d
1 parent 42225aa
commit 1cc4a3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog.d/10532.bugfix b/changelog.d/10532.bugfix
@@ -0,0 +1 @@
+Only report protocols that are implemented by at least one service, as required by the spec when handling `GET /_matrix/client/r0/thirdparty/protocols`.
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
@@ -406,7 +406,11 @@ def _merge_instances(infos: List[JsonDict]) -> JsonDict:
 
             return combined
 
-        return {p: _merge_instances(protocols[p]) for p in protocols.keys()}
+        return {
+            p: _merge_instances(protocols[p])
+            for p in protocols.keys()
+            if len(protocols[p]) > 0
+        }
 
     async def _get_services_for_event(
         self, event: EventBase