summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/tgbot/Api.h2
-rw-r--r--include/tgbot/types/Dice.h4
-rw-r--r--include/tgbot/types/InlineQueryResult.h19
-rw-r--r--include/tgbot/types/InlineQueryResultGif.h15
-rw-r--r--include/tgbot/types/InlineQueryResultMpeg4Gif.h16
-rw-r--r--include/tgbot/types/Message.h5
6 files changed, 45 insertions, 16 deletions
diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h
index 9613c15..c2ba2e3 100644
--- a/include/tgbot/Api.h
+++ b/include/tgbot/Api.h
@@ -378,7 +378,7 @@ public:
* @brief Use this method to send a dice, which will have a random value from 1 to 6.
*
* @param chatId Unique identifier for the target chat or username of the target channel (in the format @channelusername)
- * @param emoji Optional. Emoji on which the dice throw animation is based. Currently, must be one of “🎲” or “🎯”. Defauts to “🎲”
+ * @param emoji Optional. Emoji on which the dice throw animation is based. Currently, must be one of “🎲”, “🎯”, or “🏀”. Dice can have values 1-6 for “🎲” and “🎯”, and values 1-5 for “🏀”. Defaults to “🎲”
* @param disableNotification Optional. Sends the message silently. Users will receive a notification with no sound.
* @param replyToMessageId Optional. If the message is a reply, ID of the original message
* @param replyMarkup Optional. Additional interface options. A JSON-serialized object for an inline keyboard, custom reply keyboard, instructions to remove reply keyboard or to force a reply from the user.
diff --git a/include/tgbot/types/Dice.h b/include/tgbot/types/Dice.h
index 3179f4a..4c2a68e 100644
--- a/include/tgbot/types/Dice.h
+++ b/include/tgbot/types/Dice.h
@@ -6,7 +6,7 @@
namespace TgBot {
/**
- * @brief This object represents a dice with a random value from 1 to 6 for currently supported base emoji.
+ * @brief This object represents an animated emoji that displays a random value.
*
* @ingroup types
*/
@@ -21,7 +21,7 @@ public:
std::string emoji;
/**
- * @brief Value of the dice, 1-6 for currently supported base emoji
+ * @brief Value of the dice, 1-6 for “🎲” and “🎯” base emoji, 1-5 for “🏀” base emoji
*/
std::int8_t value;
};
diff --git a/include/tgbot/types/InlineQueryResult.h b/include/tgbot/types/InlineQueryResult.h
index ee385f9..5674015 100644
--- a/include/tgbot/types/InlineQueryResult.h
+++ b/include/tgbot/types/InlineQueryResult.h
@@ -23,32 +23,41 @@ public:
virtual ~InlineQueryResult() { }
/**
- * @brief Type of the result.
+ * @brief Type of the result
*/
std::string type;
/**
- * @brief Unique identifier for this result. (1-64 bytes)
+ * @brief Unique identifier for this result, 1-64 bytes
*/
std::string id;
/**
- * @brief Requred, optional or missing. See description of derived classes. Title of the result.
+ * @brief Requred, optional or missing. See description of derived classes.
+ * Title for the result
*/
std::string title;
/**
- * @brief Optional or missing. See description of derived classes. Caption of the file to be sent, 0-200 characters
+ * @brief Optional or missing. See description of derived classes.
+ * Caption of the file to be sent, 0-1024 characters after entities parsing
*/
std::string caption;
/**
+ * @brief Optional or missing. See description of derived classes.
+ * Mode for parsing entities in the caption.
+ */
+ std::string parseMode;
+
+ /**
* @brief Optional. Inline keyboard attached to the message
*/
InlineKeyboardMarkup::Ptr replyMarkup;
/**
- * @brief Requred, optional or missing. See description of derived classes. Content of the message to be sent
+ * @brief Requred, optional or missing. See description of derived classes.
+ * Content of the message to be sent
*/
InputMessageContent::Ptr inputMessageContent;
};
diff --git a/include/tgbot/types/InlineQueryResultGif.h b/include/tgbot/types/InlineQueryResultGif.h
index e957d0f..118da7b 100644
--- a/include/tgbot/types/InlineQueryResultGif.h
+++ b/include/tgbot/types/InlineQueryResultGif.h
@@ -11,6 +11,8 @@ namespace TgBot {
/**
* @brief Represents a link to an animated GIF file.
+ * By default, this animated GIF file will be sent by the user with optional caption.
+ * Alternatively, you can use @ref InlineQueryResult::inputMessageContent to send a message with the specified content instead of the animation.
*
* @ingroup types
*/
@@ -27,17 +29,17 @@ public:
}
/**
- * @brief A valid URL for the GIF file.
+ * @brief A valid URL for the GIF file. File size must not exceed 1MB
*/
std::string gifUrl;
/**
- * @brief Optional. Width of the GIF.
+ * @brief Optional. Width of the GIF
*/
std::int32_t gifWidth;
/**
- * @brief Optional. Height of the GIF.
+ * @brief Optional. Height of the GIF
*/
std::int32_t gifHeight;
@@ -47,10 +49,15 @@ public:
std::int32_t gifDuration;
/**
- * @brief URL of the static thumbnail for the result (jpeg or gif)
+ * @brief URL of the static (JPEG or GIF) or animated (MPEG4) thumbnail for the result
*/
std::string thumbUrl;
+ /**
+ * @brief Optional. MIME type of the thumbnail, must be one of “image/jpeg”, “image/gif”, or “video/mp4”.
+ * Defaults to “image/jpeg”
+ */
+ std::string thumbMimeType;
};
}
diff --git a/include/tgbot/types/InlineQueryResultMpeg4Gif.h b/include/tgbot/types/InlineQueryResultMpeg4Gif.h
index 2109e7b..f6319a9 100644
--- a/include/tgbot/types/InlineQueryResultMpeg4Gif.h
+++ b/include/tgbot/types/InlineQueryResultMpeg4Gif.h
@@ -9,6 +9,8 @@ namespace TgBot {
/**
* @brief Represents a link to a video animation (H.264/MPEG-4 AVC video without sound).
+ * By default, this animated MPEG-4 file will be sent by the user with optional caption.
+ * Alternatively, you can use @ref InlineQueryResult::inputMessageContent to send a message with the specified content instead of the animation.
*
* @ingroup types
*/
@@ -26,29 +28,35 @@ public:
/**
* @brief A valid URL for the MP4 file.
+ * File size must not exceed 1MB
*/
std::string mpeg4Url;
/**
- * @brief Optional. Video width.
+ * @brief Optional. Video width
*/
std::int32_t mpeg4Width;
/**
- * @brief Optional. Video height.
+ * @brief Optional. Video height
*/
std::int32_t mpeg4Height;
/**
- * @brief Optional. Video duration.
+ * @brief Optional. Video duration
*/
std::int32_t mpeg4Duration;
/**
- * @brief URL of the static thumbnail (jpeg or gif) for the result
+ * @brief URL of the static (JPEG or GIF) or animated (MPEG4) thumbnail for the result
*/
std::string thumbUrl;
+ /**
+ * @brief Optional. MIME type of the thumbnail, must be one of “image/jpeg”, “image/gif”, or “video/mp4”.
+ * Defaults to “image/jpeg”
+ */
+ std::string thumbMimeType;
};
}
diff --git a/include/tgbot/types/Message.h b/include/tgbot/types/Message.h
index 41612d1..753e393 100644
--- a/include/tgbot/types/Message.h
+++ b/include/tgbot/types/Message.h
@@ -96,6 +96,11 @@ public:
Message::Ptr replyToMessage;
/**
+ * @brief Optional. Bot through which the message was sent
+ */
+ User::Ptr viaBot;
+
+ /**
* @brief Optional. Date the message was last edited in Unix time
*/
std::int32_t editDate;