From 9268c6dff7a103914bfeb4d9ee3f14e19965339e Mon Sep 17 00:00:00 2001 From: dande Date: Sat, 25 Apr 2020 15:59:53 +0300 Subject: [PATCH] dice: added constants --- bot.go | 2 +- media.go | 4 ++-- message.go | 2 +- sendable.go | 2 +- telebot.go | 7 +++++++ 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bot.go b/bot.go index cb87455..1c6356c 100644 --- a/bot.go +++ b/bot.go @@ -487,7 +487,7 @@ func (b *Bot) handleMedia(m *Message) bool { b.handle(OnLocation, m) case m.Venue != nil: b.handle(OnVenue, m) - case m.DiceResult != nil: + case m.Dice != nil: b.handle(OnDice, m) default: return false diff --git a/media.go b/media.go index b0c57d4..eba4c19 100644 --- a/media.go +++ b/media.go @@ -212,6 +212,6 @@ type Venue struct { } type Dice struct { - EmojiType string `json:"emoji"` - Value int `json:"value"` + Type DiceType `json:"emoji"` + Value int `json:"value"` } diff --git a/message.go b/message.go index b41bbf1..9e2d178 100644 --- a/message.go +++ b/message.go @@ -192,7 +192,7 @@ type Message struct { // Inline keyboard attached to the message. ReplyMarkup InlineKeyboardMarkup `json:"reply_markup"` - DiceResult *Dice `json:"dice"` + Dice *Dice `json:"dice"` } // MessageEntity object represents "special" parts of text messages, diff --git a/sendable.go b/sendable.go index 9fc2744..9b9597b 100644 --- a/sendable.go +++ b/sendable.go @@ -356,7 +356,7 @@ func (p *Poll) Send(b *Bot, to Recipient, opt *SendOptions) (*Message, error) { func (d *Dice) Send(b *Bot, to Recipient, opt *SendOptions) (*Message, error) { params := map[string]string{ "chat_id": to.Recipient(), - "emoji": d.EmojiType, + "emoji": string(d.Type), } embedSendOptions(params, opt) data, err := b.Raw("sendDice", params) diff --git a/telebot.go b/telebot.go index 085ab9c..d48e13c 100644 --- a/telebot.go +++ b/telebot.go @@ -200,3 +200,10 @@ const ( ) const DefaultApiURL = "https://api.telegram.org" + +type DiceType string + +var ( + Cube = &Dice{Type: "🎲"} + Dart = &Dice{Type: "🎯"} +)