From aeecedefe7190bb4020f824c940e250bfa6b37fb Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 21 Jul 2021 14:45:43 +0100
Subject: [PATCH] Don't return null on /aliases

---
 clientapi/routing/aliases.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/clientapi/routing/aliases.go b/clientapi/routing/aliases.go
index c46acb825..8a2e8199a 100644
--- a/clientapi/routing/aliases.go
+++ b/clientapi/routing/aliases.go
@@ -78,12 +78,17 @@ func GetAliases(
 		return util.ErrorResponse(fmt.Errorf("rsAPI.GetAliasesForRoomID: %w", err))
 	}
 
+	response := struct {
+		Aliases []string `json:"aliases"`
+	}{
+		Aliases: aliasesRes.Aliases,
+	}
+	if response.Aliases == nil {
+		response.Aliases = []string{} // pleases sytest
+	}
+
 	return util.JSONResponse{
 		Code: 200,
-		JSON: struct {
-			Aliases []string `json:"aliases"`
-		}{
-			Aliases: aliasesRes.Aliases,
-		},
+		JSON: response,
 	}
 }