aboutsummaryrefslogtreecommitdiff
path: root/clientapi/routing/membership.go
diff options
context:
space:
mode:
Diffstat (limited to 'clientapi/routing/membership.go')
-rw-r--r--clientapi/routing/membership.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/clientapi/routing/membership.go b/clientapi/routing/membership.go
index 94ba17a0..482c1f5f 100644
--- a/clientapi/routing/membership.go
+++ b/clientapi/routing/membership.go
@@ -110,6 +110,7 @@ func sendMembership(ctx context.Context, profileAPI userapi.ClientUserAPI, devic
ctx, rsAPI,
roomserverAPI.KindNew,
[]*gomatrixserverlib.HeaderedEvent{event.Event.Headered(roomVer)},
+ device.UserDomain(),
serverName,
serverName,
nil,
@@ -322,7 +323,12 @@ func buildMembershipEvent(
return nil, err
}
- return eventutil.QueryAndBuildEvent(ctx, &builder, cfg.Matrix, evTime, rsAPI, nil)
+ identity, err := cfg.Matrix.SigningIdentityFor(device.UserDomain())
+ if err != nil {
+ return nil, err
+ }
+
+ return eventutil.QueryAndBuildEvent(ctx, &builder, cfg.Matrix, identity, evTime, rsAPI, nil)
}
// loadProfile lookups the profile of a given user from the database and returns