From a169a9121aa6b2ff3e3fba6ec9777227e349300f Mon Sep 17 00:00:00 2001
From: Till <2353100+S7evinK@users.noreply.github.com>
Date: Thu, 27 Oct 2022 14:18:22 +0200
Subject: [PATCH] Fix /members (#2837)

Fixes a bug introduced in #2827, where the SyncAPI might not have all
requested eventIDs, resulting in too few members returned.
---
 syncapi/routing/memberships.go | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/syncapi/routing/memberships.go b/syncapi/routing/memberships.go
index c9acc5d2b..05c7deef0 100644
--- a/syncapi/routing/memberships.go
+++ b/syncapi/routing/memberships.go
@@ -76,6 +76,13 @@ func GetMemberships(
 		}
 	}
 
+	if joinedOnly && !queryRes.IsInRoom {
+		return util.JSONResponse{
+			Code: http.StatusForbidden,
+			JSON: jsonerror.Forbidden("You aren't a member of the room and weren't previously a member of the room."),
+		}
+	}
+
 	db, err := syncDB.NewDatabaseSnapshot(req.Context())
 	if err != nil {
 		return jsonerror.InternalServerError()
@@ -102,19 +109,15 @@ func GetMemberships(
 		return jsonerror.InternalServerError()
 	}
 
-	result, err := db.Events(req.Context(), eventIDs)
-	if err != nil {
-		util.GetLogger(req.Context()).WithError(err).Error("db.Events failed")
+	qryRes := &api.QueryEventsByIDResponse{}
+	if err := rsAPI.QueryEventsByID(req.Context(), &api.QueryEventsByIDRequest{EventIDs: eventIDs}, qryRes); err != nil {
+		util.GetLogger(req.Context()).WithError(err).Error("rsAPI.QueryEventsByID failed")
 		return jsonerror.InternalServerError()
 	}
 
+	result := qryRes.Events
+
 	if joinedOnly {
-		if !queryRes.IsInRoom {
-			return util.JSONResponse{
-				Code: http.StatusForbidden,
-				JSON: jsonerror.Forbidden("You aren't a member of the room and weren't previously a member of the room."),
-			}
-		}
 		var res getJoinedMembersResponse
 		res.Joined = make(map[string]joinedMember)
 		for _, ev := range result {