sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Roomserver tweaks

Browse source
This commit is contained in:
Neil Alexander 2022-11-14 14:15:53 +00:00
parent ad7b93ef81
commit 3122ddd3b3
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
roomserver/internal/api.go
View file

@ -127,13 +127,12 @@ func (r *RoomserverInternalAPI) SetFederationAPI(fsAPI fsAPI.RoomserverFederatio
Inputer: r.Inputer, Inputer: r.Inputer,
} }
r.Joiner = &perform.Joiner{ r.Joiner = &perform.Joiner{
ServerName: r.Cfg.Matrix.ServerName, Cfg: r.Cfg,
Cfg: r.Cfg, DB: r.DB,
DB: r.DB, FSAPI: r.fsAPI,
FSAPI: r.fsAPI, RSAPI: r,
RSAPI: r, Inputer: r.Inputer,
Inputer: r.Inputer, Queryer: r.Queryer,
Queryer: r.Queryer,
} }
r.Peeker = &perform.Peeker{ r.Peeker = &perform.Peeker{
ServerName: r.Cfg.Matrix.ServerName, ServerName: r.Cfg.Matrix.ServerName,

21
roomserver/internal/input/input_events.go
View file

@ -266,16 +266,17 @@ func (r *Inputer) processRoomEvent(
// processRoomEvent. // processRoomEvent.
if len(serverRes.ServerNames) > 0 { if len(serverRes.ServerNames) > 0 {
missingState := missingStateReq{ missingState := missingStateReq{
origin: input.Origin, origin: input.Origin,
inputer: r, virtualHost: virtualHost,
db: r.DB, inputer: r,
roomInfo: roomInfo, db: r.DB,
federation: r.FSAPI, roomInfo: roomInfo,
keys: r.KeyRing, federation: r.FSAPI,
roomsMu: internal.NewMutexByRoom(), keys: r.KeyRing,
servers: serverRes.ServerNames, roomsMu: internal.NewMutexByRoom(),
hadEvents: map[string]bool{}, servers: serverRes.ServerNames,
haveEvents: map[string]*gomatrixserverlib.Event{}, hadEvents: map[string]bool{},
haveEvents: map[string]*gomatrixserverlib.Event{},
} }
var stateSnapshot *parsedRespState var stateSnapshot *parsedRespState
if stateSnapshot, err = missingState.processEventWithMissingState(ctx, event, headered.RoomVersion); err != nil { if stateSnapshot, err = missingState.processEventWithMissingState(ctx, event, headered.RoomVersion); err != nil {

9
roomserver/internal/perform/perform_join.go
View file

@ -39,11 +39,10 @@ import (
) )
type Joiner struct { type Joiner struct {
ServerName gomatrixserverlib.ServerName Cfg *config.RoomServer
Cfg *config.RoomServer FSAPI fsAPI.RoomserverFederationAPI
FSAPI fsAPI.RoomserverFederationAPI RSAPI rsAPI.RoomserverInternalAPI
RSAPI rsAPI.RoomserverInternalAPI DB storage.Database
DB storage.Database
Inputer *input.Inputer Inputer *input.Inputer
Queryer *query.Queryer Queryer *query.Queryer