aboutsummaryrefslogtreecommitdiff
path: root/federationapi/routing/publicrooms.go
diff options
context:
space:
mode:
Diffstat (limited to 'federationapi/routing/publicrooms.go')
-rw-r--r--federationapi/routing/publicrooms.go11
1 files changed, 8 insertions, 3 deletions
diff --git a/federationapi/routing/publicrooms.go b/federationapi/routing/publicrooms.go
index 59ff4eb2..213d1631 100644
--- a/federationapi/routing/publicrooms.go
+++ b/federationapi/routing/publicrooms.go
@@ -39,7 +39,10 @@ func GetPostPublicRooms(req *http.Request, rsAPI roomserverAPI.FederationRoomser
}
response, err := publicRooms(req.Context(), request, rsAPI)
if err != nil {
- return spec.InternalServerError()
+ return util.JSONResponse{
+ Code: http.StatusInternalServerError,
+ JSON: spec.InternalServerError{},
+ }
}
return util.JSONResponse{
Code: http.StatusOK,
@@ -106,8 +109,10 @@ func fillPublicRoomsReq(httpReq *http.Request, request *PublicRoomReq) *util.JSO
// In that case, we want to assign 0 so we ignore the error
if err != nil && len(httpReq.FormValue("limit")) > 0 {
util.GetLogger(httpReq.Context()).WithError(err).Error("strconv.Atoi failed")
- reqErr := spec.InternalServerError()
- return &reqErr
+ return &util.JSONResponse{
+ Code: http.StatusInternalServerError,
+ JSON: spec.InternalServerError{},
+ }
}
request.Limit = int16(limit)
request.Since = httpReq.FormValue("since")