aboutsummaryrefslogtreecommitdiff
path: root/federationapi/routing/join.go
diff options
context:
space:
mode:
Diffstat (limited to 'federationapi/routing/join.go')
-rw-r--r--federationapi/routing/join.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go
index d1480192..7aa50f65 100644
--- a/federationapi/routing/join.go
+++ b/federationapi/routing/join.go
@@ -98,7 +98,7 @@ func MakeJoin(
Roomserver: rsAPI,
}
- senderID, err := rsAPI.QuerySenderIDForUser(httpReq.Context(), roomID.String(), userID)
+ senderID, err := rsAPI.QuerySenderIDForUser(httpReq.Context(), roomID, userID)
if err != nil {
util.GetLogger(httpReq.Context()).WithError(err).Error("rsAPI.QuerySenderIDForUser failed")
return util.JSONResponse{
@@ -118,7 +118,7 @@ func MakeJoin(
LocalServerName: cfg.Matrix.ServerName,
LocalServerInRoom: res.RoomExists && res.IsInRoom,
RoomQuerier: &roomQuerier,
- UserIDQuerier: func(roomID string, senderID spec.SenderID) (*spec.UserID, error) {
+ UserIDQuerier: func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) {
return rsAPI.QueryUserIDForSender(httpReq.Context(), roomID, senderID)
},
BuildEventTemplate: createJoinTemplate,
@@ -215,7 +215,7 @@ func SendJoin(
PrivateKey: cfg.Matrix.PrivateKey,
Verifier: keys,
MembershipQuerier: &api.MembershipQuerier{Roomserver: rsAPI},
- UserIDQuerier: func(roomID string, senderID spec.SenderID) (*spec.UserID, error) {
+ UserIDQuerier: func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) {
return rsAPI.QueryUserIDForSender(httpReq.Context(), roomID, senderID)
},
}