extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-06-22 13:01:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect comparisons for checking if a timestamp is zero-valued

Browse Source
This commit is contained in:
David Dworken 2023-10-15 12:59:42 -07:00
parent 56f54f0f65
commit f6b3890f20
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/server/internal/database/db.go
View File

@ -206,15 +206,15 @@ func (db *DB) DeleteMessagesFromBackend(ctx context.Context, userId string, dele
if message.DeviceId == "" {
return 0, fmt.Errorf("failed to delete entry because MessageIdentifier.DeviceId is empty")
}
if message.EndTime.UTC().UnixMilli() > 0 && message.EntryId != "" {
if message.EndTime != (time.Time{}) && message.EntryId != "" {
// Note that we do an OR with date or the ID matching since the ID is not always recorded for older history entries.
tx = tx.Or(db.WithContext(ctx).Where("user_id = ? AND device_id = ? AND (date = ? OR encrypted_id = ?)", userId, message.DeviceId, message.EndTime, message.EntryId))
} else if message.EndTime.UTC().UnixMilli() > 0 && message.EntryId == "" {
} else if message.EndTime != (time.Time{}) && message.EntryId == "" {
tx = tx.Or(db.WithContext(ctx).Where("user_id = ? AND device_id = ? AND (date = ?)", userId, message.DeviceId, message.EndTime))
} else if message.EndTime.UTC().UnixMilli() == 0 && message.EntryId != "" {
} else if message.EndTime == (time.Time{}) && message.EntryId != "" {
tx = tx.Or(db.WithContext(ctx).Where("user_id = ? AND device_id = ? AND (encrypted_id = ?)", userId, message.DeviceId, message.EntryId))
} else {
return 0, fmt.Errorf("failed to delete entry because message.EndTime and message.EntryId are both empty")
return 0, fmt.Errorf("failed to delete entry because message.EndTime=%#v and message.EntryId=%#v are both empty", message.EndTime, message.EntryId)
}
}
result := tx.Delete(&shared.EncHistoryEntry{})