From 803b72d979b7f730e7d97e99eef9c2a706563358 Mon Sep 17 00:00:00 2001 From: Tit Petric Date: Mon, 22 Oct 2018 11:12:32 +0200 Subject: [PATCH] fix(sam): codegen for multipart, gofmt service --- codegen/templates/http_request_inline.tpl | 4 +++- sam/rest/request/channel.go | 2 +- sam/service/message.go | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/codegen/templates/http_request_inline.tpl b/codegen/templates/http_request_inline.tpl index deb16a586..29ac06051 100644 --- a/codegen/templates/http_request_inline.tpl +++ b/codegen/templates/http_request_inline.tpl @@ -45,7 +45,9 @@ func ({self} *{name|expose}{call.name|capitalize}) Fill(r *http.Request) error { } } - r.ParseForm() +{eval $parseForm = "ParseForm"} +{foreach $call.parameters as $method => $params}{foreach $params as $param}{if $param.type === "*multipart.FileHeader"}{eval $parseForm = "ParseMultipartForm"}{/if}{/foreach}{/foreach} + r.{$parseForm}() get := map[string]string{} post := map[string]string{} urlQuery := r.URL.Query() diff --git a/sam/rest/request/channel.go b/sam/rest/request/channel.go index f4378cbe6..34c4c4518 100644 --- a/sam/rest/request/channel.go +++ b/sam/rest/request/channel.go @@ -479,7 +479,7 @@ func (c *ChannelAttach) Fill(r *http.Request) error { } } - r.ParseForm() + r.ParseMultipartForm() get := map[string]string{} post := map[string]string{} urlQuery := r.URL.Query() diff --git a/sam/service/message.go b/sam/service/message.go index f3d2586cc..6bf03dd4f 100644 --- a/sam/service/message.go +++ b/sam/service/message.go @@ -130,7 +130,7 @@ func (svc *message) Create(mod *types.Message) (message *types.Message, err erro var bq = types.MessageSet{} if mod.ReplyTo > 0 { - var original *types.Message + var original *types.Message original, err = svc.message.FindMessageByID(mod.ReplyTo) if err != nil { return @@ -331,7 +331,7 @@ func (svc *message) Unflag(messageID uint64) error { // Sends message to event loop // // It also preloads user -func (svc *message) sendEvent(messages ... *types.Message) (err error) { +func (svc *message) sendEvent(messages ...*types.Message) (err error) { for _, msg := range messages { if msg.User == nil { // @todo pull user from cache