From 129fc42c0b6c2aca1941415b68dcd03d92ad0c8c Mon Sep 17 00:00:00 2001 From: Daniel Aloni Date: Tue, 4 Apr 2023 11:47:51 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Use=20origin=5Fserver?= =?UTF-8?q?=5Fts=20instead=20of=20timestamp=20in=20MR=20/sync=20responses.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- syncapi/storage/shared/storage_sync.go | 4 ++-- syncapi/types/multiroom.go | 4 ++-- syncapi/types/multiroom_test.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/syncapi/storage/shared/storage_sync.go b/syncapi/storage/shared/storage_sync.go index d69bbc67a..67cd0c89b 100644 --- a/syncapi/storage/shared/storage_sync.go +++ b/syncapi/storage/shared/storage_sync.go @@ -816,8 +816,8 @@ func (d *DatabaseTransaction) SelectMultiRoomData(ctx context.Context, r *types. mr[row.UserId] = make(map[string]types.MultiRoomData) } mr[row.UserId][row.Type] = types.MultiRoomData{ - Content: row.Data, - Timestamp: row.Timestamp, + Content: row.Data, + OriginServerTs: row.Timestamp, } } return mr, nil diff --git a/syncapi/types/multiroom.go b/syncapi/types/multiroom.go index f1b5d7e49..782c40b81 100644 --- a/syncapi/types/multiroom.go +++ b/syncapi/types/multiroom.go @@ -5,8 +5,8 @@ type MultiRoom map[string]map[string]MultiRoomData type MultiRoomContent []byte type MultiRoomData struct { - Content MultiRoomContent `json:"content"` - Timestamp int64 `json:"timestamp"` + Content MultiRoomContent `json:"content"` + OriginServerTs int64 `json:"origin_server_ts"` } func (d MultiRoomContent) MarshalJSON() ([]byte, error) { diff --git a/syncapi/types/multiroom_test.go b/syncapi/types/multiroom_test.go index 7fa906974..53f637dd8 100644 --- a/syncapi/types/multiroom_test.go +++ b/syncapi/types/multiroom_test.go @@ -13,8 +13,8 @@ func TestMarshallMultiRoom(t *testing.T) { MultiRoom{ "@3:example.com": map[string]MultiRoomData{ "location": { - Content: MultiRoomContent(`{"foo":"bar"}`), - Timestamp: 123, + Content: MultiRoomContent(`{"foo":"bar"}`), + OriginServerTs: 123, }}}) is.NoErr(err) is.Equal(m, []byte(`{"@3:example.com":{"location":{"content":{"foo":"bar"},"timestamp":123}}}`)) From 829c5a7ebd83c19bcda7baa5f75ae7ad57046854 Mon Sep 17 00:00:00 2001 From: Daniel Aloni Date: Tue, 4 Apr 2023 11:55:32 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=E2=9C=85=20Tests=20adjustment=20to=20origi?= =?UTF-8?q?n=5Fserver=5Fts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- syncapi/types/multiroom_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncapi/types/multiroom_test.go b/syncapi/types/multiroom_test.go index 53f637dd8..d2a49d480 100644 --- a/syncapi/types/multiroom_test.go +++ b/syncapi/types/multiroom_test.go @@ -17,5 +17,5 @@ func TestMarshallMultiRoom(t *testing.T) { OriginServerTs: 123, }}}) 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}}}`)) }