mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-02-24 05:23:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

🔥 Get rid of jsonerror.

Browse source
This commit is contained in:
Daniel Aloni 2023-07-10 17:56:18 +03:00
parent 2cca2b0141
commit 20bbac5478
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
syncapi/routing/location_sync.go
View file

@ -18,11 +18,11 @@ import (
"database/sql" "database/sql"
"net/http" "net/http"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/dendrite/syncapi/storage" "github.com/matrix-org/dendrite/syncapi/storage"
"github.com/matrix-org/dendrite/syncapi/types" "github.com/matrix-org/dendrite/syncapi/types"
userapi "github.com/matrix-org/dendrite/userapi/api" userapi "github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/gomatrixserverlib/spec"
"github.com/matrix-org/util" "github.com/matrix-org/util"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -42,13 +42,19 @@ func GetLocationSync(
snapshot, err := syncDB.NewDatabaseSnapshot(req.Context()) snapshot, err := syncDB.NewDatabaseSnapshot(req.Context())
if err != nil { if err != nil {
logrus.WithError(err).Error("Failed to get snapshot for locations sync") logrus.WithError(err).Error("Failed to get snapshot for locations sync")
return jsonerror.InternalServerError() return util.JSONResponse{
Code: http.StatusInternalServerError,
JSON: spec.InternalServerError{},
}
} }
mr, err := snapshot.SelectAllMultiRoomDataInRoom(req.Context(), roomID) mr, err := snapshot.SelectAllMultiRoomDataInRoom(req.Context(), roomID)
if err != nil { if err != nil {
if err != sql.ErrNoRows { if err != sql.ErrNoRows {
util.GetLogger(req.Context()).WithError(err).Error("failed to select all most recent multiroom data for room") util.GetLogger(req.Context()).WithError(err).Error("failed to select all most recent multiroom data for room")
return jsonerror.InternalServerError() return util.JSONResponse{
Code: http.StatusInternalServerError,
JSON: spec.InternalServerError{},
}
} }
} }
return util.JSONResponse{ return util.JSONResponse{