diff options
| author | Kegsay <kegan@matrix.org> | 2020-03-16 17:51:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-16 17:51:58 +0000 |
| commit | 9f74a8798e26d9482f1964ff79a28acfe61d6dd1 (patch) | |
| tree | fc6db87d0b2701f31ab30157e060ea6b3cb6580d | |
| parent | acb505b71751f637531ba9113d4b4daae589bcbc (diff) | |
bugfix: Fix #908 by setting the correct state after the event (#913)
* bugfix: Fix #908 by setting the correct state after the event
Previously, this would only happen if the state already existed
previously!
* Structured logging
| -rw-r--r-- | federationapi/routing/send.go | 1 | ||||
| -rw-r--r-- | roomserver/state/v1/state.go | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go index ce9ad8b1..d3e060ac 100644 --- a/federationapi/routing/send.go +++ b/federationapi/routing/send.go @@ -116,6 +116,7 @@ func (t *txnReq) processTransaction() (*gomatrixserverlib.RespSend, error) { results[e.EventID()] = gomatrixserverlib.PDUResult{ Error: err.Error(), } + util.GetLogger(t.context).WithError(err).WithField("event_id", e.EventID()).Warn("Failed to process incoming federation event, skipping it.") } else { results[e.EventID()] = gomatrixserverlib.PDUResult{} } diff --git a/roomserver/state/v1/state.go b/roomserver/state/v1/state.go index 5683745b..3eb60192 100644 --- a/roomserver/state/v1/state.go +++ b/roomserver/state/v1/state.go @@ -366,11 +366,16 @@ func (v StateResolutionV1) loadStateAfterEventsForNumericTuples( // update that key in the result. // If the requested event wasn't a state event then the state after // it is the same as the state before it. + set := false for i := range result { if result[i].StateKeyTuple == prevState.StateKeyTuple { result[i] = prevState.StateEntry + set = true } } + if !set { // no previous state exists for this event: add new state + result = append(result, prevState.StateEntry) + } } return result, nil } |