aboutsummaryrefslogtreecommitdiff
path: root/federationapi/routing/join.go
diff options
context:
space:
mode:
authordevonh <devon.dmytro@gmail.com>2023-05-31 16:33:49 +0000
committerGitHub <noreply@github.com>2023-05-31 16:33:49 +0000
commitea6b368ad424a3d2e05135afb7fd0c0801b3609b (patch)
tree416132c5bdc525b9ad93911a40813c0dc3fb4439 /federationapi/routing/join.go
parentcbdc601f1b6d1c2a648b69ff44b3a49916f4d31a (diff)
Move Invite logic to GMSL (#3086)
This is both the federation receiving & sending side logic (which were previously entangeld in a single function)
Diffstat (limited to 'federationapi/routing/join.go')
-rw-r--r--federationapi/routing/join.go21
1 files changed, 1 insertions, 20 deletions
diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go
index 03d3309a..c6f96375 100644
--- a/federationapi/routing/join.go
+++ b/federationapi/routing/join.go
@@ -216,25 +216,6 @@ func MakeJoin(
}
}
-type MembershipQuerier struct {
- roomserver api.FederationRoomserverAPI
-}
-
-func (mq *MembershipQuerier) CurrentMembership(ctx context.Context, roomID spec.RoomID, userID spec.UserID) (string, error) {
- req := api.QueryMembershipForUserRequest{
- RoomID: roomID.String(),
- UserID: userID.String(),
- }
- res := api.QueryMembershipForUserResponse{}
- err := mq.roomserver.QueryMembershipForUser(ctx, &req, &res)
-
- membership := ""
- if err == nil {
- membership = res.Membership
- }
- return membership, err
-}
-
// SendJoin implements the /send_join API
// The make-join send-join dance makes much more sense as a single
// flow so the cyclomatic complexity is high:
@@ -268,7 +249,7 @@ func SendJoin(
KeyID: cfg.Matrix.KeyID,
PrivateKey: cfg.Matrix.PrivateKey,
Verifier: keys,
- MembershipQuerier: &MembershipQuerier{roomserver: rsAPI},
+ MembershipQuerier: &api.MembershipQuerier{Roomserver: rsAPI},
}
response, joinErr := gomatrixserverlib.HandleSendJoin(input)
switch e := joinErr.(type) {