diff options
| author | devonh <devon.dmytro@gmail.com> | 2023-06-14 14:23:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-14 14:23:46 +0000 |
| commit | e4665979bfbe006368d55189f074e456fe19b198 (patch) | |
| tree | e909d694a022478d0dbe3cc58ee8a2dc289bc969 /syncapi/routing/memberships.go | |
| parent | 7a2e325d1014d76188b47a011730a42443f3c174 (diff) | |
Merge SenderID & Per Room User Key work (#3109)
Diffstat (limited to 'syncapi/routing/memberships.go')
| -rw-r--r-- | syncapi/routing/memberships.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/syncapi/routing/memberships.go b/syncapi/routing/memberships.go index cf6769ba..5e5d0125 100644 --- a/syncapi/routing/memberships.go +++ b/syncapi/routing/memberships.go @@ -152,7 +152,15 @@ func GetMemberships( } } - userID, err := rsAPI.QueryUserIDForSender(req.Context(), ev.RoomID(), ev.SenderID()) + validRoomID, err := spec.NewRoomID(ev.RoomID()) + if err != nil { + util.GetLogger(req.Context()).WithError(err).Error("roomID is invalid") + return util.JSONResponse{ + Code: http.StatusInternalServerError, + JSON: spec.InternalServerError{}, + } + } + userID, err := rsAPI.QueryUserIDForSender(req.Context(), *validRoomID, ev.SenderID()) if err != nil || userID == nil { util.GetLogger(req.Context()).WithError(err).Error("rsAPI.QueryUserIDForSender failed") return util.JSONResponse{ @@ -175,7 +183,7 @@ func GetMemberships( } return util.JSONResponse{ Code: http.StatusOK, - JSON: getMembershipResponse{synctypes.ToClientEvents(gomatrixserverlib.ToPDUs(result), synctypes.FormatAll, func(roomID string, senderID spec.SenderID) (*spec.UserID, error) { + JSON: getMembershipResponse{synctypes.ToClientEvents(gomatrixserverlib.ToPDUs(result), synctypes.FormatAll, func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) { return rsAPI.QueryUserIDForSender(req.Context(), roomID, senderID) })}, } |