From da26e2afb5cc996c9c3cf224c88d9836af4fbd67 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Fri, 19 May 2023 15:00:55 -0600 Subject: [PATCH] Change HandleInvite api to only take required args --- federationapi/routing/invite.go | 10 +--------- roomserver/api/api.go | 3 ++- roomserver/internal/api.go | 7 ++++--- roomserver/internal/perform/perform_invite.go | 12 ++++++------ 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go index bc093d0a7..235808cb7 100644 --- a/federationapi/routing/invite.go +++ b/federationapi/routing/invite.go @@ -204,15 +204,7 @@ func processInvite( // Add the invite event to the roomserver. inviteEvent := &types.HeaderedEvent{PDU: signedEvent} - request := &api.PerformInviteRequest{ - Event: inviteEvent, - InviteRoomState: strippedState, - RoomVersion: inviteEvent.Version(), - SendAsServer: string(api.DoNotSendToOtherServers), - TransactionID: nil, - } - - if err = rsAPI.HandleInvite(ctx, request); err != nil { + if err = rsAPI.HandleInvite(ctx, inviteEvent, strippedState); err != nil { util.GetLogger(ctx).WithError(err).Error("PerformInvite failed") return util.JSONResponse{ Code: http.StatusInternalServerError, diff --git a/roomserver/api/api.go b/roomserver/api/api.go index a92361b4d..69cecd7e4 100644 --- a/roomserver/api/api.go +++ b/roomserver/api/api.go @@ -4,6 +4,7 @@ import ( "context" "github.com/matrix-org/gomatrixserverlib" + "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" asAPI "github.com/matrix-org/dendrite/appservice/api" @@ -223,7 +224,7 @@ type FederationRoomserverAPI interface { QueryRoomsForUser(ctx context.Context, req *QueryRoomsForUserRequest, res *QueryRoomsForUserResponse) error QueryRestrictedJoinAllowed(ctx context.Context, req *QueryRestrictedJoinAllowedRequest, res *QueryRestrictedJoinAllowedResponse) error PerformInboundPeek(ctx context.Context, req *PerformInboundPeekRequest, res *PerformInboundPeekResponse) error - HandleInvite(ctx context.Context, req *PerformInviteRequest) error + HandleInvite(ctx context.Context, event *types.HeaderedEvent, inviteRoomState []fclient.InviteV2StrippedState) error PerformInvite(ctx context.Context, req *PerformInviteRequest) error // Query a given amount (or less) of events prior to a given set of events. PerformBackfill(ctx context.Context, req *PerformBackfillRequest, res *PerformBackfillResponse) error diff --git a/roomserver/internal/api.go b/roomserver/internal/api.go index aff29b003..7a95dfb9d 100644 --- a/roomserver/internal/api.go +++ b/roomserver/internal/api.go @@ -210,16 +210,17 @@ func (r *RoomserverInternalAPI) SetAppserviceAPI(asAPI asAPI.AppServiceInternalA func (r *RoomserverInternalAPI) HandleInvite( ctx context.Context, - req *api.PerformInviteRequest, + event *types.HeaderedEvent, + inviteRoomState []fclient.InviteV2StrippedState, ) error { - outputEvents, err := r.Inviter.HandleInvite(ctx, req) + outputEvents, err := r.Inviter.HandleInvite(ctx, event, inviteRoomState) if err != nil { return err } if len(outputEvents) == 0 { return nil } - return r.OutputProducer.ProduceRoomEvents(req.Event.RoomID(), outputEvents) + return r.OutputProducer.ProduceRoomEvents(event.RoomID(), outputEvents) } func (r *RoomserverInternalAPI) PerformInvite( diff --git a/roomserver/internal/perform/perform_invite.go b/roomserver/internal/perform/perform_invite.go index 9db508c33..1dbebeb4e 100644 --- a/roomserver/internal/perform/perform_invite.go +++ b/roomserver/internal/perform/perform_invite.go @@ -61,10 +61,10 @@ func (r *Inviter) generateInviteStrippedState( func (r *Inviter) HandleInvite( ctx context.Context, - req *api.PerformInviteRequest, + event *types.HeaderedEvent, + inviteRoomState []fclient.InviteV2StrippedState, ) ([]api.OutputEvent, error) { var outputUpdates []api.OutputEvent - event := req.Event if event.StateKey() == nil { return nil, fmt.Errorf("invite must be a state event") } @@ -85,7 +85,7 @@ func (r *Inviter) HandleInvite( if err != nil { return nil, err } - info, inviteState, err := r.generateInviteStrippedState(ctx, *validRoomID, req.Event, req.InviteRoomState) + info, inviteState, err := r.generateInviteStrippedState(ctx, *validRoomID, event, inviteRoomState) if err != nil { return nil, err } @@ -97,7 +97,7 @@ func (r *Inviter) HandleInvite( "event_id": event.EventID(), }) logger.WithFields(log.Fields{ - "room_version": req.RoomVersion, + "room_version": event.Version(), "room_info_exists": info != nil, "target_local": isTargetLocal, }).Debug("processing incoming federation invite event") @@ -114,13 +114,13 @@ func (r *Inviter) HandleInvite( updateMembershipTableManually := func() ([]api.OutputEvent, error) { var updater *shared.MembershipUpdater - if updater, err = r.DB.MembershipUpdater(ctx, roomID, targetUserID, isTargetLocal, req.RoomVersion); err != nil { + if updater, err = r.DB.MembershipUpdater(ctx, roomID, targetUserID, isTargetLocal, event.Version()); err != nil { return nil, fmt.Errorf("r.DB.MembershipUpdater: %w", err) } outputUpdates, err = helpers.UpdateToInviteMembership(updater, &types.Event{ EventNID: 0, PDU: event.PDU, - }, outputUpdates, req.Event.Version()) + }, outputUpdates, event.Version()) if err != nil { return nil, fmt.Errorf("updateToInviteMembership: %w", err) }