summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Api.cpp258
-rw-r--r--src/TgTypeParser.cpp125
2 files changed, 326 insertions, 57 deletions
diff --git a/src/Api.cpp b/src/Api.cpp
index 9eefc09..a80feb1 100644
--- a/src/Api.cpp
+++ b/src/Api.cpp
@@ -116,11 +116,15 @@ Message::Ptr Api::sendMessage(boost::variant<std::int64_t, std::string> chatId,
bool disableNotification,
const std::vector<MessageEntity::Ptr>& entities,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(10);
+ args.reserve(11);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
args.emplace_back("text", text);
if (!parseMode.empty()) {
args.emplace_back("parse_mode", parseMode);
@@ -154,11 +158,15 @@ Message::Ptr Api::forwardMessage(boost::variant<std::int64_t, std::string> chatI
boost::variant<std::int64_t, std::string> fromChatId,
std::int32_t messageId,
bool disableNotification,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(5);
+ args.reserve(6);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
args.emplace_back("from_chat_id", fromChatId);
if (disableNotification) {
args.emplace_back("disable_notification", disableNotification);
@@ -181,11 +189,15 @@ MessageId::Ptr Api::copyMessage(boost::variant<std::int64_t, std::string> chatId
std::int32_t replyToMessageId,
bool allowSendingWithoutReply,
GenericReply::Ptr replyMarkup,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(11);
+ args.reserve(12);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
args.emplace_back("from_chat_id", fromChatId);
args.emplace_back("message_id", messageId);
if (!caption.empty()) {
@@ -225,11 +237,15 @@ Message::Ptr Api::sendPhoto(boost::variant<std::int64_t, std::string> chatId,
bool disableNotification,
const std::vector<MessageEntity::Ptr>& captionEntities,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(10);
+ args.reserve(11);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
if (photo.which() == 0) { // InputFile::Ptr
auto file = boost::get<InputFile::Ptr>(photo);
args.emplace_back("photo", file->data, true, file->mimeType, file->fileName);
@@ -277,11 +293,15 @@ Message::Ptr Api::sendAudio(boost::variant<std::int64_t, std::string> chatId,
bool disableNotification,
const std::vector<MessageEntity::Ptr>& captionEntities,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(14);
+ args.reserve(15);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
if (audio.which() == 0) { // InputFile::Ptr
auto file = boost::get<InputFile::Ptr>(audio);
args.emplace_back("audio", file->data, true, file->mimeType, file->fileName);
@@ -345,11 +365,15 @@ Message::Ptr Api::sendDocument(boost::variant<std::int64_t, std::string> chatId,
const std::vector<MessageEntity::Ptr>& captionEntities,
bool disableContentTypeDetection,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(12);
+ args.reserve(13);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
if (document.which() == 0) { // InputFile::Ptr
auto file = boost::get<InputFile::Ptr>(document);
args.emplace_back("document", file->data, true, file->mimeType, file->fileName);
@@ -410,11 +434,15 @@ Message::Ptr Api::sendVideo(boost::variant<std::int64_t, std::string> chatId,
bool disableNotification,
const std::vector<MessageEntity::Ptr>& captionEntities,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(15);
+ args.reserve(16);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
if (video.which() == 0) { // InputFile::Ptr
auto file = boost::get<InputFile::Ptr>(video);
args.emplace_back("video", file->data, true, file->mimeType, file->fileName);
@@ -483,11 +511,15 @@ Message::Ptr Api::sendAnimation(boost::variant<std::int64_t, std::string> chatId
bool disableNotification,
const std::vector<MessageEntity::Ptr>& captionEntities,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(14);
+ args.reserve(15);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
if (animation.which() == 0) { // InputFile::Ptr
auto file = boost::get<InputFile::Ptr>(animation);
args.emplace_back("animation", file->data, true, file->mimeType, file->fileName);
@@ -550,11 +582,15 @@ Message::Ptr Api::sendVoice(boost::variant<std::int64_t, std::string> chatId,
bool disableNotification,
const std::vector<MessageEntity::Ptr>& captionEntities,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(11);
+ args.reserve(12);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
if (voice.which() == 0) { // InputFile::Ptr
auto file = boost::get<InputFile::Ptr>(voice);
args.emplace_back("voice", file->data, true, file->mimeType, file->fileName);
@@ -601,11 +637,15 @@ Message::Ptr Api::sendVideoNote(boost::variant<std::int64_t, std::string> chatId
boost::variant<InputFile::Ptr, std::string> thumb,
GenericReply::Ptr replyMarkup,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(10);
+ args.reserve(11);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
if (videoNote.which() == 0) { // InputFile::Ptr
auto file = boost::get<InputFile::Ptr>(videoNote);
args.emplace_back("video_note", file->data, true, file->mimeType, file->fileName);
@@ -651,11 +691,15 @@ std::vector<Message::Ptr> Api::sendMediaGroup(boost::variant<std::int64_t, std::
bool disableNotification,
std::int32_t replyToMessageId,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(6);
+ args.reserve(7);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
args.emplace_back("media", _tgTypeParser.parseArray<InputMedia>(&TgTypeParser::parseInputMedia, media));
if (disableNotification) {
args.emplace_back("disable_notification", disableNotification);
@@ -684,11 +728,15 @@ Message::Ptr Api::sendLocation(boost::variant<std::int64_t, std::string> chatId,
std::int32_t heading,
std::int32_t proximityAlertRadius,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(12);
+ args.reserve(13);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
args.emplace_back("latitude", latitude);
args.emplace_back("longitude", longitude);
if (horizontalAccuracy) {
@@ -797,11 +845,15 @@ Message::Ptr Api::sendVenue(boost::variant<std::int64_t, std::string> chatId,
const std::string& googlePlaceId,
const std::string& googlePlaceType,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(14);
+ args.reserve(15);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
args.emplace_back("latitude", latitude);
args.emplace_back("longitude", longitude);
args.emplace_back("title", title);
@@ -838,19 +890,23 @@ Message::Ptr Api::sendVenue(boost::variant<std::int64_t, std::string> chatId,
}
Message::Ptr Api::sendContact(boost::variant<std::int64_t, std::string> chatId,
- const std::string& phoneNumber,
- const std::string& firstName,
- const std::string& lastName ,
- const std::string& vcard,
- bool disableNotification,
- std::int32_t replyToMessageId,
- GenericReply::Ptr replyMarkup,
- bool allowSendingWithoutReply,
- bool protectContent) const {
+ const std::string& phoneNumber,
+ const std::string& firstName,
+ const std::string& lastName ,
+ const std::string& vcard,
+ bool disableNotification,
+ std::int32_t replyToMessageId,
+ GenericReply::Ptr replyMarkup,
+ bool allowSendingWithoutReply,
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(10);
+ args.reserve(11);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
args.emplace_back("phone_number", phoneNumber);
args.emplace_back("first_name", firstName);
if (!lastName.empty()) {
@@ -895,11 +951,15 @@ Message::Ptr Api::sendPoll(boost::variant<std::int64_t, std::string> chatId,
std::int32_t closeDate,
bool isClosed,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(18);
+ args.reserve(19);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
args.emplace_back("question", question);
args.emplace_back("options", _tgTypeParser.parseArray<std::string>(
[](const std::string& option)->std::string {
@@ -960,11 +1020,15 @@ Message::Ptr Api::sendDice(boost::variant<std::int64_t, std::string> chatId,
GenericReply::Ptr replyMarkup,
const std::string& emoji,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(7);
+ args.reserve(8);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
if (!emoji.empty()) {
args.emplace_back("emoji", emoji);
}
@@ -1087,9 +1151,10 @@ bool Api::promoteChatMember(boost::variant<std::int64_t, std::string> chatId,
bool isAnonymous,
bool canManageChat,
bool canManageVideoChats,
- bool canRestrictMembers) const {
+ bool canRestrictMembers,
+ bool canManageTopics) const {
std::vector<HttpReqArg> args;
- args.reserve(13);
+ args.reserve(14);
args.emplace_back("chat_id", chatId);
args.emplace_back("user_id", userId);
@@ -1126,6 +1191,9 @@ bool Api::promoteChatMember(boost::variant<std::int64_t, std::string> chatId,
if (canPinMessages) {
args.emplace_back("can_pin_messages", canPinMessages);
}
+ if (canManageTopics) {
+ args.emplace_back("can_manage_topics", canManageTopics);
+ }
return sendRequest("promoteChatMember", args).get<bool>("", false);
}
@@ -1418,6 +1486,88 @@ bool Api::deleteChatStickerSet(boost::variant<std::int64_t, std::string> chatId)
return sendRequest("deleteChatStickerSet", args).get<bool>("", false);
}
+std::vector<Sticker::Ptr> Api::getForumTopicIconStickers() const {
+ return _tgTypeParser.parseJsonAndGetArray<Sticker>(&TgTypeParser::parseJsonAndGetSticker, sendRequest("getForumTopicIconStickers"));
+}
+
+ForumTopic::Ptr Api::createForumTopic(boost::variant<std::int64_t, std::string> chatId,
+ const std::string& name,
+ std::int32_t iconColor,
+ const std::string& iconCustomEmojiId) const {
+ std::vector<HttpReqArg> args;
+ args.reserve(4);
+
+ args.emplace_back("chat_id", chatId);
+ args.emplace_back("name", name);
+ if (iconColor != 0) {
+ args.emplace_back("icon_color", iconColor);
+ }
+ if (!iconCustomEmojiId.empty()) {
+ args.emplace_back("icon_custom_emoji_id", iconCustomEmojiId);
+ }
+
+ return _tgTypeParser.parseJsonAndGetForumTopic(sendRequest("createForumTopic", args));
+}
+
+bool Api::editForumTopic(boost::variant<std::int64_t, std::string> chatId,
+ std::int32_t messageThreadId,
+ const std::string& name,
+ const std::string& iconCustomEmojiId) const {
+ std::vector<HttpReqArg> args;
+ args.reserve(4);
+
+ args.emplace_back("chat_id", chatId);
+ args.emplace_back("message_thread_id", messageThreadId);
+ args.emplace_back("name", name);
+ args.emplace_back("icon_custom_emoji_id", iconCustomEmojiId);
+
+ return sendRequest("editForumTopic", args).get<bool>("", false);
+}
+
+bool Api::closeForumTopic(boost::variant<std::int64_t, std::string> chatId,
+ std::int32_t messageThreadId) const {
+ std::vector<HttpReqArg> args;
+ args.reserve(2);
+
+ args.emplace_back("chat_id", chatId);
+ args.emplace_back("message_thread_id", messageThreadId);
+
+ return sendRequest("closeForumTopic", args).get<bool>("", false);
+ }
+
+bool Api::reopenForumTopic(boost::variant<std::int64_t, std::string> chatId,
+ std::int32_t messageThreadId) const {
+ std::vector<HttpReqArg> args;
+ args.reserve(2);
+
+ args.emplace_back("chat_id", chatId);
+ args.emplace_back("message_thread_id", messageThreadId);
+
+ return sendRequest("reopenForumTopic", args).get<bool>("", false);
+}
+
+bool Api::deleteForumTopic(boost::variant<std::int64_t, std::string> chatId,
+ std::int32_t messageThreadId) const {
+ std::vector<HttpReqArg> args;
+ args.reserve(2);
+
+ args.emplace_back("chat_id", chatId);
+ args.emplace_back("message_thread_id", messageThreadId);
+
+ return sendRequest("deleteForumTopic", args).get<bool>("", false);
+}
+
+bool Api::unpinAllForumTopicMessages(boost::variant<std::int64_t, std::string> chatId,
+ std::int32_t messageThreadId) const {
+ std::vector<HttpReqArg> args;
+ args.reserve(2);
+
+ args.emplace_back("chat_id", chatId);
+ args.emplace_back("message_thread_id", messageThreadId);
+
+ return sendRequest("unpinAllForumTopicMessages", args).get<bool>("", false);
+}
+
bool Api::answerCallbackQuery(const std::string& callbackQueryId,
const std::string& text,
bool showAlert,
@@ -1716,11 +1866,15 @@ Message::Ptr Api::sendSticker(boost::variant<std::int64_t, std::string> chatId,
GenericReply::Ptr replyMarkup,
bool disableNotification,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(7);
+ args.reserve(8);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
if (sticker.which() == 0) { // InputFile::Ptr
auto file = boost::get<InputFile::Ptr>(sticker);
args.emplace_back("sticker", file->data, true, file->mimeType, file->fileName);
@@ -1954,11 +2108,15 @@ Message::Ptr Api::sendInvoice(boost::variant<std::int64_t, std::string> chatId,
std::int32_t maxTipAmount,
const std::vector<std::int32_t>& suggestedTipAmounts,
const std::string& startParameter,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(27);
+ args.reserve(28);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
args.emplace_back("title", title);
args.emplace_back("description", description);
args.emplace_back("payload", payload);
@@ -2155,11 +2313,15 @@ Message::Ptr Api::sendGame(std::int64_t chatId,
InlineKeyboardMarkup::Ptr replyMarkup,
bool disableNotification,
bool allowSendingWithoutReply,
- bool protectContent) const {
+ bool protectContent,
+ std::int32_t messageThreadId) const {
std::vector<HttpReqArg> args;
- args.reserve(7);
+ args.reserve(8);
args.emplace_back("chat_id", chatId);
+ if (messageThreadId != 0) {
+ args.emplace_back("message_thread_id", messageThreadId);
+ }
args.emplace_back("game_short_name", gameShortName);
if (disableNotification) {
args.emplace_back("disable_notification", disableNotification);
diff --git a/src/TgTypeParser.cpp b/src/TgTypeParser.cpp
index 1f49489..3745e1c 100644
--- a/src/TgTypeParser.cpp
+++ b/src/TgTypeParser.cpp
@@ -145,7 +145,13 @@ Chat::Ptr TgTypeParser::parseJsonAndGetChat(const boost::property_tree::ptree& d
result->username = data.get<std::string>("username", "");
result->firstName = data.get<std::string>("first_name", "");
result->lastName = data.get<std::string>("last_name", "");
+ result->isForum = data.get<bool>("is_forum", false);
result->photo = tryParseJson<ChatPhoto>(&TgTypeParser::parseJsonAndGetChatPhoto, data, "photo");
+ result->activeUsernames = parseJsonAndGetArray<std::string>(
+ [] (const boost::property_tree::ptree& innerData)->std::string {
+ return innerData.get<std::string>("");
+ }, data, "active_usernames");
+ result->emojiStatusCustomEmojiId = data.get<std::string>("emoji_status_custom_emoji_id", "");
result->bio = data.get<std::string>("bio", "");
result->hasPrivateForwards = data.get<bool>("has_private_forwards", false);
result->hasRestrictedVoiceAndVideoMessages = data.get<bool>("has_restricted_voice_and_video_messages", false);
@@ -185,7 +191,13 @@ std::string TgTypeParser::parseChat(const Chat::Ptr& object) const {
appendToJson(result, "username", object->username);
appendToJson(result, "first_name", object->firstName);
appendToJson(result, "last_name", object->lastName);
+ appendToJson(result, "is_forum", object->isForum);
appendToJson(result, "photo", parseChatPhoto(object->photo));
+ appendToJson(result, "active_usernames",
+ parseArray<std::string>([] (const std::string& s)->std::string {
+ return s;
+ }, object->activeUsernames));
+ appendToJson(result, "emoji_status_custom_emoji_id", object->emojiStatusCustomEmojiId);
appendToJson(result, "bio", object->bio);
appendToJson(result, "has_private_forwards", object->hasPrivateForwards);
appendToJson(result, "has_restricted_voice_and_video_messages", object->hasRestrictedVoiceAndVideoMessages);
@@ -210,6 +222,7 @@ std::string TgTypeParser::parseChat(const Chat::Ptr& object) const {
Message::Ptr TgTypeParser::parseJsonAndGetMessage(const boost::property_tree::ptree& data) const {
auto result(std::make_shared<Message>());
result->messageId = data.get<std::int32_t>("message_id", 0);
+ result->messageThreadId = data.get<std::int32_t>("message_thread_id", 0);
result->from = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "from");
result->senderChat = tryParseJson<Chat>(&TgTypeParser::parseJsonAndGetChat, data, "sender_chat");
result->date = data.get<std::int32_t>("date", 0);
@@ -220,6 +233,7 @@ Message::Ptr TgTypeParser::parseJsonAndGetMessage(const boost::property_tree::pt
result->forwardSignature = data.get<std::string>("forward_signature", "");
result->forwardSenderName = data.get<std::string>("forward_sender_name", "");
result->forwardDate = data.get<std::int32_t>("forward_date", 0);
+ result->isTopicMessage = data.get<bool>("is_topic_message", false);
result->isAutomaticForward = data.get<bool>("is_automatic_forward", false);
result->replyToMessage = tryParseJson<Message>(&TgTypeParser::parseJsonAndGetMessage, data, "reply_to_message");
result->viaBot = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "via_bot");
@@ -261,8 +275,10 @@ Message::Ptr TgTypeParser::parseJsonAndGetMessage(const boost::property_tree::pt
result->successfulPayment = tryParseJson<SuccessfulPayment>(&TgTypeParser::parseJsonAndGetSuccessfulPayment, data, "successful_payment");
result->connectedWebsite = data.get<std::string>("connected_website", "");
result->passportData = tryParseJson<PassportData>(&TgTypeParser::parseJsonAndGetPassportData, data, "passport_data");
- result->passportData = tryParseJson<PassportData>(&TgTypeParser::parseJsonAndGetPassportData, data, "passport_data");
result->proximityAlertTriggered = tryParseJson<ProximityAlertTriggered>(&TgTypeParser::parseJsonAndGetProximityAlertTriggered, data, "proximity_alert_triggered");
+ result->forumTopicCreated = tryParseJson<ForumTopicCreated>(&TgTypeParser::parseJsonAndGetForumTopicCreated, data, "forum_topic_created");
+ result->forumTopicClosed = tryParseJson<ForumTopicClosed>(&TgTypeParser::parseJsonAndGetForumTopicClosed, data, "forum_topic_closed");
+ result->forumTopicReopened = tryParseJson<ForumTopicReopened>(&TgTypeParser::parseJsonAndGetForumTopicReopened, data, "forum_topic_reopened");
result->videoChatScheduled = tryParseJson<VideoChatScheduled>(&TgTypeParser::parseJsonAndGetVideoChatScheduled, data, "video_chat_scheduled");
result->videoChatStarted = tryParseJson<VideoChatStarted>(&TgTypeParser::parseJsonAndGetVideoChatStarted, data, "video_chat_started");
result->videoChatEnded = tryParseJson<VideoChatEnded>(&TgTypeParser::parseJsonAndGetVideoChatEnded, data, "video_chat_ended");
@@ -279,6 +295,7 @@ std::string TgTypeParser::parseMessage(const Message::Ptr& object) const {
std::string result;
result += '{';
appendToJson(result, "message_id", object->messageId);
+ appendToJson(result, "message_thread_id", object->messageThreadId);
appendToJson(result, "from", parseUser(object->from));
appendToJson(result, "sender_chat", parseChat(object->senderChat));
appendToJson(result, "date", object->date);
@@ -289,6 +306,7 @@ std::string TgTypeParser::parseMessage(const Message::Ptr& object) const {
appendToJson(result, "forward_signature", object->forwardSignature);
appendToJson(result, "forward_sender_name", object->forwardSenderName);
appendToJson(result, "forward_date", object->forwardDate);
+ appendToJson(result, "is_topic_message", object->isTopicMessage);
appendToJson(result, "is_automatic_forward", object->isAutomaticForward);
appendToJson(result, "reply_to_message", parseMessage(object->replyToMessage));
appendToJson(result, "via_bot", parseUser(object->viaBot));
@@ -331,6 +349,9 @@ std::string TgTypeParser::parseMessage(const Message::Ptr& object) const {
appendToJson(result, "connected_website", object->connectedWebsite);
appendToJson(result, "passport_data", parsePassportData(object->passportData));
appendToJson(result, "proximity_alert_triggered", parseProximityAlertTriggered(object->proximityAlertTriggered));
+ appendToJson(result, "forum_topic_created", parseForumTopicCreated(object->forumTopicCreated));
+ appendToJson(result, "forum_topic_closed", parseForumTopicClosed(object->forumTopicClosed));
+ appendToJson(result, "forum_topic_reopened", parseForumTopicReopened(object->forumTopicReopened));
appendToJson(result, "video_chat_scheduled", parseVideoChatScheduled(object->videoChatScheduled));
appendToJson(result, "video_chat_started", parseVideoChatStarted(object->videoChatStarted));
appendToJson(result, "video_chat_ended", parseVideoChatEnded(object->videoChatEnded));
@@ -922,6 +943,60 @@ std::string TgTypeParser::parseMessageAutoDeleteTimerChanged(const MessageAutoDe
return result;
}
+ForumTopicCreated::Ptr TgTypeParser::parseJsonAndGetForumTopicCreated(const boost::property_tree::ptree& data) const {
+ auto result(std::make_shared<ForumTopicCreated>());
+ result->name = data.get<std::string>("name", "");
+ result->iconColor = data.get<std::int32_t>("icon_color", 0);
+ result->iconCustomEmojiId = data.get<std::string>("icon_custom_emoji_id", "");
+ return result;
+}
+
+std::string TgTypeParser::parseForumTopicCreated(const ForumTopicCreated::Ptr& object) const {
+ if (!object) {
+ return "";
+ }
+ std::string result;
+ result += '{';
+ appendToJson(result, "name", object->name);
+ appendToJson(result, "icon_color", object->iconColor);
+ appendToJson(result, "icon_custom_emoji_id", object->iconCustomEmojiId);
+ removeLastComma(result);
+ result += '}';
+ return result;
+}
+
+ForumTopicClosed::Ptr TgTypeParser::parseJsonAndGetForumTopicClosed(const boost::property_tree::ptree& data) const {
+ auto result(std::make_shared<ForumTopicClosed>());
+ return result;
+}
+
+std::string TgTypeParser::parseForumTopicClosed(const ForumTopicClosed::Ptr& object) const {
+ if (!object) {
+ return "";
+ }
+ std::string result;
+ result += '{';
+ //removeLastComma(result);
+ result += '}';
+ return result;
+}
+
+ForumTopicReopened::Ptr TgTypeParser::parseJsonAndGetForumTopicReopened(const boost::property_tree::ptree& data) const {
+ auto result(std::make_shared<ForumTopicReopened>());
+ return result;
+}
+
+std::string TgTypeParser::parseForumTopicReopened(const ForumTopicReopened::Ptr& object) const {
+ if (!object) {
+ return "";
+ }
+ std::string result;
+ result += '{';
+ //removeLastComma(result);
+ result += '}';
+ return result;
+}
+
VideoChatScheduled::Ptr TgTypeParser::parseJsonAndGetVideoChatScheduled(const boost::property_tree::ptree& data) const {
auto result(std::make_shared<VideoChatScheduled>());
result->startDate = data.get<std::int32_t>("start_date", 0);
@@ -1363,6 +1438,7 @@ ChatAdministratorRights::Ptr TgTypeParser::parseJsonAndGetChatAdministratorRight
result->canPostMessages = data.get<bool>("can_post_messages", false);
result->canEditMessages = data.get<bool>("can_edit_messages", false);
result->canPinMessages = data.get<bool>("can_pin_messages", false);
+ result->canManageTopics = data.get<bool>("can_manage_topics", false);
return result;
}
@@ -1383,6 +1459,7 @@ std::string TgTypeParser::parseChatAdministratorRights(const ChatAdministratorRi
appendToJson(result, "can_post_messages", object->canPostMessages);
appendToJson(result, "can_edit_messages", object->canEditMessages);
appendToJson(result, "can_pin_messages", object->canPinMessages);
+ appendToJson(result, "can_manage_topics", object->canManageTopics);
removeLastComma(result);
result += '}';
return result;
@@ -1478,6 +1555,7 @@ ChatMemberAdministrator::Ptr TgTypeParser::parseJsonAndGetChatMemberAdministrato
result->canPostMessages = data.get<bool>("can_post_messages", false);
result->canEditMessages = data.get<bool>("can_edit_messages", false);
result->canPinMessages = data.get<bool>("can_pin_messages", false);
+ result->canManageTopics = data.get<bool>("can_manage_topics", false);
result->customTitle = data.get<std::string>("custom_title", "");
return result;
}
@@ -1501,6 +1579,7 @@ std::string TgTypeParser::parseChatMemberAdministrator(const ChatMemberAdministr
appendToJson(result, "can_post_messages", object->canPostMessages);
appendToJson(result, "can_edit_messages", object->canEditMessages);
appendToJson(result, "can_pin_messages", object->canPinMessages);
+ appendToJson(result, "can_manage_topics", object->canManageTopics);
appendToJson(result, "custom_title", object->customTitle);
// The last comma will be erased by parseChatMember().
return result;
@@ -1530,6 +1609,7 @@ ChatMemberRestricted::Ptr TgTypeParser::parseJsonAndGetChatMemberRestricted(cons
result->canChangeInfo = data.get<bool>("can_change_info", false);
result->canInviteUsers = data.get<bool>("can_invite_users", false);
result->canPinMessages = data.get<bool>("can_pin_messages", false);
+ result->canManageTopics = data.get<bool>("can_manage_topics", false);
result->canSendMessages = data.get<bool>("can_send_messages", false);
result->canSendMediaMessages = data.get<bool>("can_send_media_messages", false);
result->canSendPolls = data.get<bool>("can_send_polls", false);
@@ -1550,6 +1630,7 @@ std::string TgTypeParser::parseChatMemberRestricted(const ChatMemberRestricted::
appendToJson(result, "can_change_info", object->canChangeInfo);
appendToJson(result, "can_invite_users", object->canInviteUsers);
appendToJson(result, "can_pin_messages", object->canPinMessages);
+ appendToJson(result, "can_manage_topics", object->canManageTopics);
appendToJson(result, "can_send_messages", object->canSendMessages);
appendToJson(result, "can_send_media_messages", object->canSendMediaMessages);
appendToJson(result, "can_send_polls", object->canSendPolls);
@@ -1652,14 +1733,15 @@ std::string TgTypeParser::parseChatJoinRequest(const ChatJoinRequest::Ptr& objec
ChatPermissions::Ptr TgTypeParser::parseJsonAndGetChatPermissions(const boost::property_tree::ptree& data) const {
auto result(std::make_shared<ChatPermissions>());
- result->canSendMessages = data.get<bool>("can_send_messages");
- result->canSendMediaMessages = data.get<bool>("can_send_media_messages");
- result->canSendPolls = data.get<bool>("can_send_polls");
- result->canSendOtherMessages = data.get<bool>("can_send_other_messages");
- result->canAddWebPagePreviews = data.get<bool>("can_add_web_page_previews");
- result->canChangeInfo = data.get<bool>("can_change_info");
- result->canInviteUsers = data.get<bool>("can_invite_users");
- result->canPinMessages = data.get<bool>("can_pin_messages");
+ result->canSendMessages = data.get<bool>("can_send_messages", false);
+ result->canSendMediaMessages = data.get<bool>("can_send_media_messages", false);
+ result->canSendPolls = data.get<bool>("can_send_polls", false);
+ result->canSendOtherMessages = data.get<bool>("can_send_other_messages", false);
+ result->canAddWebPagePreviews = data.get<bool>("can_add_web_page_previews", false);
+ result->canChangeInfo = data.get<bool>("can_change_info", false);
+ result->canInviteUsers = data.get<bool>("can_invite_users", false);
+ result->canPinMessages = data.get<bool>("can_pin_messages", false);
+ result->canManageTopics = data.get<bool>("can_manage_topics", false);
return result;
}
@@ -1677,6 +1759,7 @@ std::string TgTypeParser::parseChatPermissions(const ChatPermissions::Ptr& objec
appendToJson(result, "can_change_info", object->canChangeInfo);
appendToJson(result, "can_invite_users", object->canInviteUsers);
appendToJson(result, "can_pin_messages", object->canPinMessages);
+ appendToJson(result, "can_manage_topics", object->canManageTopics);
removeLastComma(result);
result += '}';
return result;
@@ -1702,6 +1785,30 @@ std::string TgTypeParser::parseChatLocation(const ChatLocation::Ptr& object) con
return result;
}
+ForumTopic::Ptr TgTypeParser::parseJsonAndGetForumTopic(const boost::property_tree::ptree& data) const {
+ auto result(std::make_shared<ForumTopic>());
+ result->messageThreadId = data.get<std::int32_t>("message_thread_id", 0);
+ result->name = data.get<std::string>("name", "");
+ result->iconColor = data.get<std::int32_t>("icon_color", 0);
+ result->iconCustomEmojiId = data.get<std::string>("icon_custom_emoji_id", "");
+ return result;
+}
+
+std::string TgTypeParser::parseForumTopic(const ForumTopic::Ptr& object) const {
+ if (!object) {
+ return "";
+ }
+ std::string result;
+ result += '{';
+ appendToJson(result, "message_thread_id", object->messageThreadId);
+ appendToJson(result, "name", object->name);
+ appendToJson(result, "icon_color", object->iconColor);
+ appendToJson(result, "icon_custom_emoji_id", object->iconCustomEmojiId);
+ removeLastComma(result);
+ result += '}';
+ return result;
+}
+
BotCommand::Ptr TgTypeParser::parseJsonAndGetBotCommand(const boost::property_tree::ptree& data) const {
auto result(std::make_shared<BotCommand>());
result->command = data.get("command", "");
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 16:58:23 +0000