From 88b0f6a053afcdcf3df9b5fb3f842bdfec4395e7 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Wed, 28 Jun 2023 12:11:42 +0200
Subject: [PATCH] We don't need to sign these events (correctly)?

---
 federationapi/routing/join.go  | 10 ++--------
 federationapi/routing/leave.go | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go
index b886382f7..7aa50f65a 100644
--- a/federationapi/routing/join.go
+++ b/federationapi/routing/join.go
@@ -64,13 +64,7 @@ func MakeJoin(
 	}
 
 	createJoinTemplate := func(proto *gomatrixserverlib.ProtoEvent) (gomatrixserverlib.PDU, []gomatrixserverlib.PDU, error) {
-		// TODO: remove this once the join dance understands pseudo IDs
-		var dummyUserID *spec.UserID
-		dummyUserID, err = spec.NewUserID(fmt.Sprintf("@dummy:%s", request.Destination()), true)
-		if err != nil {
-			return nil, nil, err
-		}
-		identity, signErr := rsAPI.SigningIdentityFor(httpReq.Context(), roomID, *dummyUserID)
+		identity, signErr := cfg.Matrix.SigningIdentityFor(request.Destination())
 		if signErr != nil {
 			util.GetLogger(httpReq.Context()).WithError(signErr).Errorf("obtaining signing identity for %s failed", request.Destination())
 			return nil, nil, spec.NotFound(fmt.Sprintf("Server name %q does not exist", request.Destination()))
@@ -79,7 +73,7 @@ func MakeJoin(
 		queryRes := api.QueryLatestEventsAndStateResponse{
 			RoomVersion: roomVersion,
 		}
-		event, signErr := eventutil.QueryAndBuildEvent(httpReq.Context(), proto, &identity, time.Now(), rsAPI, &queryRes)
+		event, signErr := eventutil.QueryAndBuildEvent(httpReq.Context(), proto, identity, time.Now(), rsAPI, &queryRes)
 		switch e := signErr.(type) {
 		case nil:
 		case eventutil.ErrRoomNoExists:
diff --git a/federationapi/routing/leave.go b/federationapi/routing/leave.go
index 3806341b3..5c8dd00f3 100644
--- a/federationapi/routing/leave.go
+++ b/federationapi/routing/leave.go
@@ -59,20 +59,14 @@ func MakeLeave(
 	}
 
 	createLeaveTemplate := func(proto *gomatrixserverlib.ProtoEvent) (gomatrixserverlib.PDU, []gomatrixserverlib.PDU, error) {
-		// TODO: remove this once the leave dance understands pseudo IDs
-		var dummyUserID *spec.UserID
-		dummyUserID, err = spec.NewUserID(fmt.Sprintf("@dummy:%s", request.Destination()), true)
-		if err != nil {
-			return nil, nil, err
-		}
-		identity, signErr := rsAPI.SigningIdentityFor(httpReq.Context(), roomID, *dummyUserID)
+		identity, signErr := cfg.Matrix.SigningIdentityFor(request.Destination())
 		if signErr != nil {
 			util.GetLogger(httpReq.Context()).WithError(signErr).Errorf("obtaining signing identity for %s failed", request.Destination())
 			return nil, nil, spec.NotFound(fmt.Sprintf("Server name %q does not exist", request.Destination()))
 		}
 
 		queryRes := api.QueryLatestEventsAndStateResponse{}
-		event, buildErr := eventutil.QueryAndBuildEvent(httpReq.Context(), proto, &identity, time.Now(), rsAPI, &queryRes)
+		event, buildErr := eventutil.QueryAndBuildEvent(httpReq.Context(), proto, identity, time.Now(), rsAPI, &queryRes)
 		switch e := buildErr.(type) {
 		case nil:
 		case eventutil.ErrRoomNoExists: