diff options
author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-04-29 15:29:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-29 15:29:39 +0100 |
commit | 64e94e9a6f0a138e7fe771f540b57988bc344b59 (patch) | |
tree | 9ef06d96a4c5f0bd59ea55dad8d7f74646898894 /federationsender/api/perform.go | |
parent | a308e61331f549ae0964f83dff88abc282033ed3 (diff) |
Join room support in federation sender (#989)
* Implement PerformJoinRequest
* Rename perform functions
* Check send join response
* Temporary wiring to test federation sender room joins
* Actually pass through the config
* Make sure membership content shows join
Diffstat (limited to 'federationsender/api/perform.go')
-rw-r--r-- | federationsender/api/perform.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/federationsender/api/perform.go b/federationsender/api/perform.go index 8c30ecbe..87736f29 100644 --- a/federationsender/api/perform.go +++ b/federationsender/api/perform.go @@ -4,6 +4,7 @@ import ( "context" commonHTTP "github.com/matrix-org/dendrite/common/http" + "github.com/matrix-org/gomatrixserverlib" "github.com/opentracing/opentracing-go" ) @@ -16,14 +17,17 @@ const ( ) type PerformJoinRequest struct { - RoomID string `json:"room_id"` + RoomID string `json:"room_id"` + UserID string `json:"user_id"` + ServerName gomatrixserverlib.ServerName `json:"server_name"` + Content map[string]interface{} `json:"content"` } type PerformJoinResponse struct { } // Handle an instruction to make_join & send_join with a remote server. -func (h *httpFederationSenderInternalAPI) PerformJoinRequest( +func (h *httpFederationSenderInternalAPI) PerformJoin( ctx context.Context, request *PerformJoinRequest, response *PerformJoinResponse, @@ -43,7 +47,7 @@ type PerformLeaveResponse struct { } // Handle an instruction to make_leave & send_leave with a remote server. -func (h *httpFederationSenderInternalAPI) PerformLeaveRequest( +func (h *httpFederationSenderInternalAPI) PerformLeave( ctx context.Context, request *PerformLeaveRequest, response *PerformLeaveResponse, |