tests: TType, more types ...

Author: reloadlife

README.md

@@ -40,5 +40,6 @@ go get -u go.mamad.dev/telebot
 - [ ] Regex Route Support
 - [ ] Code Cleanup and Refactoring
 - [ ] 100% Test Coverage
+- [ ] Better Router
 
 

animation.go

@@ -1,5 +1,7 @@
 package telebot
 
+import "fmt"
+
 // Animation represents an animation file (GIF or H.264/MPEG-4 AVC video without sound).
 type Animation struct {
 	// FileID is the identifier for this file, which can be used to download or reuse the file.
@@ -29,5 +31,16 @@ type Animation struct {
 
 	// FileSize is the file size in bytes. It can be bigger than 2^31, and some programming languages may have difficulty/silent defects in interpreting it.
 	// But it has at most 52 significant bits, so a signed 64-bit integer or double-precision float type are safe for storing this value (optional).
-	FileSize int `json:"file_size,omitempty"`
+	FileSize int64 `json:"file_size,omitempty"`
+}
+
+func (c *Animation) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *Animation) Type() string        { return "Animation" }
+
+func (a *Animation) File() *File {
+	f := FromFileID(a.FileID)
+	f.UniqueID = a.FileUniqueID
+	f.FileSize = a.FileSize
+	f.fileName = a.FileName
+	return &f
 }

audio.go

@@ -1,5 +1,7 @@
 package telebot
 
+import "fmt"
+
 // Audio represents an audio file to be treated as music by the Telegram clients.
 type Audio struct {
 	// FileID is the identifier for this file, which can be used to download or reuse the file.
@@ -26,8 +28,19 @@ type Audio struct {
 
 	// FileSize is the file size in bytes. It can be bigger than 2^31, and some programming languages may have difficulty/silent defects in interpreting it.
 	// But it has at most 52 significant bits, so a signed 64-bit integer or double-precision float type are safe for storing this value (optional).
-	FileSize int `json:"file_size,omitempty"`
+	FileSize int64 `json:"file_size,omitempty"`
 
 	// Thumbnail is the thumbnail of the album cover to which the music file belongs (optional).
 	Thumbnail *PhotoSize `json:"thumbnail,omitempty"`
 }
+
+func (c *Audio) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *Audio) Type() string        { return "Audio" }
+
+func (c *Audio) File() *File {
+	f := FromFileID(c.FileID)
+	f.fileName = c.FileName
+	f.FileSize = c.FileSize
+	f.UniqueID = c.FileUniqueID
+	return &f
+}

auto_delete_timer_changed.go

@@ -1,7 +1,12 @@
 package telebot
 
+import "fmt"
+
 // AutoDeleteTimerChanged represents a service message about a change in auto-delete timer settings.
 type AutoDeleteTimerChanged struct {
 	// AutoDeleteTime is the new auto-delete time for messages in the chat; in seconds.
 	AutoDeleteTime int `json:"message_auto_delete_time"`
 }
+
+func (c *AutoDeleteTimerChanged) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *AutoDeleteTimerChanged) Type() string        { return "AutoDeleteTimerChanged" }

chat_shared.go

@@ -1,5 +1,7 @@
 package telebot
 
+import "fmt"
+
 // ChatShared contains information about the chat whose identifier was shared with the bot
 // using a KeyboardButtonRequestChat button.
 type ChatShared struct {
@@ -12,3 +14,6 @@ type ChatShared struct {
 	// The bot may not have access to the chat and could be unable to use this identifier unless the chat is already known to the bot by some other means.
 	ChatID int64 `json:"chat_id"`
 }
+
+func (c *ChatShared) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *ChatShared) Type() string        { return "ChatShared" }

contact.go

@@ -1,5 +1,7 @@
 package telebot
 
+import "fmt"
+
 // Contact represents a phone contact.
 type Contact struct {
 	// PhoneNumber is the contact's phone number.
@@ -19,3 +21,6 @@ type Contact struct {
 	// VCard is an optional field providing additional data about the contact in the form of a vCard.
 	VCard *string `json:"vcard,omitempty"`
 }
+
+func (c *Contact) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *Contact) Type() string        { return "Contact" }

