mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-15 13:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move MakeJoin logic to GMSL (#3081)

Browse source
This commit is contained in:
devonh 2023-05-17 00:33:27 +00:00 • committed by GitHub
parent 0489d16f95
commit 67d6876857
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 1158 additions and 494 deletions
Download patch file Download diff file Expand all files Collapse all files

15
roomserver/internal/perform/perform_upgrade.go
View file

@ -274,7 +274,7 @@ func publishNewRoomAndUnpublishOldRoom(
func (r *Upgrader) validateRoomExists(ctx context.Context, roomID string) error {
if _, err := r.URSAPI.QueryRoomVersionForRoom(ctx, roomID); err != nil {
return eventutil.ErrRoomNoExists
return eventutil.ErrRoomNoExists{}
}
return nil
}
@ -556,15 +556,18 @@ func (r *Upgrader) makeHeaderedEvent(ctx context.Context, evTime time.Time, user
}
var queryRes api.QueryLatestEventsAndStateResponse
headeredEvent, err := eventutil.QueryAndBuildEvent(ctx, &proto, r.Cfg.Matrix, identity, evTime, r.URSAPI, &queryRes)
if err == eventutil.ErrRoomNoExists {
return nil, err
} else if e, ok := err.(gomatrixserverlib.BadJSONError); ok {
switch e := err.(type) {
case nil:
case eventutil.ErrRoomNoExists:
return nil, e
} else if e, ok := err.(gomatrixserverlib.EventValidationError); ok {
case gomatrixserverlib.BadJSONError:
return nil, e
} else if err != nil {
case gomatrixserverlib.EventValidationError:
return nil, e
default:
return nil, fmt.Errorf("failed to build new %q event: %w", proto.Type, err)
}
// check to see if this user can perform this operation
stateEvents := make([]gomatrixserverlib.PDU, len(queryRes.StateEvents))
for i := range queryRes.StateEvents {