mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-07 06:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix bugs

Browse source
This commit is contained in:
Neil Alexander 2022-06-15 09:45:12 +01:00
parent fb3e1df89f
commit 21cfabbbfb
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/caching/cache_roomevents.go
View file

@ -17,7 +17,5 @@ func (c Caches) GetRoomServerEvent(eventNID types.EventNID) (*gomatrixserverlib.
} }
func (c Caches) StoreRoomServerEvent(eventNID types.EventNID, event *gomatrixserverlib.Event) { func (c Caches) StoreRoomServerEvent(eventNID types.EventNID, event *gomatrixserverlib.Event) {
if event != nil { c.RoomServerEvents.Set(int64(eventNID), event)
c.RoomServerEvents.Set(int64(eventNID), event)
}
} }

7
roomserver/storage/shared/storage.go
View file

@ -487,16 +487,15 @@ func (d *Database) events(
result.EventNID = eventJSON.EventNID result.EventNID = eventJSON.EventNID
roomNID := roomNIDs[result.EventNID] roomNID := roomNIDs[result.EventNID]
roomVersion := roomVersions[roomNID] roomVersion := roomVersions[roomNID]
event, err := gomatrixserverlib.NewEventFromTrustedJSONWithEventID( result.Event, err = gomatrixserverlib.NewEventFromTrustedJSONWithEventID(
eventIDs[eventJSON.EventNID], eventJSON.EventJSON, false, roomVersion, eventIDs[eventJSON.EventNID], eventJSON.EventJSON, false, roomVersion,
) )
if err != nil { if err != nil {
return nil, err return nil, err
} }
if event != nil { if result.Event != nil {
d.Cache.StoreRoomServerEvent(eventJSON.EventNID, event) d.Cache.StoreRoomServerEvent(result.EventNID, result.Event)
} }
result.Event = event
} }
if !redactionsArePermanent { if !redactionsArePermanent {
d.applyRedactions(results) d.applyRedactions(results)