Voice messages support

Author: George Gabolaev

bot.go

@@ -49,26 +49,59 @@ func (b *Bot) GetFileInfo(fileID string) (*File, error) {
 // NewMessage returns new message
 func (b *Bot) NewMessage(chatID string) *Message {
 	return &Message{
-		client: b.client,
-		Chat:   Chat{ID: chatID},
+		client:      b.client,
+		Chat:        Chat{ID: chatID},
+		ContentType: Text,
+	}
+}
+
+// NewTextMessage returns new text message
+func (b *Bot) NewTextMessage(chatID, text string) *Message {
+	return &Message{
+		client:      b.client,
+		Chat:        Chat{ID: chatID},
+		Text:        text,
+		ContentType: Text,
 	}
 }
 
 // NewFileMessage returns new file message
 func (b *Bot) NewFileMessage(chatID string, file *os.File) *Message {
 	return &Message{
-		client: b.client,
-		Chat:   Chat{ID: chatID},
-		File:   file,
+		client:      b.client,
+		Chat:        Chat{ID: chatID},
+		File:        file,
+		ContentType: OtherFile,
 	}
 }
 
 // NewFileMessageByFileID returns new message with previously uploaded file id
 func (b *Bot) NewFileMessageByFileID(chatID, fileID string) *Message {
 	return &Message{
-		client: b.client,
-		Chat:   Chat{ID: chatID},
-		FileID: fileID,
+		client:      b.client,
+		Chat:        Chat{ID: chatID},
+		FileID:      fileID,
+		ContentType: OtherFile,
+	}
+}
+
+// NewFileMessage returns new voice message
+func (b *Bot) NewVoiceMessage(chatID string, file *os.File) *Message {
+	return &Message{
+		client:      b.client,
+		Chat:        Chat{ID: chatID},
+		File:        file,
+		ContentType: Voice,
+	}
+}
+
+// NewVoiceMessageByFileID returns new message with previously uploaded voice file id
+func (b *Bot) NewVoiceMessageByFileID(chatID, fileID string) *Message {
+	return &Message{
+		client:      b.client,
+		Chat:        Chat{ID: chatID},
+		FileID:      fileID,
+		ContentType: Voice,
 	}
 }
 
@@ -83,15 +116,6 @@ func (b *Bot) NewMessageFromPart(message PartMessage) *Message {
 	}
 }
 
-// NewTextMessage returns new text message
-func (b *Bot) NewTextMessage(chatID, text string) *Message {
-	return &Message{
-		client: b.client,
-		Chat:   Chat{ID: chatID},
-		Text:   text,
-	}
-}
-
 func (b *Bot) NewChat(id string) *Chat {
 	return &Chat{
 		client: b.client,

client.go

@@ -165,7 +165,11 @@ func (c *Client) GetFileInfo(fileID string) (*File, error) {
 	return file, nil
 }
 
-func (c *Client) SendMessage(message *Message) error {
+func (c *Client) GetVoiceInfo(fileID string) (*File, error) {
+	return c.GetFileInfo(fileID)
+}
+
+func (c *Client) SendTextMessage(message *Message) error {
 	params := url.Values{
 		"chatId": []string{message.Chat.ID},
 		"text":   []string{message.Text},
@@ -242,6 +246,25 @@ func (c *Client) SendFile(message *Message) error {
 	return nil
 }
 
+func (c *Client) SendVoice(message *Message) error {
+	params := url.Values{
+		"chatId":  {message.Chat.ID},
+		"caption": {message.Text},
+		"fileId":  {message.FileID},
+	}
+
+	response, err := c.Do("/messages/sendVoice", params, nil)
+	if err != nil {
+		return fmt.Errorf("error while making request: %s", err)
+	}
+
+	if err := json.Unmarshal(response, message); err != nil {
+		return fmt.Errorf("cannot unmarshal response: %s", err)
+	}
+
+	return nil
+}
+
 func (c *Client) UploadFile(message *Message) error {
 	params := url.Values{
 		"chatId":  {message.Chat.ID},
@@ -260,6 +283,24 @@ func (c *Client) UploadFile(message *Message) error {
 	return nil
 }
 
+func (c *Client) UploadVoice(message *Message) error {
+	params := url.Values{
+		"chatId":  {message.Chat.ID},
+		"caption": {message.Text},
+	}
+
+	response, err := c.Do("/messages/sendVoice", params, message.File)
+	if err != nil {
+		return fmt.Errorf("error while making request: %s", err)
+	}
+
+	if err := json.Unmarshal(response, message); err != nil {
+		return fmt.Errorf("cannot unmarshal response: %s", err)
+	}
+
+	return nil
+}
+
 func (c *Client) GetEvents(lastEventID int, pollTime int) ([]*Event, error) {
 	params := url.Values{
 		"lastEventId": {strconv.Itoa(lastEventID)},

message.go

@@ -7,9 +7,18 @@ import (
 
 //go:generate easyjson -all message.go
 
+type MessageContentType uint8
+
+const (
+	Text MessageContentType = iota
+	OtherFile
+	Voice
+)
+
 // Message represents a text message in ICQ
 type Message struct {
-	client *Client
+	client      *Client
+	ContentType MessageContentType
 
 	// Id of the message (for editing)
 	ID string `json:"msgId"`
@@ -44,10 +53,22 @@ type Message struct {
 
 func (m *Message) AttachNewFile(file *os.File) {
 	m.File = file
+	m.ContentType = OtherFile
 }
 
 func (m *Message) AttachExistingFile(fileID string) {
 	m.FileID = fileID
+	m.ContentType = OtherFile
+}
+
+func (m *Message) AttachNewVoice(file *os.File) {
+	m.File = file
+	m.ContentType = Voice
+}
+
+func (m *Message) AttachExistingVoice(fileID string) {
+	m.FileID = fileID
+	m.ContentType = Voice
 }
 
 // Send method sends your message.
@@ -61,15 +82,24 @@ func (m *Message) Send() error {
 		return fmt.Errorf("message should have chat id")
 	}
 
-	if m.FileID != "" {
-		return m.client.SendFile(m)
-	}
-
-	if m.File != nil {
-		return m.client.UploadFile(m)
-	}
-
-	if m.Text != "" {
+	switch m.ContentType {
+	case Voice:
+		if m.FileID != "" {
+			return m.client.SendVoice(m)
+		}
+
+		if m.File != nil {
+			return m.client.UploadVoice(m)
+		}
+	case OtherFile:
+		if m.FileID != "" {
+			return m.client.SendFile(m)
+		}
+
+		if m.File != nil {
+			return m.client.UploadFile(m)
+		}
+	case Text:
 		return m.client.SendMessage(m)
 	}