From eb7e81ca4f3893ea9d482a352997a4ece9edddaa Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Mon, 2 May 2022 08:20:36 +0200 Subject: [PATCH] Return "null" if MaxFileSizeBytes is 0 --- mediaapi/routing/routing.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mediaapi/routing/routing.go b/mediaapi/routing/routing.go index 0e1583991..afe62766e 100644 --- a/mediaapi/routing/routing.go +++ b/mediaapi/routing/routing.go @@ -35,7 +35,7 @@ import ( // configResponse is the response to GET /_matrix/media/r0/config // https://matrix.org/docs/spec/client_server/latest#get-matrix-media-r0-config type configResponse struct { - UploadSize config.FileSizeBytes `json:"m.upload.size"` + UploadSize *config.FileSizeBytes `json:"m.upload.size"` } // Setup registers the media API HTTP handlers @@ -73,9 +73,13 @@ func Setup( if r := rateLimits.Limit(req); r != nil { return *r } + respondSize := cfg.MaxFileSizeBytes + if *cfg.MaxFileSizeBytes == 0 { + respondSize = nil + } return util.JSONResponse{ Code: http.StatusOK, - JSON: configResponse{UploadSize: *cfg.MaxFileSizeBytes}, + JSON: configResponse{UploadSize: respondSize}, } })