From 86395eeff33ee7c1c58c8a8ca73f97be6a1e931c Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 7 Aug 2017 11:57:37 +0100 Subject: [PATCH] Check server name on room ID instead of user ID --- .../matrix-org/dendrite/clientapi/readers/memberships.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/github.com/matrix-org/dendrite/clientapi/readers/memberships.go b/src/github.com/matrix-org/dendrite/clientapi/readers/memberships.go index 7ab453699..77c3d85aa 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/readers/memberships.go +++ b/src/github.com/matrix-org/dendrite/clientapi/readers/memberships.go @@ -33,7 +33,11 @@ func GetMemberships( accountDB *accounts.Database, cfg config.Dendrite, queryAPI api.RoomserverQueryAPI, ) util.JSONResponse { - localpart, server, err := gomatrixserverlib.SplitID('@', device.UserID) + localpart, _, err := gomatrixserverlib.SplitID('@', device.UserID) + if err != nil { + return httputil.LogThenError(req, err) + } + _, server, err := gomatrixserverlib.SplitID('!', roomID) if err != nil { return httputil.LogThenError(req, err) }