diff options
Diffstat (limited to 'model/outgoing_webhook.go')
-rw-r--r-- | model/outgoing_webhook.go | 63 |
1 files changed, 16 insertions, 47 deletions
diff --git a/model/outgoing_webhook.go b/model/outgoing_webhook.go index b00171845..b5dbf34d9 100644 --- a/model/outgoing_webhook.go +++ b/model/outgoing_webhook.go @@ -58,12 +58,8 @@ type OutgoingWebhookResponse struct { const OUTGOING_HOOK_RESPONSE_TYPE_COMMENT = "comment" func (o *OutgoingWebhookPayload) ToJSON() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (o *OutgoingWebhookPayload) ToFormValues() string { @@ -85,63 +81,36 @@ func (o *OutgoingWebhookPayload) ToFormValues() string { } func (o *OutgoingWebhook) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func OutgoingWebhookFromJson(data io.Reader) *OutgoingWebhook { - decoder := json.NewDecoder(data) - var o OutgoingWebhook - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *OutgoingWebhook + json.NewDecoder(data).Decode(&o) + return o } func OutgoingWebhookListToJson(l []*OutgoingWebhook) string { - b, err := json.Marshal(l) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(l) + return string(b) } func OutgoingWebhookListFromJson(data io.Reader) []*OutgoingWebhook { - decoder := json.NewDecoder(data) var o []*OutgoingWebhook - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } func (o *OutgoingWebhookResponse) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func OutgoingWebhookResponseFromJson(data io.Reader) *OutgoingWebhookResponse { - decoder := json.NewDecoder(data) - var o OutgoingWebhookResponse - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *OutgoingWebhookResponse + json.NewDecoder(data).Decode(&o) + return o } func (o *OutgoingWebhook) IsValid() *AppError { |