From e8a2485e46bcb99df20572df90bf721381a00c4c Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 3 Jul 2020 14:16:19 +0100
Subject: [PATCH] Don't return null to public directory request

---
 clientapi/routing/directory_public.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/clientapi/routing/directory_public.go b/clientapi/routing/directory_public.go
index 925c1b8aa..fcf3f656d 100644
--- a/clientapi/routing/directory_public.go
+++ b/clientapi/routing/directory_public.go
@@ -71,7 +71,9 @@ func publicRooms(ctx context.Context, request PublicRoomReq, rsAPI roomserverAPI
 	stateAPI currentstateAPI.CurrentStateInternalAPI, extRoomsProvider api.ExtraPublicRoomsProvider,
 ) (*gomatrixserverlib.RespPublicRooms, error) {
 
-	var response gomatrixserverlib.RespPublicRooms
+	response := gomatrixserverlib.RespPublicRooms{
+		Chunk: []gomatrixserverlib.PublicRoom{},
+	}
 	var limit int16
 	var offset int64
 	limit = request.Limit
@@ -103,7 +105,9 @@ func publicRooms(ctx context.Context, request PublicRoomReq, rsAPI roomserverAPI
 	if next >= 0 {
 		response.NextBatch = "T" + strconv.Itoa(next)
 	}
-	response.Chunk = chunk
+	if chunk != nil {
+		response.Chunk = chunk
+	}
 	return &response, err
 }