Add UnmarshalJSON for InputFileString (#76)

* add UnmarshalJSON for InputFileString * pointer recievers for inputFile implementations * fix test
go-telegram · Apr 8, 2024 · a8e8c13 · a8e8c13
1 parent 0a8269c
commit a8e8c13
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/methods_test.go b/methods_test.go
@@ -230,11 +230,11 @@ func TestBot_Methods(t *testing.T) {
 
 	t.Run("SendVideoNote", func(t *testing.T) {
 		c := &httpClient{t: t, resp: `{"text":"bar"}`, reqFields: map[string]string{
-			"thumbnail": `{"Data":"foo"}`,
+			"thumbnail": `foo`,
 		}}
 		b := &Bot{client: c}
 		resp, err := b.SendVideoNote(context.Background(), &SendVideoNoteParams{
-			Thumbnail: models.InputFileString{Data: "foo"},
+			Thumbnail: &models.InputFileString{Data: "foo"},
 		})
 		assertNoErr(t, err)
 		assertEqualString(t, "bar", resp.Text)

diff --git a/models/input_file.go b/models/input_file.go
@@ -1,6 +1,7 @@
 package models
 
 import (
+	"encoding/json"
 	"io"
 )
 
@@ -16,7 +17,7 @@ type InputFileUpload struct {
 	Data     io.Reader
 }
 
-func (InputFileUpload) inputFileTag() {}
+func (*InputFileUpload) inputFileTag() {}
 
 func (i *InputFileUpload) MarshalJSON() ([]byte, error) {
 	return []byte(`"@` + i.Filename + `"`), nil
@@ -26,8 +27,12 @@ type InputFileString struct {
 	Data string
 }
 
-func (InputFileString) inputFileTag() {}
+func (*InputFileString) inputFileTag() {}
 
 func (i *InputFileString) MarshalJSON() ([]byte, error) {
 	return []byte(`"` + i.Data + `"`), nil
 }
+
+func (i *InputFileString) UnmarshalJSON(data []byte) error {
+	return json.Unmarshal(data, &i.Data)
+}