diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-02-16 17:12:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 17:12:17 +0000 |
| commit | 5d74a1757f652f1e367a036f931e71bd3da612dd (patch) | |
| tree | 1eba4d67889667ce00575be5751c305e4759a9e5 /roomserver/internal | |
| parent | f448e8972a1a6974916afc3ab686b342eaf568e2 (diff) | |
Don't query for servers so often in /send (#1766)
* Look up servers less often, don't hit API for missing auth events unless there are actually missing auth events
* Remove ResolveConflictsAdhoc (since it is already in GMSL), other tweaks
* Update gomatrixserverlib to matrix-org/gomatrixserverlib#254
* Fix resolve-state
* Initialise t.servers on first use
Diffstat (limited to 'roomserver/internal')
| -rw-r--r-- | roomserver/internal/query/query.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index 2a361641..3aa51726 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -112,7 +112,7 @@ func (r *Queryer) QueryStateAfterEvents( return fmt.Errorf("getAuthChain: %w", err) } - stateEvents, err = state.ResolveConflictsAdhoc(info.RoomVersion, stateEvents, authEvents) + stateEvents, err = gomatrixserverlib.ResolveConflicts(info.RoomVersion, stateEvents, authEvents) if err != nil { return fmt.Errorf("state.ResolveConflictsAdhoc: %w", err) } @@ -469,7 +469,7 @@ func (r *Queryer) QueryStateAndAuthChain( } if request.ResolveState { - if stateEvents, err = state.ResolveConflictsAdhoc( + if stateEvents, err = gomatrixserverlib.ResolveConflicts( info.RoomVersion, stateEvents, authEvents, ); err != nil { return err |