dice.go

@@ -1,5 +1,7 @@
 package telebot
 
+import "fmt"
+
 // Dice represents an animated emoji that displays a random value.
 type Dice struct {
 	// Emoji is the emoji on which the dice throw animation is based.
@@ -11,3 +13,6 @@ type Dice struct {
 	// For “🎰” base emoji, the value ranges from 1 to 64.
 	Value int `json:"value"`
 }
+
+func (c *Dice) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *Dice) Type() string        { return "Dice" }

document.go

@@ -1,5 +1,7 @@
 package telebot
 
+import "fmt"
+
 // Document represents a general file (as opposed to photos, voice messages, and audio files).
 type Document struct {
 	// FileID is the identifier for this file, which can be used to download or reuse the file.
@@ -20,5 +22,16 @@ type Document struct {
 
 	// FileSize is the file size in bytes. It can be bigger than 2^31, and some programming languages may have difficulty/silent defects in interpreting it.
 	// But it has at most 52 significant bits, so a signed 64-bit integer or double-precision float type is safe for storing this value (optional).
-	FileSize int `json:"file_size,omitempty"`
+	FileSize int64 `json:"file_size,omitempty"`
+}
+
+func (c *Document) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *Document) Type() string        { return "Document" }
+
+func (c *Document) File() *File {
+	f := FromFileID(c.FileID)
+	f.fileName = c.FileName
+	f.FileSize = c.FileSize
+	f.UniqueID = c.FileUniqueID
+	return &f
 }

examples/echo/main.go

@@ -1,23 +1,28 @@
 package main
 
-//
-//import (
-//	tele "go.mamad.dev/telebot"
-//	"os"
-//)
-//
-//func main() {
-//	tg := tele.New(tele.BotSettings{
-//		Token: os.Getenv("TELEGRAM_TOKEN"),
-//	})
-//
-//	tg.Handle("/start", func(c tele.Context) error {
-//		return c.Send("Hello Sir, I'm Echo OldBot, Please send me something to echo.")
-//	})
-//
-//	tg.Handle(tele.OnText, func(c tele.Context) error {
-//		return c.Send(c.Text())
-//	})
-//
-//	tg.Start()
-//}
+import (
+	tele "go.mamad.dev/telebot"
+	"os"
+)
+
+func main() {
+	tg := tele.New(tele.BotSettings{
+		Token: os.Getenv("TELEGRAM_TOKEN"),
+	})
+
+	tg.Handle("/start", func(c tele.Context) error {
+		// return c.Send("Hello Sir, I'm Echo OldBot, Please send me something to echo.")
+
+		_, err := tg.SendMessage(c.Message().Chat, "Hello Sir, I'm Echo OldBot, Please send me something to echo.")
+		return err
+	})
+
+	tg.Handle(tele.OnText, func(c tele.Context) error {
+		// return c.Send(c.Text())
+
+		_, err := tg.SendMessage(c.Message().Chat, *c.Message().Text)
+		return err
+	})
+
+	tg.Start()
+}

file.go

@@ -0,0 +1,5 @@
+package telebot
+
+type IFile interface {
+	File() *File
+}

files.go

