Roomserver tweaks

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

View file

@ -127,7 +127,6 @@ 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,

View file

@ -267,6 +267,7 @@ func (r *Inputer) processRoomEvent(
if len(serverRes.ServerNames) > 0 { if len(serverRes.ServerNames) > 0 {
missingState := missingStateReq{ missingState := missingStateReq{
origin: input.Origin, origin: input.Origin,
virtualHost: virtualHost,
inputer: r, inputer: r,
db: r.DB, db: r.DB,
roomInfo: roomInfo, roomInfo: roomInfo,

View file

@ -39,7 +39,6 @@ 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