diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-09-15 11:17:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 11:17:46 +0100 |
| commit | 965f068d1a6298b2ec733b0df983773a6ec8b622 (patch) | |
| tree | e7a5cda3dba38114189eb857111baaa07bbe4854 /federationsender | |
| parent | 8dc95062101b3906ffb83604e2abca02d9a3dd03 (diff) | |
Handle state with input event as new events (#1415)
* SendEventWithState events as new
* Use cumulative state IDs for final event
* Error wrapping in calculateAndSetState
* Handle overwriting same event type and state key
* Hacky way to spot historical events
* Don't exclude from sync
* Don't generate output events when rewriting forward extremities
* Update output event check
* Historical output events
* Define output room event type
* Notify key changes on state
* Don't send our membership event twice
* Deduplicate state entries
* Tweaks
* Remove unnecessary nolint
* Fix current state upsert in sync API
* Send auth events as outliers, state events as rewrite
* Sync API don't consume state events
* Process events actually
* Improve outlier check
* Fix local room check
* Remove extra room check, it seems to break the whole damn world
* Fix federated join check
* Fix nil pointer exception
* Better comments on DeduplicateStateEntries
* Reflow forced federated joins
* Don't force federated join for possibly even local invites
* Comment SendEventWithState better
* Rewrite room state in sync API storage
* Add TODO
* Clean up all room data when receiving create event
* Don't generate output events for rewrites, but instead notify that state is rewritten on the final new event
* Rename to PurgeRoom
* Exclude backfilled messages from /sync
* Split out rewriting state from updating state from state res
Co-authored-by: Kegan Dougal <kegan@matrix.org>
Diffstat (limited to 'federationsender')
| -rw-r--r-- | federationsender/internal/perform.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/federationsender/internal/perform.go b/federationsender/internal/perform.go index 90abae23..a0abf7ff 100644 --- a/federationsender/internal/perform.go +++ b/federationsender/internal/perform.go @@ -98,7 +98,10 @@ func (r *FederationSenderInternalAPI) PerformJoin( response.LastError = &gomatrix.HTTPError{ Code: 0, WrappedError: nil, - Message: lastErr.Error(), + Message: "Unknown HTTP error", + } + if lastErr != nil { + response.LastError.Message = lastErr.Error() } } @@ -195,7 +198,7 @@ func (r *FederationSenderInternalAPI) performJoinUsingServer( // If we successfully performed a send_join above then the other // server now thinks we're a part of the room. Send the newly // returned state to the roomserver to update our local view. - if err = roomserverAPI.SendEventWithState( + if err = roomserverAPI.SendEventWithRewrite( ctx, r.rsAPI, respState, event.Headered(respMakeJoin.RoomVersion), |