summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-02-14 13:12:22 +0000
committerGitHub <noreply@github.com>2022-02-14 13:12:22 +0000
commit4ae956c8bb3d0f9a352934238b4d2a9c48307efb (patch)
treed568632d9adfd7b240aa745ebda824f070bd76ea /synapse/federation
parentNotify users, rather than rooms, of device list updates (#11905) (diff)
downloadsynapse-4ae956c8bb3d0f9a352934238b4d2a9c48307efb.tar.xz
Use version string helper from matrix-common (#11979)
* Require latest matrix-common
* Use the common function
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/transport/server/federation.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/synapse/federation/transport/server/federation.py b/synapse/federation/transport/server/federation.py
index 310733097d..e85a8eda5b 100644
--- a/synapse/federation/transport/server/federation.py
+++ b/synapse/federation/transport/server/federation.py
@@ -24,9 +24,9 @@ from typing import (
     Union,
 )
 
+from matrix_common.versionstring import get_distribution_version_string
 from typing_extensions import Literal
 
-import synapse
 from synapse.api.errors import Codes, SynapseError
 from synapse.api.room_versions import RoomVersions
 from synapse.api.urls import FEDERATION_UNSTABLE_PREFIX, FEDERATION_V2_PREFIX
@@ -42,7 +42,6 @@ from synapse.http.servlet import (
 )
 from synapse.types import JsonDict
 from synapse.util.ratelimitutils import FederationRateLimiter
-from synapse.util.versionstring import get_version_string
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
@@ -616,7 +615,12 @@ class FederationVersionServlet(BaseFederationServlet):
     ) -> Tuple[int, JsonDict]:
         return (
             200,
-            {"server": {"name": "Synapse", "version": get_version_string(synapse)}},
+            {
+                "server": {
+                    "name": "Synapse",
+                    "version": get_distribution_version_string("matrix-synapse"),
+                }
+            },
         )