From 678d9ffbf9997326a307b9119474de2a72ad40f7 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 29 Aug 2024 12:34:40 +0300 Subject: [PATCH] Added support of giveaway prize action messages to export to JSON. --- .../SourceFiles/export/data/export_data_types.cpp | 11 +++++++---- Telegram/SourceFiles/export/data/export_data_types.h | 3 +++ .../SourceFiles/export/output/export_output_json.cpp | 7 ++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp index 54fa1632e..4ef1ae7ea 100644 --- a/Telegram/SourceFiles/export/data/export_data_types.cpp +++ b/Telegram/SourceFiles/export/data/export_data_types.cpp @@ -1565,10 +1565,13 @@ ServiceAction ParseServiceAction( content.credits = data.vstars().v; result.content = content; }, [&](const MTPDmessageActionPrizeStars &data) { - auto content = ActionPrizeStars(); - content.peerId = ParsePeerId(data.vboost_peer()); - content.amount = data.vstars().v; - result.content = content; + result.content = ActionPrizeStars{ + .peerId = ParsePeerId(data.vboost_peer()), + .amount = data.vstars().v, + .transactionId = data.vtransaction_id().v, + .giveawayMsgId = data.vgiveaway_msg_id().v, + .isUnclaimed = data.is_unclaimed(), + }; }, [](const MTPDmessageActionEmpty &data) {}); return result; } diff --git a/Telegram/SourceFiles/export/data/export_data_types.h b/Telegram/SourceFiles/export/data/export_data_types.h index 59d53aea2..a708f01b4 100644 --- a/Telegram/SourceFiles/export/data/export_data_types.h +++ b/Telegram/SourceFiles/export/data/export_data_types.h @@ -611,6 +611,9 @@ struct ActionGiftStars { struct ActionPrizeStars { PeerId peerId = 0; uint64 amount = 0; + Utf8String transactionId; + int32 giveawayMsgId = 0; + bool isUnclaimed = false; }; struct ServiceAction { diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp index 8244b8c69..964193a7b 100644 --- a/Telegram/SourceFiles/export/output/export_output_json.cpp +++ b/Telegram/SourceFiles/export/output/export_output_json.cpp @@ -644,7 +644,12 @@ QByteArray SerializeMessage( }, [&](const ActionPrizeStars &data) { pushActor(); pushAction("stars_prize"); - push("stars", data.amount); AssertIsDebug(); + push("boost_peer_id", data.peerId); + pushBare("boost_peer_name", wrapPeerName(data.peerId)); + push("stars", data.amount); + push("is_unclaimed", data.isUnclaimed); + push("giveaway_msg_id", data.giveawayMsgId); + push("transaction_id", data.transactionId); }, [](v::null_t) {}); if (v::is_null(message.action.content)) {