More lint lifex

This commit is contained in:
Alex Kursell 2022-03-26 15:08:01 -04:00 committed by DavidSpenler
parent e6e8aa1bc4
commit cf3b613200

View file

@ -64,7 +64,7 @@ func UpgradeRoom(
} }
// Validate that the room version is supported // Validate that the room version is supported
if _, err := version.SupportedRoomVersion(gomatrixserverlib.RoomVersion(r.NewVersion)); err != nil { if _, err = version.SupportedRoomVersion(gomatrixserverlib.RoomVersion(r.NewVersion)); err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: jsonerror.UnsupportedRoomVersion("This server does not support that room version"), JSON: jsonerror.UnsupportedRoomVersion("This server does not support that room version"),
@ -74,7 +74,7 @@ func UpgradeRoom(
// Return an immediate error if the room does not exist // Return an immediate error if the room does not exist
verReq := roomserverAPI.QueryRoomVersionForRoomRequest{RoomID: roomID} verReq := roomserverAPI.QueryRoomVersionForRoomRequest{RoomID: roomID}
verRes := roomserverAPI.QueryRoomVersionForRoomResponse{} verRes := roomserverAPI.QueryRoomVersionForRoomResponse{}
if err := rsAPI.QueryRoomVersionForRoom(req.Context(), &verReq, &verRes); err != nil { if err = rsAPI.QueryRoomVersionForRoom(req.Context(), &verReq, &verRes); err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusNotFound, Code: http.StatusNotFound,
JSON: jsonerror.NotFound("Room does not exist"), JSON: jsonerror.NotFound("Room does not exist"),