From cbf597eaf6f657b48e0192ccf6f43b08956456be Mon Sep 17 00:00:00 2001 From: LeeMyeongJun Date: Wed, 30 Nov 2016 21:41:10 +0900 Subject: [PATCH 1/3] add error try catch in the configs MessageConfig values method --- configs.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configs.go b/configs.go index be8b4e5..e67fce2 100644 --- a/configs.go +++ b/configs.go @@ -198,7 +198,11 @@ type MessageConfig struct { // values returns a url.Values representation of MessageConfig. func (config MessageConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add("text", config.Text) v.Add("disable_web_page_preview", strconv.FormatBool(config.DisableWebPagePreview)) if config.ParseMode != "" { From 9d6e221a006b09fb3435a69e7c2a5bc05f96892e Mon Sep 17 00:00:00 2001 From: LeeMyeongJun Date: Wed, 30 Nov 2016 22:07:37 +0900 Subject: [PATCH 2/3] add error try catch in all method that use BaseChat.values --- configs.go | 72 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 12 deletions(-) diff --git a/configs.go b/configs.go index e67fce2..a2bacd5 100644 --- a/configs.go +++ b/configs.go @@ -227,7 +227,11 @@ type ForwardConfig struct { // values returns a url.Values representation of ForwardConfig. func (config ForwardConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add("from_chat_id", strconv.FormatInt(config.FromChatID, 10)) v.Add("message_id", strconv.Itoa(config.MessageID)) return v, nil @@ -287,7 +291,11 @@ type AudioConfig struct { // values returns a url.Values representation of AudioConfig. func (config AudioConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add(config.name(), config.FileID) if config.Duration != 0 { @@ -345,7 +353,11 @@ type DocumentConfig struct { // values returns a url.Values representation of DocumentConfig. func (config DocumentConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add(config.name(), config.FileID) @@ -376,7 +388,11 @@ type StickerConfig struct { // values returns a url.Values representation of StickerConfig. func (config StickerConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add(config.name(), config.FileID) @@ -409,7 +425,11 @@ type VideoConfig struct { // values returns a url.Values representation of VideoConfig. func (config VideoConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add(config.name(), config.FileID) if config.Duration != 0 { @@ -448,7 +468,11 @@ type VoiceConfig struct { // values returns a url.Values representation of VoiceConfig. func (config VoiceConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add(config.name(), config.FileID) if config.Duration != 0 { @@ -488,7 +512,11 @@ type LocationConfig struct { // values returns a url.Values representation of LocationConfig. func (config LocationConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add("latitude", strconv.FormatFloat(config.Latitude, 'f', 6, 64)) v.Add("longitude", strconv.FormatFloat(config.Longitude, 'f', 6, 64)) @@ -512,7 +540,11 @@ type VenueConfig struct { } func (config VenueConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add("latitude", strconv.FormatFloat(config.Latitude, 'f', 6, 64)) v.Add("longitude", strconv.FormatFloat(config.Longitude, 'f', 6, 64)) @@ -538,7 +570,11 @@ type ContactConfig struct { } func (config ContactConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add("phone_number", config.PhoneNumber) v.Add("first_name", config.FirstName) @@ -558,7 +594,11 @@ type GameConfig struct { } func (config GameConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add("game_short_name", config.GameShortName) @@ -644,7 +684,11 @@ type ChatActionConfig struct { // values returns a url.Values representation of ChatActionConfig. func (config ChatActionConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add("action", config.Action) return v, nil } @@ -663,7 +707,11 @@ type EditMessageTextConfig struct { } func (config EditMessageTextConfig) values() (url.Values, error) { - v, _ := config.BaseEdit.values() + v, err := config.BaseEdit.values() + if err != nil { + data := url.Values{} + return data, err + } v.Add("text", config.Text) v.Add("parse_mode", config.ParseMode) From 40f1937150e95b350ed46721924bf3b49cd48f91 Mon Sep 17 00:00:00 2001 From: MyeongJun Date: Thu, 1 Dec 2016 13:17:28 +0900 Subject: [PATCH 3/3] change return new data to return exist v data --- configs.go | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/configs.go b/configs.go index a2bacd5..aff0cd9 100644 --- a/configs.go +++ b/configs.go @@ -200,8 +200,7 @@ type MessageConfig struct { func (config MessageConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add("text", config.Text) v.Add("disable_web_page_preview", strconv.FormatBool(config.DisableWebPagePreview)) @@ -229,8 +228,7 @@ type ForwardConfig struct { func (config ForwardConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add("from_chat_id", strconv.FormatInt(config.FromChatID, 10)) v.Add("message_id", strconv.Itoa(config.MessageID)) @@ -261,7 +259,10 @@ func (config PhotoConfig) params() (map[string]string, error) { // Values returns a url.Values representation of PhotoConfig. func (config PhotoConfig) values() (url.Values, error) { - v, _ := config.BaseChat.values() + v, err := config.BaseChat.values() + if err != nil { + return v, err + } v.Add(config.name(), config.FileID) if config.Caption != "" { @@ -293,8 +294,7 @@ type AudioConfig struct { func (config AudioConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add(config.name(), config.FileID) @@ -355,8 +355,7 @@ type DocumentConfig struct { func (config DocumentConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add(config.name(), config.FileID) @@ -390,8 +389,7 @@ type StickerConfig struct { func (config StickerConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add(config.name(), config.FileID) @@ -427,8 +425,7 @@ type VideoConfig struct { func (config VideoConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add(config.name(), config.FileID) @@ -470,8 +467,7 @@ type VoiceConfig struct { func (config VoiceConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add(config.name(), config.FileID) @@ -514,8 +510,7 @@ type LocationConfig struct { func (config LocationConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add("latitude", strconv.FormatFloat(config.Latitude, 'f', 6, 64)) @@ -542,8 +537,7 @@ type VenueConfig struct { func (config VenueConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add("latitude", strconv.FormatFloat(config.Latitude, 'f', 6, 64)) @@ -572,8 +566,7 @@ type ContactConfig struct { func (config ContactConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add("phone_number", config.PhoneNumber) @@ -596,8 +589,7 @@ type GameConfig struct { func (config GameConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add("game_short_name", config.GameShortName) @@ -686,8 +678,7 @@ type ChatActionConfig struct { func (config ChatActionConfig) values() (url.Values, error) { v, err := config.BaseChat.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add("action", config.Action) return v, nil @@ -709,8 +700,7 @@ type EditMessageTextConfig struct { func (config EditMessageTextConfig) values() (url.Values, error) { v, err := config.BaseEdit.values() if err != nil { - data := url.Values{} - return data, err + return v, err } v.Add("text", config.Text)