diff options
author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-01-09 11:25:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-09 11:25:09 +0000 |
commit | 0fbebecd41bd7862f9cb8a517636a7fa4a348d44 (patch) | |
tree | 392300a3567df3c8bc102c221263247186bc00db | |
parent | b5a8935042dfb358f4176bc1ca46d0b8ebd62615 (diff) |
Tweak ApplyUpdates (#1691)
-rw-r--r-- | syncapi/types/types.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/syncapi/types/types.go b/syncapi/types/types.go index 412a6439..6f5dae8d 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 } } |