hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-28 16:08:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deduplicate more

Browse source
This commit is contained in:
Neil Alexander 2021-06-29 13:39:51 +01:00
parent 98ae0f43af
commit 71eebd6bc3
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
federationapi/routing/send.go
View file

@ -791,7 +791,7 @@ func (t *txnReq) lookupStateAfterEvent(ctx context.Context, roomVersion gomatrix
default: default:
return nil, false, fmt.Errorf("t.lookupEvent: %w", err) return nil, false, fmt.Errorf("t.lookupEvent: %w", err)
} }
t.cacheAndReturn(h) h = t.cacheAndReturn(h)
if h.StateKey() != nil { if h.StateKey() != nil {
addedToState := false addedToState := false
for i := range respState.StateEvents { for i := range respState.StateEvents {
@ -1070,8 +1070,8 @@ func (t *txnReq) lookupMissingStateViaStateIDs(ctx context.Context, roomID, even
return nil, err return nil, err
} }
for i := range queryRes.Events { for i := range queryRes.Events {
queryRes.Events[i] = t.cacheAndReturn(queryRes.Events[i])
evID := queryRes.Events[i].EventID() evID := queryRes.Events[i].EventID()
t.cacheAndReturn(queryRes.Events[i])
if missing[evID] { if missing[evID] {
delete(missing, evID) delete(missing, evID)
} }
@ -1235,8 +1235,7 @@ func (t *txnReq) lookupEvent(ctx context.Context, roomVersion gomatrixserverlib.
util.GetLogger(ctx).WithError(err).Warnf("Transaction: Couldn't validate signature of event %q", event.EventID()) util.GetLogger(ctx).WithError(err).Warnf("Transaction: Couldn't validate signature of event %q", event.EventID())
return nil, verifySigError{event.EventID(), err} return nil, verifySigError{event.EventID(), err}
} }
h := event.Headered(roomVersion) h := t.cacheAndReturn(event.Headered(roomVersion))
t.cacheAndReturn(h)
t.newEventsMutex.Lock() t.newEventsMutex.Lock()
t.newEvents[h.EventID()] = true t.newEvents[h.EventID()] = true
t.newEventsMutex.Unlock() t.newEventsMutex.Unlock()