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

stop using maybe

Browse source
This commit is contained in:
Sam Wedgwood 2023-07-27 14:28:57 +01:00
parent 8f2153d3e6
commit 93543abe4b
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clientapi/routing/directory.go
View file

@ -181,25 +181,23 @@ func SetLocalAlias(
return *resErr return *resErr
} }
maybeRoomID, err := spec.NewRoomID(r.RoomID) roomID, err := spec.NewRoomID(r.RoomID)
if err != nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: spec.InvalidParam("invalid room ID"), JSON: spec.InvalidParam("invalid room ID"),
} }
} }
roomID := *maybeRoomID // should be safe due to error check
maybeUserID, err := spec.NewUserID(device.UserID, true) userID, err := spec.NewUserID(device.UserID, true)
if err != nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusInternalServerError, Code: http.StatusInternalServerError,
JSON: spec.Unknown("internal server error"), JSON: spec.Unknown("internal server error"),
} }
} }
userID := *maybeUserID
senderID, err := rsAPI.QuerySenderIDForUser(req.Context(), roomID, userID) senderID, err := rsAPI.QuerySenderIDForUser(req.Context(), *roomID, *userID)
if err != nil { if err != nil {
util.GetLogger(req.Context()).WithError(err).Error("QuerySenderIDForUser failed") util.GetLogger(req.Context()).WithError(err).Error("QuerySenderIDForUser failed")
return util.JSONResponse{ return util.JSONResponse{