aboutsummaryrefslogtreecommitdiff
path: root/federationapi/internal
diff options
context:
space:
mode:
authorkegsay <kegan@matrix.org>2022-03-01 13:40:07 +0000
committerGitHub <noreply@github.com>2022-03-01 13:40:07 +0000
commitf1b92de0175d74be7b167c5e3f168d0048c84843 (patch)
treea11b8b990aee75e96ac5421b2d5be69ab74a2881 /federationapi/internal
parent530f05885dccba91559aff09eaaa20540a08a419 (diff)
MSC2946: Spaces Summary (round 2) (#2232)
* Initial cut at fixing up MSC2946 to work with latest spec * bugfix: send response back correctly * Initial working version of MSC2946 * msc2946: handle suggested_only; remove custom database As the MSC doesn't require reverse lookups, we can just pull the room state and inspect via the roomserver database. To handle this, expand QueryCurrentState to support wildcards. Use all this and handle `?suggested_only`. * Sort child rooms * msc2946: Make TestClientSpacesSummary pass * msc2946: allow invited rooms to be spidered * msc2946: support basic federation requests * fix up go mod
Diffstat (limited to 'federationapi/internal')
-rw-r--r--federationapi/internal/federationclient.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/federationapi/internal/federationclient.go b/federationapi/internal/federationclient.go
index b31db466..b8bd5bed 100644
--- a/federationapi/internal/federationclient.go
+++ b/federationapi/internal/federationclient.go
@@ -166,12 +166,12 @@ func (a *FederationInternalAPI) MSC2836EventRelationships(
}
func (a *FederationInternalAPI) MSC2946Spaces(
- ctx context.Context, s gomatrixserverlib.ServerName, roomID string, r gomatrixserverlib.MSC2946SpacesRequest,
+ ctx context.Context, s gomatrixserverlib.ServerName, roomID string, suggestedOnly bool,
) (res gomatrixserverlib.MSC2946SpacesResponse, err error) {
ctx, cancel := context.WithTimeout(ctx, time.Minute)
defer cancel()
ires, err := a.doRequestIfNotBlacklisted(s, func() (interface{}, error) {
- return a.federation.MSC2946Spaces(ctx, s, roomID, r)
+ return a.federation.MSC2946Spaces(ctx, s, roomID, suggestedOnly)
})
if err != nil {
return res, err