From b3643905ad333c741483ec3482d74d093f5d22c9 Mon Sep 17 00:00:00 2001 From: Till Faelligen <2353100+S7evinK@users.noreply.github.com> Date: Wed, 8 Mar 2023 11:05:31 +0100 Subject: [PATCH] Revert "Unset RoomServerEvent, since we can't be sure that Set actually updates" This reverts commit baa11e3dd1d1e26d5a3f673b881b9d3641167e2a. --- internal/caching/cache_roomevents.go | 5 ----- roomserver/storage/shared/storage.go | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/internal/caching/cache_roomevents.go b/internal/caching/cache_roomevents.go index 14b6c3af8..9d5d3b912 100644 --- a/internal/caching/cache_roomevents.go +++ b/internal/caching/cache_roomevents.go @@ -10,7 +10,6 @@ import ( type RoomServerEventsCache interface { GetRoomServerEvent(eventNID types.EventNID) (*gomatrixserverlib.Event, bool) StoreRoomServerEvent(eventNID types.EventNID, event *gomatrixserverlib.Event) - InvalidateRoomServerEvent(eventNID types.EventNID) } func (c Caches) GetRoomServerEvent(eventNID types.EventNID) (*gomatrixserverlib.Event, bool) { @@ -20,7 +19,3 @@ func (c Caches) GetRoomServerEvent(eventNID types.EventNID) (*gomatrixserverlib. func (c Caches) StoreRoomServerEvent(eventNID types.EventNID, event *gomatrixserverlib.Event) { c.RoomServerEvents.Set(int64(eventNID), event) } - -func (c Caches) InvalidateRoomServerEvent(eventNID types.EventNID) { - c.RoomServerEvents.Unset(int64(eventNID)) -} diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go index 0ccd49115..106a8244e 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -1020,7 +1020,7 @@ func (d *EventDatabase) MaybeRedactEvent( return fmt.Errorf("d.RedactionsTable.MarkRedactionValidated: %w", err) } - d.Cache.InvalidateRoomServerEvent(redactedEvent.EventNID) + d.Cache.StoreRoomServerEvent(redactedEvent.EventNID, redactedEvent.Event) return nil })