diff options
| author | Kegsay <kegan@matrix.org> | 2020-07-03 17:24:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-03 17:24:51 +0100 |
| commit | ea9df46c70a1b806c11198a1272aac99dc8b62f4 (patch) | |
| tree | a2851f4702bbd58dd8fc9c3ba614bd8a61a8a227 /clientapi/routing/membership.go | |
| parent | 46dbc46f84a7120bb418ec48ddc1d6248ef97979 (diff) | |
Implement local redaction (#1182)
* Create redaction events and apply checks (but do not send them)
* Send redactions to the roomserver
* Linting
* Slightly better wording
Diffstat (limited to 'clientapi/routing/membership.go')
| -rw-r--r-- | clientapi/routing/membership.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clientapi/routing/membership.go b/clientapi/routing/membership.go index c2145159..a9a8fa00 100644 --- a/clientapi/routing/membership.go +++ b/clientapi/routing/membership.go @@ -77,7 +77,7 @@ func sendMembership(ctx context.Context, accountDB accounts.Database, device *us _, err = roomserverAPI.SendEvents( ctx, rsAPI, - []gomatrixserverlib.HeaderedEvent{event.Headered(roomVer)}, + []gomatrixserverlib.HeaderedEvent{event.Event.Headered(roomVer)}, cfg.Matrix.ServerName, nil, ) @@ -210,7 +210,7 @@ func SendInvite( perr := roomserverAPI.SendInvite( req.Context(), rsAPI, - event.Headered(roomVer), + event.Event.Headered(roomVer), nil, // ask the roomserver to draw up invite room state for us cfg.Matrix.ServerName, nil, @@ -232,7 +232,7 @@ func buildMembershipEvent( membership, roomID string, isDirect bool, cfg *config.Dendrite, evTime time.Time, rsAPI roomserverAPI.RoomserverInternalAPI, asAPI appserviceAPI.AppServiceQueryAPI, -) (*gomatrixserverlib.Event, error) { +) (*gomatrixserverlib.HeaderedEvent, error) { profile, err := loadProfile(ctx, targetUserID, cfg, accountDB, asAPI) if err != nil { return nil, err |