diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-07-25 00:03:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 18:03:58 +0200 |
| commit | 9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88 (patch) | |
| tree | 6f27dc68a35d1f9d806c632e36f0edc8543184ea /services/webhook/slack.go | |
| parent | e0f9635c0691cb67f0fcbb758cabba801d9fc51b (diff) | |
| download | gitea-9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88.tar.gz gitea-9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88.zip | |
Add an abstract json layout to make it's easier to change json library (#16528)
* Add an abstract json layout to make it's easier to change json library
* Fix import
* Fix import sequence
* Fix blank lines
* Fix blank lines
Diffstat (limited to 'services/webhook/slack.go')
| -rw-r--r-- | services/webhook/slack.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/webhook/slack.go b/services/webhook/slack.go index f522ca35f2..803b5de0b2 100644 --- a/services/webhook/slack.go +++ b/services/webhook/slack.go @@ -11,10 +11,10 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" - jsoniter "github.com/json-iterator/go" ) // SlackMeta contains the slack metadata @@ -28,7 +28,6 @@ type SlackMeta struct { // GetSlackHook returns slack metadata func GetSlackHook(w *models.Webhook) *SlackMeta { s := &SlackMeta{} - json := jsoniter.ConfigCompatibleWithStandardLibrary if err := json.Unmarshal([]byte(w.Meta), s); err != nil { log.Error("webhook.GetSlackHook(%d): %v", w.ID, err) } @@ -58,7 +57,6 @@ type SlackAttachment struct { // JSONPayload Marshals the SlackPayload to json func (s *SlackPayload) JSONPayload() ([]byte, error) { - json := jsoniter.ConfigCompatibleWithStandardLibrary data, err := json.MarshalIndent(s, "", " ") if err != nil { return []byte{}, err @@ -279,7 +277,6 @@ func GetSlackPayload(p api.Payloader, event models.HookEventType, meta string) ( s := new(SlackPayload) slack := &SlackMeta{} - json := jsoniter.ConfigCompatibleWithStandardLibrary if err := json.Unmarshal([]byte(meta), &slack); err != nil { return s, errors.New("GetSlackPayload meta json:" + err.Error()) } |