diff options
| author | devonh <devon.dmytro@gmail.com> | 2023-07-21 16:08:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-21 16:08:40 +0000 |
| commit | c809e9533595a86750e864bcbd9880eb96b9e76f (patch) | |
| tree | 82388ce1e91afd35ed186320af9de3e21712d72e /roomserver/internal/perform/perform_join.go | |
| parent | e216c2fbf0fd117ddb8b96b05d514b9987cbb0d2 (diff) | |
Fix event federation with pseudoID rooms (#3156)
Diffstat (limited to 'roomserver/internal/perform/perform_join.go')
| -rw-r--r-- | roomserver/internal/perform/perform_join.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/roomserver/internal/perform/perform_join.go b/roomserver/internal/perform/perform_join.go index 937993de..dfce9cc7 100644 --- a/roomserver/internal/perform/perform_join.go +++ b/roomserver/internal/perform/perform_join.go @@ -274,7 +274,6 @@ func (r *Joiner) performJoinRoomByID( // If we should do a forced federated join then do that. var joinedVia spec.ServerName if forceFederatedJoin { - // TODO : pseudoIDs - pass through userID here since we don't know what the senderID should be yet joinedVia, err = r.performFederatedJoinRoomByID(ctx, req) return req.RoomIDOrAlias, joinedVia, err } @@ -286,10 +285,7 @@ func (r *Joiner) performJoinRoomByID( // but everyone has since left. I suspect it does the wrong thing. var buildRes rsAPI.QueryLatestEventsAndStateResponse - identity, err := r.RSAPI.SigningIdentityFor(ctx, *roomID, *userID) - if err != nil { - return "", "", fmt.Errorf("error joining local room: %q", err) - } + identity := r.Cfg.Matrix.SigningIdentity // at this point we know we have an existing room if inRoomRes.RoomVersion == gomatrixserverlib.RoomVersionPseudoIDs { |