mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 13:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't return null to public directory request

Browse source
This commit is contained in:
Neil Alexander 2020-07-03 14:16:19 +01:00
parent 6c4b8185d7
commit e8a2485e46
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clientapi/routing/directory_public.go
View file

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