From f7754cfc9983da3cee3ccfa202a691bd2e2e0f26 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Tue, 5 Dec 2023 10:12:19 +0000
Subject: [PATCH 1/2] Set retry_last_ts and retry_interval

---
 synapse/rest/admin/federation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/rest/admin/federation.py b/synapse/rest/admin/federation.py
index a6ce787da1af..2f238f021776 100644
--- a/synapse/rest/admin/federation.py
+++ b/synapse/rest/admin/federation.py
@@ -89,8 +89,8 @@ async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
             "destinations": [
                 {
                     "destination": r[0],
-                    "retry_last_ts": r[1],
-                    "retry_interval": r[2],
+                    "retry_last_ts": r[1] or 0,
+                    "retry_interval": r[2] or 0,
                     "failure_ts": r[3],
                     "last_successful_stream_ordering": r[4],
                 }

From 0ac2deaef731db37ce0cf4886e16cea75edd916f Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Tue, 5 Dec 2023 10:16:21 +0000
Subject: [PATCH 2/2] changelog

---
 changelog.d/16729.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/16729.bugfix

diff --git a/changelog.d/16729.bugfix b/changelog.d/16729.bugfix
new file mode 100644
index 000000000000..50e72ac1f817
--- /dev/null
+++ b/changelog.d/16729.bugfix
@@ -0,0 +1 @@
+Fix GET /_synapse/admin/v1/federation/destinations returning null (instead of 0) for `retry_last_ts` and `retry_interval`.