From 5bbb983db531fa41ff759fd4c853aa049acd59f7 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sat, 9 Jan 2021 11:06:42 +0000 Subject: [PATCH] Tweak ApplyUpdates --- syncapi/types/types.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/syncapi/types/types.go b/syncapi/types/types.go index 412a6439d..6f5dae8de 100644 --- a/syncapi/types/types.go +++ b/syncapi/types/types.go @@ -190,25 +190,25 @@ func (t *StreamingToken) WithUpdates(other StreamingToken) StreamingToken { // streaming token contains any positions that are not 0, they are considered updates // and will overwrite the value in the token. func (t *StreamingToken) ApplyUpdates(other StreamingToken) { - if other.PDUPosition > 0 { + if other.PDUPosition > t.PDUPosition { t.PDUPosition = other.PDUPosition } - if other.TypingPosition > 0 { + if other.TypingPosition > t.TypingPosition { t.TypingPosition = other.TypingPosition } - if other.ReceiptPosition > 0 { + if other.ReceiptPosition > t.ReceiptPosition { t.ReceiptPosition = other.ReceiptPosition } - if other.SendToDevicePosition > 0 { + if other.SendToDevicePosition > t.SendToDevicePosition { t.SendToDevicePosition = other.SendToDevicePosition } - if other.InvitePosition > 0 { + if other.InvitePosition > t.InvitePosition { t.InvitePosition = other.InvitePosition } - if other.AccountDataPosition > 0 { + if other.AccountDataPosition > t.AccountDataPosition { t.AccountDataPosition = other.AccountDataPosition } - if other.DeviceListPosition.Offset > 0 { + if other.DeviceListPosition.IsAfter(&t.DeviceListPosition) { t.DeviceListPosition = other.DeviceListPosition } }