Roomserver tweaks

2022-11-14 14:15:53 +00:00 · 2022-11-14 14:15:53 +00:00 · 3122ddd3b3
parent ad7b93ef81
commit 3122ddd3b3
3 changed files with 21 additions and 22 deletions
--- a/roomserver/internal/api.go
+++ b/roomserver/internal/api.go
@ -127,7 +127,6 @@ func (r *RoomserverInternalAPI) SetFederationAPI(fsAPI fsAPI.RoomserverFederatio
 		Inputer: r.Inputer,
 	}
 	r.Joiner = &perform.Joiner{
-		ServerName: r.Cfg.Matrix.ServerName,
 		Cfg:     r.Cfg,
 		DB:      r.DB,
 		FSAPI:   r.fsAPI,
--- a/roomserver/internal/input/input_events.go
+++ b/roomserver/internal/input/input_events.go
@ -267,6 +267,7 @@ func (r *Inputer) processRoomEvent(
 		if len(serverRes.ServerNames) > 0 {
 			missingState := missingStateReq{
 				origin:      input.Origin,
+				virtualHost: virtualHost,
 				inputer:     r,
 				db:          r.DB,
 				roomInfo:    roomInfo,
--- a/roomserver/internal/perform/perform_join.go
+++ b/roomserver/internal/perform/perform_join.go
@ -39,7 +39,6 @@ import (
 )

 type Joiner struct {
-	ServerName gomatrixserverlib.ServerName
 	Cfg   *config.RoomServer
 	FSAPI fsAPI.RoomserverFederationAPI
 	RSAPI rsAPI.RoomserverInternalAPI