Merge branch 'main' into rav/test_devicelist_at_startup

go.mod

@@ -3,7 +3,7 @@ module github.com/matrix-org/complement
 go 1.19
 
 require (
-	github.com/docker/docker v24.0.7+incompatible
+	github.com/docker/docker v24.0.9+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/gorilla/mux v1.8.0
 	github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530

go.sum

@@ -18,8 +18,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
 github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
-github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0=
+github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=

tests/csapi/sync_test.go

@@ -374,6 +374,66 @@ func TestSync(t *testing.T) {
 
 			// that's it - we successfully did a gappy sync.
 		})
+
+		t.Run("Device list tracking", func(t *testing.T) {
+			// syncDeviceListsHas checks that `device_lists.changed` or `device_lists.left` contains a
+			// given user ID.
+			syncDeviceListsHas := func(section string, expectedUserID string) client.SyncCheckOpt {
+				jsonPath := fmt.Sprintf("device_lists.%s", section)
+				return func(clientUserID string, topLevelSyncJSON gjson.Result) error {
+					usersWithChangedDeviceListsArray := topLevelSyncJSON.Get(jsonPath).Array()
+					for _, userID := range usersWithChangedDeviceListsArray {
+						if userID.Str == expectedUserID {
+							return nil
+						}
+					}
+					return fmt.Errorf(
+						"syncDeviceListsHas: %s not found in %s",
+						expectedUserID,
+						jsonPath,
+					)
+				}
+			}
+
+			t.Run("User is correctly listed when they leave, even when lazy loading is enabled", func(t *testing.T) {
+				// Alice creates a room, and starts syncing with lazy-loading enabled.
+				// Charlie joins, sends an event, and then leaves, the room.
+				// We check that Charlie appears under the "device_lists" section of the sync.
+				//
+				// Regression test for https://github.com/element-hq/synapse/issues/16948
+
+				charlie := deployment.Register(t, "hs1", helpers.RegistrationOpts{LocalpartSuffix: "charlie"})
+				roomID := alice.MustCreateRoom(t, map[string]interface{}{"preset": "public_chat"})
+
+				aliceSyncFilter := `{
+				    "room": {
+					    "timeline": { "lazy_load_members": true },
+					    "state": { "lazy_load_members": true }
+					}
+				}`
+				_, initialSyncToken := alice.MustSync(t, client.SyncReq{Filter: aliceSyncFilter})
+
+				charlie.MustJoinRoom(t, roomID, nil)
+				syncToken := alice.MustSyncUntil(t, client.SyncReq{Filter: aliceSyncFilter, Since: initialSyncToken},
+					syncDeviceListsHas("changed", charlie.UserID),
+				)
+
+				// Charlie sends a message, and leaves
+				sendMessages(t, charlie, roomID, "test", 1)
+				charlie.MustLeaveRoom(t, roomID)
+
+				// Alice sees charlie in the "left" section
+				alice.MustSyncUntil(t, client.SyncReq{Filter: aliceSyncFilter, Since: syncToken},
+					syncDeviceListsHas("left", charlie.UserID),
+				)
+
+				// ... even if she makes the request twice
+				resp, _ := alice.MustSync(t, client.SyncReq{Filter: aliceSyncFilter, Since: syncToken})
+				if err := syncDeviceListsHas("left", charlie.UserID)(alice.UserID, resp); err != nil {
+					t.Error(err)
+				}
+			})
+		})
 	})
 }