From baa11e3dd1d1e26d5a3f673b881b9d3641167e2a Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Wed, 8 Mar 2023 10:41:47 +0100
Subject: [PATCH] Unset RoomServerEvent, since we can't be sure that Set
 actually updates the cached entry

---
 internal/caching/cache_roomevents.go | 5 +++++
 roomserver/storage/shared/storage.go | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/internal/caching/cache_roomevents.go b/internal/caching/cache_roomevents.go
index 9d5d3b912..14b6c3af8 100644
--- a/internal/caching/cache_roomevents.go
+++ b/internal/caching/cache_roomevents.go
@@ -10,6 +10,7 @@ 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) {
@@ -19,3 +20,7 @@ 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 106a8244e..0ccd49115 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.StoreRoomServerEvent(redactedEvent.EventNID, redactedEvent.Event)
+		d.Cache.InvalidateRoomServerEvent(redactedEvent.EventNID)
 
 		return nil
 	})