sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Tweak ApplyUpdates (#1691)

Browse source
This commit is contained in:
Neil Alexander 2021-01-09 11:25:09 +00:00 committed by GitHub
parent b5a8935042
commit 0fbebecd41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
syncapi/types/types.go
View file

@ -190,25 +190,25 @@ func (t *StreamingToken) WithUpdates(other StreamingToken) StreamingToken {
// streaming token contains any positions that are not 0, they are considered updates // streaming token contains any positions that are not 0, they are considered updates
// and will overwrite the value in the token. // and will overwrite the value in the token.
func (t *StreamingToken) ApplyUpdates(other StreamingToken) { func (t *StreamingToken) ApplyUpdates(other StreamingToken) {
if other.PDUPosition > 0 { if other.PDUPosition > t.PDUPosition {
t.PDUPosition = other.PDUPosition t.PDUPosition = other.PDUPosition
} }
if other.TypingPosition > 0 { if other.TypingPosition > t.TypingPosition {
t.TypingPosition = other.TypingPosition t.TypingPosition = other.TypingPosition
} }
if other.ReceiptPosition > 0 { if other.ReceiptPosition > t.ReceiptPosition {
t.ReceiptPosition = other.ReceiptPosition t.ReceiptPosition = other.ReceiptPosition
} }
if other.SendToDevicePosition > 0 { if other.SendToDevicePosition > t.SendToDevicePosition {
t.SendToDevicePosition = other.SendToDevicePosition t.SendToDevicePosition = other.SendToDevicePosition
} }
if other.InvitePosition > 0 { if other.InvitePosition > t.InvitePosition {
t.InvitePosition = other.InvitePosition t.InvitePosition = other.InvitePosition
} }
if other.AccountDataPosition > 0 { if other.AccountDataPosition > t.AccountDataPosition {
t.AccountDataPosition = other.AccountDataPosition t.AccountDataPosition = other.AccountDataPosition
} }
if other.DeviceListPosition.Offset > 0 { if other.DeviceListPosition.IsAfter(&t.DeviceListPosition) {
t.DeviceListPosition = other.DeviceListPosition t.DeviceListPosition = other.DeviceListPosition
} }
} }