mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 02:23:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change HandleInvite api to only take required args

Browse source
This commit is contained in:
Devon Hudson 2023-05-19 15:00:55 -06:00
parent b639082703
commit da26e2afb5
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
4 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
federationapi/routing/invite.go
View file

@ -204,15 +204,7 @@ func processInvite(
// Add the invite event to the roomserver. // Add the invite event to the roomserver.
inviteEvent := &types.HeaderedEvent{PDU: signedEvent} inviteEvent := &types.HeaderedEvent{PDU: signedEvent}
request := &api.PerformInviteRequest{ if err = rsAPI.HandleInvite(ctx, inviteEvent, strippedState); err != nil {
Event: inviteEvent,
InviteRoomState: strippedState,
RoomVersion: inviteEvent.Version(),
SendAsServer: string(api.DoNotSendToOtherServers),
TransactionID: nil,
}
if err = rsAPI.HandleInvite(ctx, request); err != nil {
util.GetLogger(ctx).WithError(err).Error("PerformInvite failed") util.GetLogger(ctx).WithError(err).Error("PerformInvite failed")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusInternalServerError, Code: http.StatusInternalServerError,

3
roomserver/api/api.go
View file

@ -4,6 +4,7 @@ import (
"context" "context"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/gomatrixserverlib/fclient"
"github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/gomatrixserverlib/spec"
asAPI "github.com/matrix-org/dendrite/appservice/api" asAPI "github.com/matrix-org/dendrite/appservice/api"
@ -223,7 +224,7 @@ type FederationRoomserverAPI interface {
QueryRoomsForUser(ctx context.Context, req *QueryRoomsForUserRequest, res *QueryRoomsForUserResponse) error QueryRoomsForUser(ctx context.Context, req *QueryRoomsForUserRequest, res *QueryRoomsForUserResponse) error
QueryRestrictedJoinAllowed(ctx context.Context, req *QueryRestrictedJoinAllowedRequest, res *QueryRestrictedJoinAllowedResponse) error QueryRestrictedJoinAllowed(ctx context.Context, req *QueryRestrictedJoinAllowedRequest, res *QueryRestrictedJoinAllowedResponse) error
PerformInboundPeek(ctx context.Context, req *PerformInboundPeekRequest, res *PerformInboundPeekResponse) 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 PerformInvite(ctx context.Context, req *PerformInviteRequest) error
// Query a given amount (or less) of events prior to a given set of events. // Query a given amount (or less) of events prior to a given set of events.
PerformBackfill(ctx context.Context, req *PerformBackfillRequest, res *PerformBackfillResponse) error PerformBackfill(ctx context.Context, req *PerformBackfillRequest, res *PerformBackfillResponse) error

7
roomserver/internal/api.go
View file

@ -210,16 +210,17 @@ func (r *RoomserverInternalAPI) SetAppserviceAPI(asAPI asAPI.AppServiceInternalA
func (r *RoomserverInternalAPI) HandleInvite( func (r *RoomserverInternalAPI) HandleInvite(
ctx context.Context, ctx context.Context,
req *api.PerformInviteRequest, event *types.HeaderedEvent,
inviteRoomState []fclient.InviteV2StrippedState,
) error { ) error {
outputEvents, err := r.Inviter.HandleInvite(ctx, req) outputEvents, err := r.Inviter.HandleInvite(ctx, event, inviteRoomState)
if err != nil { if err != nil {
return err return err
} }
if len(outputEvents) == 0 { if len(outputEvents) == 0 {
return nil return nil
} }
return r.OutputProducer.ProduceRoomEvents(req.Event.RoomID(), outputEvents) return r.OutputProducer.ProduceRoomEvents(event.RoomID(), outputEvents)
} }
func (r *RoomserverInternalAPI) PerformInvite( func (r *RoomserverInternalAPI) PerformInvite(

12
roomserver/internal/perform/perform_invite.go
View file

@ -61,10 +61,10 @@ func (r *Inviter) generateInviteStrippedState(
func (r *Inviter) HandleInvite( func (r *Inviter) HandleInvite(
ctx context.Context, ctx context.Context,
req *api.PerformInviteRequest, event *types.HeaderedEvent,
inviteRoomState []fclient.InviteV2StrippedState,
) ([]api.OutputEvent, error) { ) ([]api.OutputEvent, error) {
var outputUpdates []api.OutputEvent var outputUpdates []api.OutputEvent
event := req.Event
if event.StateKey() == nil { if event.StateKey() == nil {
return nil, fmt.Errorf("invite must be a state event") return nil, fmt.Errorf("invite must be a state event")
} }
@ -85,7 +85,7 @@ func (r *Inviter) HandleInvite(
if err != nil { if err != nil {
return nil, err 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 { if err != nil {
return nil, err return nil, err
} }
@ -97,7 +97,7 @@ func (r *Inviter) HandleInvite(
"event_id": event.EventID(), "event_id": event.EventID(),
}) })
logger.WithFields(log.Fields{ logger.WithFields(log.Fields{
"room_version": req.RoomVersion, "room_version": event.Version(),
"room_info_exists": info != nil, "room_info_exists": info != nil,
"target_local": isTargetLocal, "target_local": isTargetLocal,
}).Debug("processing incoming federation invite event") }).Debug("processing incoming federation invite event")
@ -114,13 +114,13 @@ func (r *Inviter) HandleInvite(
updateMembershipTableManually := func() ([]api.OutputEvent, error) { updateMembershipTableManually := func() ([]api.OutputEvent, error) {
var updater *shared.MembershipUpdater 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) return nil, fmt.Errorf("r.DB.MembershipUpdater: %w", err)
} }
outputUpdates, err = helpers.UpdateToInviteMembership(updater, &types.Event{ outputUpdates, err = helpers.UpdateToInviteMembership(updater, &types.Event{
EventNID: 0, EventNID: 0,
PDU: event.PDU, PDU: event.PDU,
}, outputUpdates, req.Event.Version()) }, outputUpdates, event.Version())
if err != nil { if err != nil {
return nil, fmt.Errorf("updateToInviteMembership: %w", err) return nil, fmt.Errorf("updateToInviteMembership: %w", err)
} }