@@ -1,7 +1,6 @@
 package telebot
 
 import (
-	"encoding/json"
 	"fmt"
 	"io"
 	"os"
@@ -28,11 +27,6 @@ type File struct {
 	fileName string
 }
 
-type UserProfilePhotos struct {
-	TotalCount int           `json:"total_count"`
-	Photos     [][]PhotoSize `json:"photos"`
-}
-
 // FromDisk constructs a new local (on-disk) file object.
 //
 // Note, it returns File, not *File for a very good reason:
@@ -69,6 +63,11 @@ func FromReader(reader io.Reader) File {
 	return File{FileReader: reader}
 }
 
+// FromFileID constructs a new file from file_id.
+func FromFileID(fileID string) File {
+	return File{FileID: fileID}
+}
+
 func (f *File) stealRef(g *File) {
 	if g.OnDisk() {
 		f.FileLocal = g.FileLocal
@@ -112,17 +111,9 @@ func (f *File) GetFileReader() io.Reader {
 	return f.FileReader
 }
 
-// MarshalJSON to be JSON serializable, but only include non-empty fields.
-func (f *File) MarshalJSON() ([]byte, error) {
-	return json.Marshal(f)
+func (f *File) ReflectType() string {
+	return fmt.Sprintf("%T", f)
 }
-
-// UnmarshalJSON to be JSON unserializable
-func (f *File) UnmarshalJSON(b []byte) error {
-	return json.Unmarshal(b, f)
-}
-
-func (f *File) String() string {
-	indented, _ := json.MarshalIndent(f, "", "  ")
-	return fmt.Sprintf("Update{ID: %s, Size: %dMB}\n%s\n", f.UniqueID, f.FileSize/1024/1024, indented)
+func (f *File) Type() string {
+	return "File"
 }

files_func.go

@@ -56,27 +56,3 @@ func (f *File) Download() ([]byte, error) {
 
 	return nil, errors.New("failed to download file")
 }
-
-func (b *bot) GetUserProfilePhotos(userID int64, offset, limit int) (*UserProfilePhotos, error) {
-	var resp struct {
-		Result UserProfilePhotos
-	}
-
-	params := getUserProfilePhotosRequest{
-		UserID: userID,
-		Offset: offset,
-		Limit:  limit,
-	}
-
-	req, err := b.sendMethodRequest(methodGetUserProfilePhotos, params)
-
-	if err != nil {
-		return nil, err
-	}
-
-	if err = json.Unmarshal(req, &resp); err != nil {
-		return nil, err
-	}
-
-	return &resp.Result, nil
-}

formatting_options.go

@@ -1,5 +1,7 @@
 package telebot
 
+import "fmt"
+
 type ParseMode string
 
 const (
@@ -33,7 +35,7 @@ const (
 )
 
 type Entity struct {
-	Type          EntityType   `json:"type"`
+	EntityType    EntityType   `json:"type"`
 	Offset        int          `json:"offset"`
 	Length        int          `json:"length"`
 	URL           string       `json:"url,omitempty"`
@@ -42,10 +44,21 @@ type Entity struct {
 	CustomEmojiID *CustomEmoji `json:"custom_emoji_id,omitempty"`
 }
 
+func (c *Entity) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *Entity) Type() string {
+	if c.EntityType == "" {
+		return "unknown"
+	}
+	return string(c.EntityType)
+}
+
 type LinkPreviewOptions struct {
 	IsDisabled       *bool   `json:"is_disabled,omitempty"`
 	URL              *string `json:"url,omitempty"`
 	PreferSmallMedia *bool   `json:"prefer_small_media,omitempty"`
 	PreferLargeMedia *bool   `json:"prefer_large_media,omitempty"`
 	ShowAboveText    *bool   `json:"show_above_text,omitempty"`
 }
+
+func (c *LinkPreviewOptions) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *LinkPreviewOptions) Type() string        { return "LinkPreviewOptions" }

game.go

@@ -1,5 +1,7 @@
 package telebot
 
+import "fmt"
+
 // Game represents a game. Use BotFather to create and edit games; their short names will act as unique identifiers.
 type Game struct {
 	// Title is the title of the game.
@@ -24,8 +26,14 @@ type Game struct {
 	Animation *Animation `json:"animation,omitempty"`
 }
 
+func (c *Game) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *Game) Type() string        { return "Game" }
+
 type GameHighScore struct {
 	Position int  `json:"position"`
 	User     User `json:"user"`
 	Score    int  `json:"score"`
 }
+
+func (c *GameHighScore) ReflectType() string { return fmt.Sprintf("%T", c) }
+func (c *GameHighScore) Type() string        { return "GameHighScore" }