n/nyxmuks
1
0
Fork 0
forked from Mirrors/gomuks
Code Pull requests Activity

hicli/init: send account data last

Browse source
This commit is contained in:
Tulir Asokan 2024-10-27 12:43:41 +02:00
parent c407eb5c7d
commit ceb26a0e14
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkg/hicli/init.go
View file

@ -63,21 +63,9 @@ func (h *HiClient) GetInitialSync(ctx context.Context, batchSize int) iter.Seq[*
return
}
payload := SyncComplete{
Rooms: make(map[id.RoomID]*SyncRoom, len(rooms)-1),
LeftRooms: make([]id.RoomID, 0),
}
if i == 0 {
ad, err := h.DB.AccountData.GetAllGlobal(ctx, h.Account.UserID)
if err != nil {
zerolog.Ctx(ctx).Err(err).Msg("Failed to get global account data")
return
}
payload.AccountData = make(map[event.Type]*database.AccountData, len(ad))
for _, data := range ad {
payload.AccountData[event.Type{Type: data.Type, Class: event.AccountDataEventType}] = data
}
} else {
payload.AccountData = make(map[event.Type]*database.AccountData)
Rooms: make(map[id.RoomID]*SyncRoom, len(rooms)-1),
LeftRooms: make([]id.RoomID, 0),
AccountData: make(map[event.Type]*database.AccountData),
}
for _, room := range rooms {
if room.SortingTimestamp == rooms[len(rooms)-1].SortingTimestamp {
@ -90,5 +78,20 @@ func (h *HiClient) GetInitialSync(ctx context.Context, batchSize int) iter.Seq[*
break
}
}
// This is last so that the frontend would know about all rooms before trying to fetch custom emoji packs
ad, err := h.DB.AccountData.GetAllGlobal(ctx, h.Account.UserID)
if err != nil {
zerolog.Ctx(ctx).Err(err).Msg("Failed to get global account data")
return
}
payload := SyncComplete{
Rooms: make(map[id.RoomID]*SyncRoom, 0),
LeftRooms: make([]id.RoomID, 0),
AccountData: make(map[event.Type]*database.AccountData, len(ad)),
}
for _, data := range ad {
payload.AccountData[event.Type{Type: data.Type, Class: event.AccountDataEventType}] = data
}
yield(&payload)
}
}