From f2efc06d1ffaef74407bcb1bdff33bcaf6c52dfe Mon Sep 17 00:00:00 2001 From: Wim Date: Tue, 20 Feb 2018 18:36:44 +0100 Subject: [PATCH] Give api access to whole config.Message (and events). Closes #374 --- bridge/api/api.go | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/bridge/api/api.go b/bridge/api/api.go index 45bc11d3..2fd7feba 100644 --- a/bridge/api/api.go +++ b/bridge/api/api.go @@ -76,21 +76,18 @@ func (b *Api) Send(msg config.Message) (string, error) { } func (b *Api) handlePostMessage(c echo.Context) error { - message := &ApiMessage{} - if err := c.Bind(message); err != nil { + message := config.Message{} + if err := c.Bind(&message); err != nil { return err } + // these values are fixed + message.Channel = "api" + message.Protocol = "api" + message.Account = b.Account + message.ID = "" + message.Timestamp = time.Now() flog.Debugf("Sending message from %s on %s to gateway", message.Username, "api") - b.Remote <- config.Message{ - Text: message.Text, - Username: message.Username, - UserID: message.UserID, - Channel: "api", - Avatar: message.Avatar, - Account: b.Account, - Gateway: message.Gateway, - Protocol: "api", - } + b.Remote <- message return c.JSON(http.StatusOK, message) }