mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 06:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67 from globekeeper/daniel/origin_server_ts

Browse source 
♻️ Use origin_server_ts instead of timestamp in MR /sync responses.
This commit is contained in:
Daniel Aloni 2023-04-04 14:10:06 +03:00 committed by GitHub
parent bf0f05b8fe 829c5a7ebd
commit beeb0ca8f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
syncapi/storage/shared/storage_sync.go
View file

@ -816,8 +816,8 @@ func (d *DatabaseTransaction) SelectMultiRoomData(ctx context.Context, r *types.
mr[row.UserId] = make(map[string]types.MultiRoomData) mr[row.UserId] = make(map[string]types.MultiRoomData)
} }
mr[row.UserId][row.Type] = types.MultiRoomData{ mr[row.UserId][row.Type] = types.MultiRoomData{
Content: row.Data, Content: row.Data,
Timestamp: row.Timestamp, OriginServerTs: row.Timestamp,
} }
} }
return mr, nil return mr, nil

4
syncapi/types/multiroom.go
View file

@ -5,8 +5,8 @@ type MultiRoom map[string]map[string]MultiRoomData
type MultiRoomContent []byte type MultiRoomContent []byte
type MultiRoomData struct { type MultiRoomData struct {
Content MultiRoomContent `json:"content"` Content MultiRoomContent `json:"content"`
Timestamp int64 `json:"timestamp"` OriginServerTs int64 `json:"origin_server_ts"`
} }
func (d MultiRoomContent) MarshalJSON() ([]byte, error) { func (d MultiRoomContent) MarshalJSON() ([]byte, error) {

6
syncapi/types/multiroom_test.go
View file

@ -13,9 +13,9 @@ func TestMarshallMultiRoom(t *testing.T) {
MultiRoom{ MultiRoom{
"@3:example.com": map[string]MultiRoomData{ "@3:example.com": map[string]MultiRoomData{
"location": { "location": {
Content: MultiRoomContent(`{"foo":"bar"}`), Content: MultiRoomContent(`{"foo":"bar"}`),
Timestamp: 123, OriginServerTs: 123,
}}}) }}})
is.NoErr(err) is.NoErr(err)
is.Equal(m, []byte(`{"@3:example.com":{"location":{"content":{"foo":"bar"},"timestamp":123}}}`)) is.Equal(m, []byte(`{"@3:example.com":{"location":{"content":{"foo":"bar"},"origin_server_ts":123}}}`))
} }