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

Only include full state for rooms that have just been joined for the first time

Browse source
This commit is contained in:
Neil Alexander 2022-04-05 10:33:39 +01:00
parent 2defc4249d
commit a83af68dd0
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
syncapi/storage/shared/syncserver.go
View file

@ -690,10 +690,12 @@ func (d *Database) GetStateDeltas(
allRoomIDs := make([]string, 0, len(memberships)) allRoomIDs := make([]string, 0, len(memberships))
joinedRoomIDs := make([]string, 0, len(memberships)) joinedRoomIDs := make([]string, 0, len(memberships))
joinedRoomMap := make(map[string]struct{}, len(memberships))
for roomID, membership := range memberships { for roomID, membership := range memberships {
allRoomIDs = append(allRoomIDs, roomID) allRoomIDs = append(allRoomIDs, roomID)
if membership == gomatrixserverlib.Join { if membership == gomatrixserverlib.Join {
joinedRoomIDs = append(joinedRoomIDs, roomID) joinedRoomIDs = append(joinedRoomIDs, roomID)
joinedRoomMap[roomID] = struct{}{}
} }
} }
@ -739,13 +741,8 @@ func (d *Database) GetStateDeltas(
// handle newly joined rooms and non-joined rooms // handle newly joined rooms and non-joined rooms
for roomID, stateStreamEvents := range state { for roomID, stateStreamEvents := range state {
for _, ev := range stateStreamEvents { for _, ev := range stateStreamEvents {
// TODO: Currently this will incorrectly add rooms which were ALREADY joined but they sent another no-op join event.
// We should be checking if the user was already joined at fromPos and not proceed if so. As a result of this,
// dupe join events will result in the entire room state coming down to the client again. This is added in
// the 'state' part of the response though, so is transparent modulo bandwidth concerns as it is not added to
// the timeline.
if membership := getMembershipFromEvent(ev.Event, userID); membership != "" { if membership := getMembershipFromEvent(ev.Event, userID); membership != "" {
if membership == gomatrixserverlib.Join { if _, ok := joinedRoomMap[roomID]; !ok && membership == gomatrixserverlib.Join {
// send full room state down instead of a delta // send full room state down instead of a delta
var s []types.StreamEvent var s []types.StreamEvent
s, err = d.currentStateStreamEventsForRoom(ctx, txn, roomID, stateFilter) s, err = d.currentStateStreamEventsForRoom(ctx, txn, roomID, stateFilter)