mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-01 03:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

msc2946: support basic federation requests

Browse source
This commit is contained in:
Kegan Dougal 2022-02-28 18:31:52 +00:00
parent 7c83970f60
commit 2420e34971
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
setup/mscs/msc2946/msc2946.go
View file

@ -48,7 +48,7 @@ const (
type MSC2946ClientResponse struct { type MSC2946ClientResponse struct {
Rooms []gomatrixserverlib.MSC2946Room `json:"rooms"` Rooms []gomatrixserverlib.MSC2946Room `json:"rooms"`
NextBatch string `json:"next_batch"` NextBatch string `json:"next_batch,omitempty"`
} }
// Enable this MSC // Enable this MSC
@ -260,8 +260,8 @@ func (w *walker) walk() util.JSONResponse {
if processed.isSet(rv.roomID) || rv.roomID == "" || (w.maxDepth > 0 && rv.depth > w.maxDepth) { if processed.isSet(rv.roomID) || rv.roomID == "" || (w.maxDepth > 0 && rv.depth > w.maxDepth) {
continue continue
} }
// Mark this room as processed.
// Mark this room as processed.
processed.set(rv.roomID) processed.set(rv.roomID)
// if this room is not a space room, skip. // if this room is not a space room, skip.
@ -304,6 +304,13 @@ func (w *walker) walk() util.JSONResponse {
if fedRes != nil { if fedRes != nil {
discoveredChildEvents = fedRes.Room.ChildrenState discoveredChildEvents = fedRes.Room.ChildrenState
discoveredRooms = append(discoveredRooms, fedRes.Room) discoveredRooms = append(discoveredRooms, fedRes.Room)
if len(fedRes.Children) > 0 {
discoveredRooms = append(discoveredRooms, fedRes.Children...)
}
// mark this room as a space room as the federated server responded.
// we need to do this so we add the children of this room to the unvisited stack
// as these children may be rooms we do know about.
roomType = ConstCreateEventContentValueSpace
} }
} }
@ -407,7 +414,7 @@ func (w *walker) federatedRoomInfo(roomID string, vias []string) (*gomatrixserve
if w.caller == nil { if w.caller == nil {
return nil, nil return nil, nil
} }
util.GetLogger(w.ctx).Infof("Querying federatedRoomInfo via %+v", vias) util.GetLogger(w.ctx).Infof("Querying %s via %+v", roomID, vias)
ctx := context.Background() ctx := context.Background()
// query more of the spaces graph using these servers // query more of the spaces graph using these servers
for _, serverName := range vias { for _, serverName := range vias {