Rename perform functions

This commit is contained in:
Neil Alexander 2020-04-29 12:31:24 +01:00
parent 90d6baebad
commit 55e688b158
4 changed files with 8 additions and 8 deletions

View file

@ -25,13 +25,13 @@ type FederationSenderInternalAPI interface {
response *QueryJoinedHostServerNamesInRoomResponse, response *QueryJoinedHostServerNamesInRoomResponse,
) error ) error
// Handle an instruction to make_join & send_join with a remote server. // Handle an instruction to make_join & send_join with a remote server.
PerformJoinRequest( PerformJoin(
ctx context.Context, ctx context.Context,
request *PerformJoinRequest, request *PerformJoinRequest,
response *PerformJoinResponse, response *PerformJoinResponse,
) error ) error
// Handle an instruction to make_leave & send_leave with a remote server. // Handle an instruction to make_leave & send_leave with a remote server.
PerformLeaveRequest( PerformLeave(
ctx context.Context, ctx context.Context,
request *PerformLeaveRequest, request *PerformLeaveRequest,
response *PerformLeaveResponse, response *PerformLeaveResponse,

View file

@ -27,7 +27,7 @@ type PerformJoinResponse struct {
} }
// Handle an instruction to make_join & send_join with a remote server. // Handle an instruction to make_join & send_join with a remote server.
func (h *httpFederationSenderInternalAPI) PerformJoinRequest( func (h *httpFederationSenderInternalAPI) PerformJoin(
ctx context.Context, ctx context.Context,
request *PerformJoinRequest, request *PerformJoinRequest,
response *PerformJoinResponse, response *PerformJoinResponse,
@ -47,7 +47,7 @@ type PerformLeaveResponse struct {
} }
// Handle an instruction to make_leave & send_leave with a remote server. // Handle an instruction to make_leave & send_leave with a remote server.
func (h *httpFederationSenderInternalAPI) PerformLeaveRequest( func (h *httpFederationSenderInternalAPI) PerformLeave(
ctx context.Context, ctx context.Context,
request *PerformLeaveRequest, request *PerformLeaveRequest,
response *PerformLeaveResponse, response *PerformLeaveResponse,

View file

@ -71,7 +71,7 @@ func (f *FederationSenderInternalAPI) SetupHTTP(servMux *http.ServeMux) {
if err := json.NewDecoder(req.Body).Decode(&request); err != nil { if err := json.NewDecoder(req.Body).Decode(&request); err != nil {
return util.MessageResponse(http.StatusBadRequest, err.Error()) return util.MessageResponse(http.StatusBadRequest, err.Error())
} }
if err := f.PerformJoinRequest(req.Context(), &request, &response); err != nil { if err := f.PerformJoin(req.Context(), &request, &response); err != nil {
return util.ErrorResponse(err) return util.ErrorResponse(err)
} }
return util.JSONResponse{Code: http.StatusOK, JSON: &response} return util.JSONResponse{Code: http.StatusOK, JSON: &response}
@ -84,7 +84,7 @@ func (f *FederationSenderInternalAPI) SetupHTTP(servMux *http.ServeMux) {
if err := json.NewDecoder(req.Body).Decode(&request); err != nil { if err := json.NewDecoder(req.Body).Decode(&request); err != nil {
return util.MessageResponse(http.StatusBadRequest, err.Error()) return util.MessageResponse(http.StatusBadRequest, err.Error())
} }
if err := f.PerformLeaveRequest(req.Context(), &request, &response); err != nil { if err := f.PerformLeave(req.Context(), &request, &response); err != nil {
return util.ErrorResponse(err) return util.ErrorResponse(err)
} }
return util.JSONResponse{Code: http.StatusOK, JSON: &response} return util.JSONResponse{Code: http.StatusOK, JSON: &response}

View file

@ -11,7 +11,7 @@ import (
) )
// PerformJoinRequest implements api.FederationSenderInternalAPI // PerformJoinRequest implements api.FederationSenderInternalAPI
func (r *FederationSenderInternalAPI) PerformJoinRequest( func (r *FederationSenderInternalAPI) PerformJoin(
ctx context.Context, ctx context.Context,
request *api.PerformJoinRequest, request *api.PerformJoinRequest,
response *api.PerformJoinResponse, response *api.PerformJoinResponse,
@ -98,7 +98,7 @@ func (r *FederationSenderInternalAPI) PerformJoinRequest(
} }
// PerformLeaveRequest implements api.FederationSenderInternalAPI // PerformLeaveRequest implements api.FederationSenderInternalAPI
func (r *FederationSenderInternalAPI) PerformLeaveRequest( func (r *FederationSenderInternalAPI) PerformLeave(
ctx context.Context, ctx context.Context,
request *api.PerformLeaveRequest, request *api.PerformLeaveRequest,
response *api.PerformLeaveResponse, response *api.PerformLeaveResponse,