From a7390953dd0920021e58c9b7db278cff313d7457 Mon Sep 17 00:00:00 2001 From: Kegsay Date: Fri, 17 Mar 2017 11:21:52 +0000 Subject: [PATCH] Implement /state event sending (#41) --- .../dendrite/clientapi/routing/routing.go | 16 +++++++++++++++- .../writers/{sendmessage.go => sendevent.go} | 13 ++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) rename src/github.com/matrix-org/dendrite/clientapi/writers/{sendmessage.go => sendevent.go} (88%) diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go b/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go index b076f268..1a085d8b 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go +++ b/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go @@ -29,7 +29,21 @@ func Setup(servMux *http.ServeMux, httpClient *http.Client, cfg config.ClientAPI r0mux.Handle("/rooms/{roomID}/send/{eventType}/{txnID}", make("send_message", util.NewJSONRequestHandler(func(req *http.Request) util.JSONResponse { vars := mux.Vars(req) - return writers.SendMessage(req, vars["roomID"], vars["eventType"], vars["txnID"], cfg, queryAPI, producer) + return writers.SendEvent(req, vars["roomID"], vars["eventType"], vars["txnID"], nil, cfg, queryAPI, producer) + })), + ) + r0mux.Handle("/rooms/{roomID}/state/{eventType}", + make("send_message", util.NewJSONRequestHandler(func(req *http.Request) util.JSONResponse { + vars := mux.Vars(req) + emptyString := "" + return writers.SendEvent(req, vars["roomID"], vars["eventType"], vars["txnID"], &emptyString, cfg, queryAPI, producer) + })), + ) + r0mux.Handle("/rooms/{roomID}/state/{eventType}/{stateKey}", + make("send_message", util.NewJSONRequestHandler(func(req *http.Request) util.JSONResponse { + vars := mux.Vars(req) + stateKey := vars["stateKey"] + return writers.SendEvent(req, vars["roomID"], vars["eventType"], vars["txnID"], &stateKey, cfg, queryAPI, producer) })), ) diff --git a/src/github.com/matrix-org/dendrite/clientapi/writers/sendmessage.go b/src/github.com/matrix-org/dendrite/clientapi/writers/sendevent.go similarity index 88% rename from src/github.com/matrix-org/dendrite/clientapi/writers/sendmessage.go rename to src/github.com/matrix-org/dendrite/clientapi/writers/sendevent.go index 7e236c3a..3e321447 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/writers/sendmessage.go +++ b/src/github.com/matrix-org/dendrite/clientapi/writers/sendevent.go @@ -18,12 +18,15 @@ import ( ) // http://matrix.org/docs/spec/client_server/r0.2.0.html#put-matrix-client-r0-rooms-roomid-send-eventtype-txnid -type sendMessageResponse struct { +// http://matrix.org/docs/spec/client_server/r0.2.0.html#put-matrix-client-r0-rooms-roomid-state-eventtype-statekey +type sendEventResponse struct { EventID string `json:"event_id"` } -// SendMessage implements /rooms/{roomID}/send/{eventType}/{txnID} -func SendMessage(req *http.Request, roomID, eventType, txnID string, cfg config.ClientAPI, queryAPI api.RoomserverQueryAPI, producer *producers.RoomserverProducer) util.JSONResponse { +// SendEvent implements: +// /rooms/{roomID}/send/{eventType}/{txnID} +// /rooms/{roomID}/state/{eventType}/{stateKey} +func SendEvent(req *http.Request, roomID, eventType, txnID string, stateKey *string, cfg config.ClientAPI, queryAPI api.RoomserverQueryAPI, producer *producers.RoomserverProducer) util.JSONResponse { // parse the incoming http request userID, resErr := auth.VerifyAccessToken(req) if resErr != nil { @@ -40,7 +43,7 @@ func SendMessage(req *http.Request, roomID, eventType, txnID string, cfg config. Sender: userID, RoomID: roomID, Type: eventType, - StateKey: nil, + StateKey: stateKey, } builder.SetContent(r) @@ -99,7 +102,7 @@ func SendMessage(req *http.Request, roomID, eventType, txnID string, cfg config. return util.JSONResponse{ Code: 200, - JSON: sendMessageResponse{e.EventID()}, + JSON: sendEventResponse{e.EventID()}, } }