This commit is contained in:
Till Faelligen 2022-10-05 13:19:37 +02:00
parent 55aef6abbb
commit 28ddbec0e4
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E

View file

@ -170,8 +170,10 @@ func joinResponseWithRooms(syncResponse *types.Response, userID string, roomIDs
Content: []byte(`{"membership":"join"}`), Content: []byte(`{"membership":"join"}`),
}, },
} }
jr, ok := syncResponse.Rooms.Join[roomID]
jr := syncResponse.Rooms.Join[roomID] if !ok {
jr = types.NewJoinResponse()
}
jr.Timeline = &types.Timeline{} jr.Timeline = &types.Timeline{}
jr.State = &types.ClientEvents{Events: roomEvents} jr.State = &types.ClientEvents{Events: roomEvents}
syncResponse.Rooms.Join[roomID] = jr syncResponse.Rooms.Join[roomID] = jr
@ -192,7 +194,10 @@ func leaveResponseWithRooms(syncResponse *types.Response, userID string, roomIDs
}, },
} }
lr := syncResponse.Rooms.Leave[roomID] lr, ok := syncResponse.Rooms.Leave[roomID]
if !ok {
lr = types.NewLeaveResponse()
}
lr.Timeline = &types.Timeline{Events: roomEvents} lr.Timeline = &types.Timeline{Events: roomEvents}
syncResponse.Rooms.Leave[roomID] = lr syncResponse.Rooms.Leave[roomID] = lr
} }
@ -329,7 +334,11 @@ func TestKeyChangeCatchupNoNewJoinsButMessages(t *testing.T) {
}, },
} }
jr := syncResponse.Rooms.Join[roomID] jr, ok := syncResponse.Rooms.Join[roomID]
if !ok {
jr = types.NewJoinResponse()
}
jr.State = &types.ClientEvents{Events: roomStateEvents} jr.State = &types.ClientEvents{Events: roomStateEvents}
jr.Timeline = &types.Timeline{Events: roomTimelineEvents} jr.Timeline = &types.Timeline{Events: roomTimelineEvents}
syncResponse.Rooms.Join[roomID] = jr syncResponse.Rooms.Join[roomID] = jr
@ -443,7 +452,10 @@ func TestKeyChangeCatchupChangeAndLeftSameRoom(t *testing.T) {
}, },
} }
lr := syncResponse.Rooms.Leave[roomID] lr, ok := syncResponse.Rooms.Leave[roomID]
if !ok {
lr = types.NewLeaveResponse()
}
lr.Timeline = &types.Timeline{Events: roomEvents} lr.Timeline = &types.Timeline{Events: roomEvents}
syncResponse.Rooms.Leave[roomID] = lr syncResponse.Rooms.Leave[roomID] = lr