Archives
/
telebot
mirror of https://github.com/tucnak/telebot
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merging #79 into 'v2'.

Browse Source 
This commit breaks telebot API by introducing message edits and
changing return values for existing Send* methods.
pull/108/head
Ian Byrd 7 years ago
parent 2d298dfca8 d2067e919f
commit 8128e90034
No known key found for this signature in database
GPG Key ID: 598F598CA3B8055F
1 changed files with 246 additions and 6 deletions
Show Stats Download Patch File Download Diff File

252
bot.go
Unescape Escape View File

@ -106,7 +106,7 @@ func (b *Bot) poll(
}
// SendMessage sends a text message to recipient.
func (b *Bot) SendMessage(recipient Recipient, message string, options *SendOptions) error {
func (b *Bot) SendMessage(recipient Recipient, message string, options *SendOptions) (*Message, error) {
params := map[string]string{
"chat_id": recipient.Destination(),
"text": message,
@ -118,11 +118,12 @@ func (b *Bot) SendMessage(recipient Recipient, message string, options *SendOpti
responseJSON, err := b.sendCommand("sendMessage", params)
if err != nil {
return err
return nil, err
}
var responseRecieved struct {
Ok bool
Result Message
Description string
}
@ -135,7 +136,7 @@ func (b *Bot) SendMessage(recipient Recipient, message string, options *SendOpti
return errors.Errorf("api error: %s", responseRecieved.Description)
}
return nil
return &responseRecieved.Result, nil
}
// ForwardMessage forwards a message to recipient.
@ -174,7 +175,7 @@ func (b *Bot) ForwardMessage(recipient Recipient, message Message) error {
// the Telegram servers, so sending the same photo object
// again, won't issue a new upload, but would make a use
// of existing file on Telegram servers.
func (b *Bot) SendPhoto(recipient Recipient, photo *Photo, options *SendOptions) error {
func (b *Bot) SendPhoto(recipient Recipient, photo *Photo, options *SendOptions) (*Message, error) {
params := map[string]string{
"chat_id": recipient.Destination(),
"caption": photo.Caption,
@ -195,7 +196,7 @@ func (b *Bot) SendPhoto(recipient Recipient, photo *Photo, options *SendOptions)
}
if err != nil {
return err
return nil, err
}
var responseRecieved struct {
@ -218,7 +219,7 @@ func (b *Bot) SendPhoto(recipient Recipient, photo *Photo, options *SendOptions)
photo.File = (*thumbnails)[len(*thumbnails)-1].File
photo.filename = filename
return nil
return &responseRecieved.Result, nil
}
// SendAudio sends an audio object to recipient.
@ -858,3 +859,242 @@ func (b *Bot) GetFileDirectURL(fileID string) (string, error) {
}
return "https://api.telegram.org/file/bot" + b.Token + "/" + f.FilePath, nil
}
// EditMessageText used to edit already sent message with known recepient and message id.
//
// On success, returns edited message object
func (b *Bot) EditMessageText(recipient Recipient, messageID int, message string, sendOptions *SendOptions) (*Message, error) {
params := map[string]string{
"chat_id": recipient.Destination(),
"message_id": strconv.Itoa(messageID),
"text": message,
}
if sendOptions != nil {
embedSendOptions(params, sendOptions)
}
responseJSON, err := sendCommand("editMessageText", b.Token, params)
if err != nil {
return nil, err
}
var responseRecieved struct {
Ok bool
Description string
Message Message `json:"result"`
}
err = json.Unmarshal(responseJSON, &responseRecieved)
if err != nil {
return nil, err
}
if !responseRecieved.Ok {
return nil, fmt.Errorf("telebot: %s", responseRecieved.Description)
}
return &responseRecieved.Message, err
}
// EditInlineMessageText used to edit already sent inline message with known inline message id.
//
// On success, returns edited message object
func (b *Bot) EditInlineMessageText(messageID string, message string, sendOptions *SendOptions) (*Message, error) {
params := map[string]string{
"inline_message_id": messageID,
"text": message,
}
if sendOptions != nil {
embedSendOptions(params, sendOptions)
}
responseJSON, err := sendCommand("editMessageText", b.Token, params)
if err != nil {
return nil, err
}
var responseRecieved struct {
Ok bool
Description string
Message Message `json:"result"`
}
err = json.Unmarshal(responseJSON, &responseRecieved)
if err != nil {
return nil, err
}
if !responseRecieved.Ok {
return nil, fmt.Errorf("telebot: %s", responseRecieved.Description)
}
return &responseRecieved.Message, err
}
// EditMessageCaption used to edit already sent photo caption with known recepient and message id.
//
// On success, returns edited message object
func (b *Bot) EditMessageCaption(recipient Recipient, messageID int, caption string, inlineKeyboard *InlineKeyboardMarkup) (*Message, error) {
params := map[string]string{
"chat_id": recipient.Destination(),
"message_id": strconv.Itoa(messageID),
"caption": caption,
}
if inlineKeyboard != nil {
embedSendOptions(params, &SendOptions{
ReplyMarkup: ReplyMarkup{
InlineKeyboard: inlineKeyboard.InlineKeyboard,
},
})
}
responseJSON, err := sendCommand("editMessageCaption", b.Token, params)
if err != nil {
return nil, err
}
var responseRecieved struct {
Ok bool
Description string
Message Message `json:"result"`
}
err = json.Unmarshal(responseJSON, &responseRecieved)
if err != nil {
return nil, err
}
if !responseRecieved.Ok {
return nil, fmt.Errorf("telebot: %s", responseRecieved.Description)
}
return &responseRecieved.Message, err
}
// EditInlineMessageCaption used to edit already sent photo caption with known inline message id.
//
// On success, returns edited message object
func (b *Bot) EditInlineMessageCaption(messageID string, caption string, inlineKeyboard *InlineKeyboardMarkup) (*Message, error) {
params := map[string]string{
"inline_message_id": messageID,
"caption": caption,
}
if inlineKeyboard != nil {
embedSendOptions(params, &SendOptions{
ReplyMarkup: ReplyMarkup{
InlineKeyboard: inlineKeyboard.InlineKeyboard,
},
})
}
responseJSON, err := sendCommand("editMessageCaption", b.Token, params)
if err != nil {
return nil, err
}
var responseRecieved struct {
Ok bool
Description string
Message Message `json:"result"`
}
err = json.Unmarshal(responseJSON, &responseRecieved)
if err != nil {
return nil, err
}
if !responseRecieved.Ok {
return nil, fmt.Errorf("telebot: %s", responseRecieved.Description)
}
return &responseRecieved.Message, err
}
// EditMessageReplyMarkup used to edit already sent message inline keyboard markup with known recepient and message id.
//
// On success, returns edited message object
func (b *Bot) EditMessageReplyMarkup(recipient Recipient, messageID int, inlineKeyboard *InlineKeyboardMarkup) (*Message, error) {
params := map[string]string{
"chat_id": recipient.Destination(),
"message_id": strconv.Itoa(messageID),
}
if inlineKeyboard != nil {
embedSendOptions(params, &SendOptions{
ReplyMarkup: ReplyMarkup{
InlineKeyboard: inlineKeyboard.InlineKeyboard,
},
})
}
responseJSON, err := sendCommand("editMessageReplyMarkup", b.Token, params)
if err != nil {
return nil, err
}
var responseRecieved struct {
Ok bool
Description string
Message Message `json:"result"`
}
err = json.Unmarshal(responseJSON, &responseRecieved)
if err != nil {
return nil, err
}
if !responseRecieved.Ok {
return nil, fmt.Errorf("telebot: %s", responseRecieved.Description)
}
return &responseRecieved.Message, err
}
// EditInlineMessageReplyMarkup used to edit already sent message inline keyboard markup with known inline message id.
//
// On success, returns edited message object
func (b *Bot) EditInlineMessageReplyMarkup(messageID string, caption string, inlineKeyboard *InlineKeyboardMarkup) (*Message, error) {
params := map[string]string{
"inline_message_id": messageID,
}
if inlineKeyboard != nil {
embedSendOptions(params, &SendOptions{
ReplyMarkup: ReplyMarkup{
InlineKeyboard: inlineKeyboard.InlineKeyboard,
},
})
}
responseJSON, err := sendCommand("editMessageReplyMarkup", b.Token, params)
if err != nil {
return nil, err
}
var responseRecieved struct {
Ok bool
Description string
Message Message `json:"result"`
}
err = json.Unmarshal(responseJSON, &responseRecieved)
if err != nil {
return nil, err
}
if !responseRecieved.Ok {
return nil, fmt.Errorf("telebot: %s", responseRecieved.Description)
}
return &responseRecieved.Message, err
}

Write Preview
Loading…
Cancel
Save