From 441ccf04d18e8d2f848fde685430fd5ad7e2fef0 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 3 Mar 2021 12:49:17 +0000
Subject: [PATCH] Undo some changes to client API that shouldn't be needed

---
 clientapi/routing/getevent.go    | 26 +++++---------------------
 clientapi/routing/memberships.go |  5 -----
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/clientapi/routing/getevent.go b/clientapi/routing/getevent.go
index ed66c74f0..1162cde36 100644
--- a/clientapi/routing/getevent.go
+++ b/clientapi/routing/getevent.go
@@ -80,11 +80,10 @@ func GetEvent(
 	stateReq := api.QueryStateAfterEventsRequest{
 		RoomID:       r.requestedEvent.RoomID(),
 		PrevEventIDs: r.requestedEvent.PrevEventIDs(),
-		// XXX: Appservices require you to fetch the lot
-		// StateToFetch: []gomatrixserverlib.StateKeyTuple{{
-		// 	EventType: gomatrixserverlib.MRoomMember,
-		// 	StateKey:  device.UserID,
-		// }},
+		StateToFetch: []gomatrixserverlib.StateKeyTuple{{
+			EventType: gomatrixserverlib.MRoomMember,
+			StateKey:  device.UserID,
+		}},
 	}
 	var stateResp api.QueryStateAfterEventsResponse
 	if err := rsAPI.QueryStateAfterEvents(req.Context(), &stateReq, &stateResp); err != nil {
@@ -104,24 +103,9 @@ func GetEvent(
 			JSON: jsonerror.NotFound("The event was not found or you do not have permission to read this event"),
 		}
 	}
-	var appService *config.ApplicationService
-	if device.AppserviceID != "" {
-		for _, as := range cfg.Derived.ApplicationServices {
-			if as.ID == device.AppserviceID {
-				appService = &as
-				break
-			}
-		}
-	}
 
 	for _, stateEvent := range stateResp.StateEvents {
-		if stateEvent.Type() != gomatrixserverlib.MRoomMember {
-			continue
-		}
-		// Allow appservices to fetch events
-		if appService != nil && !appService.IsInterestedInUserID(*stateEvent.StateKey()) {
-			continue
-		} else if stateEvent.StateKeyEquals(device.UserID) {
+		if stateEvent.StateKeyEquals(device.UserID) {
 			continue
 		}
 		membership, err := stateEvent.Membership()
diff --git a/clientapi/routing/memberships.go b/clientapi/routing/memberships.go
index a4086832f..6ddcf1be3 100644
--- a/clientapi/routing/memberships.go
+++ b/clientapi/routing/memberships.go
@@ -57,11 +57,6 @@ func GetMemberships(
 	_ *config.ClientAPI,
 	rsAPI api.RoomserverInternalAPI,
 ) util.JSONResponse {
-	resErr := checkMemberInRoom(req.Context(), rsAPI, device.UserID, roomID)
-	if resErr != nil {
-		return *resErr
-	}
-
 	queryReq := api.QueryMembershipsForRoomRequest{
 		JoinedOnly: joinedOnly,
 		RoomID:     roomID,