Add regression tests for room name errors

Run each test twice, once when it is live from sync v2
and one when it is loaded from the database at startup.

room_names_test.go

@@ -0,0 +1,87 @@
+package syncv3
+
+import (
+	"encoding/json"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/matrix-org/sync-v3/sync2"
+	"github.com/matrix-org/sync-v3/sync3"
+	"github.com/matrix-org/sync-v3/testutils"
+)
+
+// Test that room names come through sanely. Additional testing to ensure we copy hero slices correctly.
+func TestRoomNames(t *testing.T) {
+	pqString := testutils.PrepareDBConnectionString("syncv3_test_sync3_integration_room_names")
+	// setup code
+	v2 := runTestV2Server(t)
+	v3 := runTestServer(t, v2, pqString)
+	defer v2.close()
+	defer v3.close()
+	alice := "@TestRoomNames_alice:localhost"
+	bob := "@TestRoomNames_bob:localhost"
+	aliceToken := "ALICE_BEARER_TOKEN_TestRoomNames"
+	// make 5 rooms, last room is most recent, and send A,B,C into each room
+	latestTimestamp := time.Now()
+	allRooms := []roomEvents{
+		{
+			roomID: "!TestRoomNames_dm:localhost",
+			name:   "Bob",
+			events: append(createRoomState(t, alice, latestTimestamp), []json.RawMessage{
+				testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join", "displayname": "Bob"}, testutils.WithTimestamp(latestTimestamp.Add(3*time.Second))),
+			}...),
+		},
+		{
+			roomID: "!TestRoomNames_named:localhost",
+			name:   "My Room Name",
+			events: append(createRoomState(t, alice, latestTimestamp), []json.RawMessage{
+				testutils.NewStateEvent(t, "m.room.name", "", alice, map[string]interface{}{"name": "My Room Name"}, testutils.WithTimestamp(latestTimestamp.Add(2*time.Second))),
+			}...),
+		},
+		{
+			roomID: "!TestRoomNames_empty:localhost",
+			name:   "Empty Room",
+			events: createRoomState(t, alice, latestTimestamp),
+		},
+	}
+	v2.addAccount(alice, aliceToken)
+	v2.queueResponse(alice, sync2.SyncResponse{
+		Rooms: sync2.SyncRoomsResponse{
+			Join: v2JoinTimeline(allRooms...),
+		},
+	})
+
+	checkRoomNames := func(sessionID string) {
+		// do a sync, make sure room names are sensible
+		res := v3.mustDoV3Request(t, aliceToken, sync3.Request{
+			Rooms: sync3.SliceRanges{
+				[2]int64{0, int64(len(allRooms) - 1)}, // all rooms
+			},
+			TimelineLimit: int64(100),
+			SessionID:     sessionID,
+		})
+		MatchResponse(t, res, MatchV3Count(len(allRooms)), MatchV3Ops(
+			MatchV3SyncOp(func(op *sync3.ResponseOpRange) error {
+				if len(op.Rooms) != len(allRooms) {
+					return fmt.Errorf("want %d rooms, got %d", len(allRooms), len(op.Rooms))
+				}
+				for i := range allRooms {
+					err := allRooms[i].MatchRoom(
+						op.Rooms[i],
+						MatchRoomName(allRooms[i].name),
+					)
+					if err != nil {
+						return err
+					}
+				}
+				return nil
+			}),
+		))
+	}
+
+	checkRoomNames("a")
+	// restart the server and repeat the tests, should still be the same when reading from the database
+	v3.restart(t, v2, pqString)
+	checkRoomNames("b")
+}

sync3/globalcache.go

@@ -172,13 +172,20 @@ func (c *GlobalCache) OnNewEvent(
 				metadata.JoinCount += 1
 			} else if membership == "leave" || membership == "ban" {
 				metadata.JoinCount -= 1
+				// remove this user as a hero
+				metadata.RemoveHero(*ed.stateKey)
 			}
 			if gjson.ParseBytes(ed.event).Get("unsigned.prev_content.membership").Str == "invite" {
 				metadata.InviteCount -= 1
 			}
+			if len(metadata.Heroes) < 6 && (membership == "join" || membership == "invite") {
+				metadata.Heroes = append(metadata.Heroes, internal.Hero{
+					ID:   *ed.stateKey,
+					Name: ed.content.Get("displayname").Str,
+				})
+			}
 		}
 	}
 	metadata.LastMessageTimestamp = ed.timestamp
-	// TODO: heroes
 	c.roomIDToMetadata[ed.roomID] = metadata
 }