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

Fix #2842 - room state incorrectly filtered away for newly joined member (#52)

Browse source 
* fix room state regression when a new member joins the room

* disables sytests to workaround bug in dendrite

Co-authored-by: Tak Wai Wong <tak@hntlabs.com>
This commit is contained in:
Tak Wai Wong 2022-10-31 16:56:15 -07:00 committed by GitHub
parent f369ee11ca
commit 1574b5e347
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
syncapi/streams/stream_pdu.go
View file

@ -315,10 +315,17 @@ func (p *PDUStreamProvider) addRoomDeltaToResponse(
// Now that we've filtered the timeline, work out which state events are still // Now that we've filtered the timeline, work out which state events are still
// left. Anything that appears in the filtered timeline will be removed from the // left. Anything that appears in the filtered timeline will be removed from the
// "state" section and kept in "timeline". // "state" section and kept in "timeline".
// Don't remove the state events if this is a newly joined room. The member
// needs the full room state. For example, to figure out if the room is a space
// or not, it needs the m.room.create event which may be chronologically outside
// the filter limit.
if !delta.NewlyJoined {
delta.StateEvents = gomatrixserverlib.HeaderedReverseTopologicalOrdering( delta.StateEvents = gomatrixserverlib.HeaderedReverseTopologicalOrdering(
removeDuplicates(delta.StateEvents, recentEvents), removeDuplicates(delta.StateEvents, recentEvents),
gomatrixserverlib.TopologicalOrderByAuthEvents, gomatrixserverlib.TopologicalOrderByAuthEvents,
) )
}
if len(delta.StateEvents) > 0 { if len(delta.StateEvents) > 0 {
updateLatestPosition(delta.StateEvents[len(delta.StateEvents)-1].EventID()) updateLatestPosition(delta.StateEvents[len(delta.StateEvents)-1].EventID())

5
sytest-blacklist
View file

@ -46,3 +46,8 @@ If a device list update goes missing, the server resyncs on the next one
# Might be a bug in the test because leaves do appear :-( # Might be a bug in the test because leaves do appear :-(
Leaves are present in non-gapped incremental syncs Leaves are present in non-gapped incremental syncs
# Fails due to fix / workaround for this issue https://github.com/matrix-org/dendrite/issues/2842
Newly joined room is included in an incremental sync
Newly joined room is included in an incremental sync after invite

2
sytest-whitelist
View file

@ -106,7 +106,6 @@ Can download filter
Lazy loading parameters in the filter are strictly boolean Lazy loading parameters in the filter are strictly boolean
Can sync Can sync
Can sync a joined room Can sync a joined room
Newly joined room is included in an incremental sync
User is offline if they set_presence=offline in their sync User is offline if they set_presence=offline in their sync
Changes to state are included in an incremental sync Changes to state are included in an incremental sync
A change to displayname should appear in incremental /sync A change to displayname should appear in incremental /sync
@ -224,7 +223,6 @@ Can't deactivate account with wrong password
After deactivating account, can't log in with password After deactivating account, can't log in with password
After deactivating account, can't log in with an email After deactivating account, can't log in with an email
Remote room alias queries can handle Unicode Remote room alias queries can handle Unicode
Newly joined room is included in an incremental sync after invite
Inbound /v1/make_join rejects remote attempts to join local users to rooms Inbound /v1/make_join rejects remote attempts to join local users to rooms
Local room members see posted message events Local room members see posted message events
Fetching eventstream a second time doesn't yield the message again Fetching eventstream a second time doesn't yield the message again