extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-02-16 18:41:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve DeleteMessagesFromBackend with better error checking and optimized queries for cases when MessageIdentifier is missing data

Browse Source
This commit is contained in:
David Dworken 2023-10-15 11:43:29 -07:00
parent 9f32ae5d2e
commit cfefbb9b19
No known key found for this signature in database
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,8 +200,22 @@ func (db *DB) ApplyDeletionRequestsToBackend(ctx context.Context, requests []*sh
func (db *DB) DeleteMessagesFromBackend(ctx context.Context, userId string, deletedMessages []shared.MessageIdentifier) (int64, error) {
tx := db.WithContext(ctx).Where("false")
for _, message := range deletedMessages {
// 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))
if userId == "" {
return 0, fmt.Errorf("failed to delete entry because userId is empty")
}
if message.DeviceId == "" {
return 0, fmt.Errorf("failed to delete entry because MessageIdentifier.DeviceId is empty")
}
if message.EndTime.UTC().UnixMilli() > 0 && 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 == "" {
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 != "" {
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")
}
}
result := tx.Delete(&shared.EncHistoryEntry{})
if tx.Error != nil {