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 again

Browse source
This commit is contained in:
Neil Alexander 2022-06-14 16:57:16 +01:00
parent 3f9617e373
commit 9a3f483e9c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/caching/cache_roomevents.go
View file

@ -17,5 +17,7 @@ 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) {
c.RoomServerEvents.Set(int64(eventNID), event) if event != nil {
c.RoomServerEvents.Set(int64(eventNID), event)
}
} }

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

@ -437,7 +437,7 @@ func (d *Database) events(
) ([]types.Event, error) { ) ([]types.Event, error) {
results := make([]types.Event, len(inputEventNIDs)) results := make([]types.Event, len(inputEventNIDs))
eventNIDs := make([]types.EventNID, 0, len(results)) eventNIDs := make([]types.EventNID, 0, len(results))
for _, nid := range eventNIDs { for _, nid := range inputEventNIDs {
if event, ok := d.Cache.GetRoomServerEvent(nid); ok { if event, ok := d.Cache.GetRoomServerEvent(nid); ok {
results = append(results, types.Event{ results = append(results, types.Event{
EventNID: nid, EventNID: nid,
@ -487,15 +487,16 @@ 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]
result.Event, err = gomatrixserverlib.NewEventFromTrustedJSONWithEventID( 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 result.Event != nil { if result.Event != nil {
d.Cache.StoreRoomServerEvent(result.EventNID, result.Event) d.Cache.StoreRoomServerEvent(eventJSON.EventNID, event)
} }
result.Event = event
} }
if !redactionsArePermanent { if !redactionsArePermanent {
d.applyRedactions(results) d.applyRedactions(results)