aboutsummaryrefslogtreecommitdiff
path: root/clientapi/threepid
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2022-11-15 15:05:23 +0000
committerNeil Alexander <neilalexander@users.noreply.github.com>2022-11-15 15:05:23 +0000
commit6650712a1c0dec282b47b7ba14bc8c2e06a385d8 (patch)
tree12ca755c5c33d3489417f9355dda3f1b7983c779 /clientapi/threepid
parentf4ee3977340c84d321767d347795b1dcd05ac459 (diff)
Federation fixes for virtual hosting
Diffstat (limited to 'clientapi/threepid')
-rw-r--r--clientapi/threepid/invites.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go
index 99fb8171..1f294a03 100644
--- a/clientapi/threepid/invites.go
+++ b/clientapi/threepid/invites.go
@@ -359,8 +359,13 @@ func emit3PIDInviteEvent(
return err
}
+ identity, err := cfg.Matrix.SigningIdentityFor(device.UserDomain())
+ if err != nil {
+ return err
+ }
+
queryRes := api.QueryLatestEventsAndStateResponse{}
- event, err := eventutil.QueryAndBuildEvent(ctx, builder, cfg.Matrix, evTime, rsAPI, &queryRes)
+ event, err := eventutil.QueryAndBuildEvent(ctx, builder, cfg.Matrix, identity, evTime, rsAPI, &queryRes)
if err != nil {
return err
}
@@ -371,6 +376,7 @@ func emit3PIDInviteEvent(
[]*gomatrixserverlib.HeaderedEvent{
event.Headered(queryRes.RoomVersion),
},
+ device.UserDomain(),
cfg.Matrix.ServerName,
cfg.Matrix.ServerName,
nil,