From cac9720d543970f990e2461f6bca10f3da5f490f Mon Sep 17 00:00:00 2001 From: Andrew Anfanik Date: Thu, 31 Oct 2024 18:30:56 +0200 Subject: [PATCH 1/4] Add PaidMediaPurchased to Update --- .../java/com/pengrad/telegrambot/model/Update.java | 10 +++++++++- .../telegrambot/model/paidmedia/PaidMediaPurchased.kt | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 library/src/main/java/com/pengrad/telegrambot/model/paidmedia/PaidMediaPurchased.kt diff --git a/library/src/main/java/com/pengrad/telegrambot/model/Update.java b/library/src/main/java/com/pengrad/telegrambot/model/Update.java index 65744f62..db3bb70d 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/Update.java +++ b/library/src/main/java/com/pengrad/telegrambot/model/Update.java @@ -4,6 +4,7 @@ import com.pengrad.telegrambot.model.business.BusinessMessageDeleted; import com.pengrad.telegrambot.model.chatboost.ChatBoostRemoved; import com.pengrad.telegrambot.model.chatboost.ChatBoostUpdated; +import com.pengrad.telegrambot.model.paidmedia.PaidMediaPurchased; import java.io.Serializable; import java.util.Objects; @@ -38,6 +39,7 @@ public class Update implements Serializable { private MessageReactionCountUpdated message_reaction_count; private ChatBoostUpdated chat_boost; private ChatBoostRemoved removed_chat_boost; + private PaidMediaPurchased paid_media_purchased; public Integer updateId() { return update_id; @@ -131,6 +133,10 @@ public ChatBoostRemoved removedChatBoost() { return removed_chat_boost; } + public PaidMediaPurchased paidMediaPurchased() { + return paid_media_purchased; + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -158,7 +164,8 @@ public boolean equals(Object o) { Objects.equals(message_reaction, update.message_reaction) && Objects.equals(message_reaction_count, update.message_reaction_count) && Objects.equals(chat_boost, update.chat_boost) && - Objects.equals(removed_chat_boost, update.removed_chat_boost); + Objects.equals(removed_chat_boost, update.removed_chat_boost) && + Objects.equals(paid_media_purchased, update.paid_media_purchased); } @Override @@ -192,6 +199,7 @@ public String toString() { ", message_reaction_count=" + message_reaction_count + ", chat_boost=" + chat_boost + ", removed_chat_boost=" + removed_chat_boost + + ", paid_media_purchased=" + paid_media_purchased + '}'; } } diff --git a/library/src/main/java/com/pengrad/telegrambot/model/paidmedia/PaidMediaPurchased.kt b/library/src/main/java/com/pengrad/telegrambot/model/paidmedia/PaidMediaPurchased.kt new file mode 100644 index 00000000..c364cf01 --- /dev/null +++ b/library/src/main/java/com/pengrad/telegrambot/model/paidmedia/PaidMediaPurchased.kt @@ -0,0 +1,8 @@ +package com.pengrad.telegrambot.model.paidmedia + +import com.pengrad.telegrambot.model.User + +data class PaidMediaPurchased( + @get:JvmName("user") val from: User, + @get:JvmName("paidMediaPayload") val paidMediaPayload: String +) \ No newline at end of file From 6afe542ffaae3971e5d3fbd1f62c8d9dc90728b9 Mon Sep 17 00:00:00 2001 From: Andrew Anfanik Date: Thu, 31 Oct 2024 18:36:03 +0200 Subject: [PATCH 2/4] Add paid_media_payload to SendPaidMedia and TransactionPartnerUser --- .../model/stars/partner/TransactionPartnerUser.java | 11 ++++++++++- .../pengrad/telegrambot/request/SendPaidMedia.java | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/pengrad/telegrambot/model/stars/partner/TransactionPartnerUser.java b/library/src/main/java/com/pengrad/telegrambot/model/stars/partner/TransactionPartnerUser.java index 7dbf2b47..20cb6a9a 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/stars/partner/TransactionPartnerUser.java +++ b/library/src/main/java/com/pengrad/telegrambot/model/stars/partner/TransactionPartnerUser.java @@ -14,6 +14,7 @@ public class TransactionPartnerUser extends TransactionPartner { private User user; private String invoice_payload; private PaidMedia[] paid_media; + private String paid_media_payload; public TransactionPartnerUser() { super(TYPE); @@ -31,13 +32,20 @@ public PaidMedia[] paidMedia() { return paid_media; } + public String paidMediaPayload() { + return paid_media_payload; + } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; if (!super.equals(o)) return false; TransactionPartnerUser that = (TransactionPartnerUser) o; - return Objects.equals(user, that.user) && Objects.equals(invoice_payload, that.invoice_payload) && Objects.deepEquals(paid_media, that.paid_media); + return Objects.equals(user, that.user) + && Objects.equals(invoice_payload, that.invoice_payload) + && Objects.deepEquals(paid_media, that.paid_media) + && Objects.equals(paid_media_payload, that.paid_media_payload); } @Override @@ -51,6 +59,7 @@ public String toString() { "user=" + user + ", invoice_payload='" + invoice_payload + '\'' + ", paid_media=" + Arrays.toString(paid_media) + + ", paid_media_payload='" + paid_media_payload + '\'' + '}'; } } diff --git a/library/src/main/java/com/pengrad/telegrambot/request/SendPaidMedia.java b/library/src/main/java/com/pengrad/telegrambot/request/SendPaidMedia.java index 6e7d0b64..36745313 100644 --- a/library/src/main/java/com/pengrad/telegrambot/request/SendPaidMedia.java +++ b/library/src/main/java/com/pengrad/telegrambot/request/SendPaidMedia.java @@ -82,4 +82,8 @@ public SendPaidMedia replyMarkup(ForceReply replyMarkup) { return add("reply_markup", replyMarkup); } + public SendPaidMedia payload(String payload) { + return add("payload", payload); + } + } From 3ca1ad8b2855760ce5dacfa82863a22397f138b2 Mon Sep 17 00:00:00 2001 From: Andrew Anfanik Date: Thu, 31 Oct 2024 18:58:00 +0200 Subject: [PATCH 3/4] Add prize_star_count to Giveaway, GiveawayWinners and ChatBoostSourceGiveaway; create GiveawayCreated and add giveaway fields to Message --- .../pengrad/telegrambot/model/Message.java | 33 +++++++++++++++++- .../source/ChatBoostSourceGiveaway.java | 18 ++++++++-- .../telegrambot/model/giveaway/Giveaway.java | 27 +++++++++++++-- .../model/giveaway/GiveawayCreated.kt | 5 +++ .../model/giveaway/GiveawayWinners.java | 34 +++++++++++++++++-- 5 files changed, 107 insertions(+), 10 deletions(-) create mode 100644 library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayCreated.kt diff --git a/library/src/main/java/com/pengrad/telegrambot/model/Message.java b/library/src/main/java/com/pengrad/telegrambot/model/Message.java index bb1d17c7..055b1ab2 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/Message.java +++ b/library/src/main/java/com/pengrad/telegrambot/model/Message.java @@ -3,6 +3,10 @@ import com.pengrad.telegrambot.model.business.BusinessConnection; import com.pengrad.telegrambot.model.chatbackground.ChatBackground; import com.pengrad.telegrambot.model.chatboost.ChatBoostAdded; +import com.pengrad.telegrambot.model.giveaway.Giveaway; +import com.pengrad.telegrambot.model.giveaway.GiveawayCompleted; +import com.pengrad.telegrambot.model.giveaway.GiveawayCreated; +import com.pengrad.telegrambot.model.giveaway.GiveawayWinners; import com.pengrad.telegrambot.model.message.MaybeInaccessibleMessage; import com.pengrad.telegrambot.model.message.origin.*; import com.pengrad.telegrambot.model.paidmedia.PaidMedia; @@ -93,8 +97,11 @@ public class Message extends MaybeInaccessibleMessage implements Serializable { private ForumTopicReopened forum_topic_reopened; private GeneralForumTopicHidden general_forum_topic_hidden; private GeneralForumTopicUnhidden general_forum_topic_unhidden; + private GiveawayCreated giveaway_created; + private Giveaway giveaway; + private GiveawayWinners giveaway_winners; + private GiveawayCompleted giveaway_completed; private WriteAccessAllowed write_access_allowed; - private VideoChatStarted video_chat_started; private VideoChatEnded video_chat_ended; private VideoChatParticipantsInvited video_chat_participants_invited; @@ -468,6 +475,22 @@ public GeneralForumTopicUnhidden generalForumTopicUnhidden() { return general_forum_topic_unhidden; } + public GiveawayCreated giveawayCreated() { + return giveaway_created; + } + + public Giveaway giveaway() { + return giveaway; + } + + public GiveawayWinners giveawayWinners() { + return giveaway_winners; + } + + public GiveawayCompleted giveawayCompleted() { + return giveaway_completed; + } + public WriteAccessAllowed writeAccessAllowed() { return write_access_allowed; } @@ -597,6 +620,10 @@ public boolean equals(Object o) { Objects.equals(forum_topic_reopened, message.forum_topic_reopened) && Objects.equals(general_forum_topic_hidden, message.general_forum_topic_hidden) && Objects.equals(general_forum_topic_unhidden, message.general_forum_topic_unhidden) && + Objects.equals(giveaway_created, message.giveaway_created) && + Objects.equals(giveaway, message.giveaway) && + Objects.equals(giveaway_winners, message.giveaway_winners) && + Objects.equals(giveaway_completed, message.giveaway_completed) && Objects.equals(write_access_allowed, message.write_access_allowed) && Objects.equals(video_chat_started, message.video_chat_started) && Objects.equals(video_chat_ended, message.video_chat_ended) && @@ -689,6 +716,10 @@ public String toString() { ", forum_topic_reopened=" + forum_topic_reopened + ", general_forum_topic_hidden=" + general_forum_topic_hidden + ", general_forum_topic_unhidden=" + general_forum_topic_unhidden + + ", giveaway_created=" + giveaway_created + + ", giveaway=" + giveaway + + ", giveaway_winners=" + giveaway_winners + + ", giveaway_completed=" + giveaway_completed + ", write_access_allowed=" + write_access_allowed + ", video_chat_started=" + video_chat_started + ", video_chat_ended=" + video_chat_ended + diff --git a/library/src/main/java/com/pengrad/telegrambot/model/chatboost/source/ChatBoostSourceGiveaway.java b/library/src/main/java/com/pengrad/telegrambot/model/chatboost/source/ChatBoostSourceGiveaway.java index 4e1b52a6..c0d00bab 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/chatboost/source/ChatBoostSourceGiveaway.java +++ b/library/src/main/java/com/pengrad/telegrambot/model/chatboost/source/ChatBoostSourceGiveaway.java @@ -11,6 +11,7 @@ public class ChatBoostSourceGiveaway extends ChatBoostSource implements Serializ private Integer giveaway_message_id; private Boolean is_unclaimed; + private Integer prize_star_count; public Integer giveawayMessageId() { return giveaway_message_id; @@ -20,18 +21,28 @@ public Boolean isUnclaimed() { return is_unclaimed != null && is_unclaimed; } + public Integer prizeStarCount() { + return prize_star_count; + } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; if (!super.equals(o)) return false; ChatBoostSourceGiveaway that = (ChatBoostSourceGiveaway) o; - return Objects.equals(giveaway_message_id, that.giveaway_message_id) && Objects.equals(is_unclaimed, that.is_unclaimed); + return Objects.equals(giveaway_message_id, that.giveaway_message_id) + && Objects.equals(is_unclaimed, that.is_unclaimed) + && Objects.equals(prize_star_count, that.prize_star_count); } @Override public int hashCode() { - return Objects.hash(super.hashCode(), giveaway_message_id, is_unclaimed); + return Objects.hash( + super.hashCode(), + giveaway_message_id, + is_unclaimed, + prize_star_count); } @Override @@ -40,7 +51,8 @@ public String toString() { "source='" + source + "'," + "user='" + user + "'," + "giveaway_message_id='" + giveaway_message_id + "'," + - "is_unclaimed='" + is_unclaimed + "'" + + "is_unclaimed='" + is_unclaimed + "'," + + "prize_star_count='" + prize_star_count + "'" + '}'; } diff --git a/library/src/main/java/com/pengrad/telegrambot/model/giveaway/Giveaway.java b/library/src/main/java/com/pengrad/telegrambot/model/giveaway/Giveaway.java index b27f9d87..0a40a104 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/giveaway/Giveaway.java +++ b/library/src/main/java/com/pengrad/telegrambot/model/giveaway/Giveaway.java @@ -19,7 +19,7 @@ public class Giveaway implements Serializable { private String prize_description; private String[] country_codes; private Integer premium_subscription_month_count; - + private Integer prize_star_count; public Chat[] chats() { return chats; @@ -45,18 +45,38 @@ public String[] countryCodes() { public Integer premiumSubscriptionMonthCount() { return premium_subscription_month_count; } + public Integer prizeStarCount() { + return prize_star_count; + } @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Giveaway giveaway = (Giveaway) o; - return Objects.deepEquals(chats, giveaway.chats) && Objects.equals(winners_selection_date, giveaway.winners_selection_date) && Objects.equals(winner_count, giveaway.winner_count) && Objects.equals(only_new_members, giveaway.only_new_members) && Objects.equals(has_public_winners, giveaway.has_public_winners) && Objects.equals(prize_description, giveaway.prize_description) && Objects.deepEquals(country_codes, giveaway.country_codes) && Objects.equals(premium_subscription_month_count, giveaway.premium_subscription_month_count); + return Objects.deepEquals(chats, giveaway.chats) + && Objects.equals(winners_selection_date, giveaway.winners_selection_date) + && Objects.equals(winner_count, giveaway.winner_count) + && Objects.equals(only_new_members, giveaway.only_new_members) + && Objects.equals(has_public_winners, giveaway.has_public_winners) + && Objects.equals(prize_description, giveaway.prize_description) + && Objects.deepEquals(country_codes, giveaway.country_codes) + && Objects.equals(premium_subscription_month_count, giveaway.premium_subscription_month_count) + && Objects.equals(prize_star_count, giveaway.prize_star_count); } @Override public int hashCode() { - return Objects.hash(Arrays.hashCode(chats), winners_selection_date, winner_count, only_new_members, has_public_winners, prize_description, Arrays.hashCode(country_codes), premium_subscription_month_count); + return Objects.hash( + Arrays.hashCode(chats), + winners_selection_date, + winner_count, + only_new_members, + has_public_winners, + prize_description, + Arrays.hashCode(country_codes), + premium_subscription_month_count, + prize_star_count); } @Override @@ -70,6 +90,7 @@ public String toString() { ", prize_description='" + prize_description + '\'' + ", country_codes=" + Arrays.toString(country_codes) + ", premium_subscription_month_count=" + premium_subscription_month_count + + ", prize_star_count=" + prize_star_count + '}'; } } diff --git a/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayCreated.kt b/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayCreated.kt new file mode 100644 index 00000000..bc230fde --- /dev/null +++ b/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayCreated.kt @@ -0,0 +1,5 @@ +package com.pengrad.telegrambot.model.giveaway + +data class GiveawayCreated( + @get:JvmName("prizeStarCount") val prizeStarCount: Int +) diff --git a/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayWinners.java b/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayWinners.java index 9b27b1d2..3f8feff6 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayWinners.java +++ b/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayWinners.java @@ -22,7 +22,7 @@ public class GiveawayWinners implements Serializable { private Boolean only_new_members; private Boolean was_refunded; private String prize_description; - + private Integer prize_star_count; public Chat chat() { return chat; @@ -68,17 +68,44 @@ public String prizeDescription() { return prize_description; } + public Integer prizeStarCount() { + return prize_star_count; + } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; GiveawayWinners that = (GiveawayWinners) o; - return Objects.equals(chat, that.chat) && Objects.equals(giveaway_message_id, that.giveaway_message_id) && Objects.equals(winners_selection_date, that.winners_selection_date) && Objects.equals(winner_count, that.winner_count) && Objects.deepEquals(winners, that.winners) && Objects.equals(additional_chat_count, that.additional_chat_count) && Objects.equals(premium_subscription_month_count, that.premium_subscription_month_count) && Objects.equals(unclaimed_prize_count, that.unclaimed_prize_count) && Objects.equals(only_new_members, that.only_new_members) && Objects.equals(was_refunded, that.was_refunded) && Objects.equals(prize_description, that.prize_description); + return Objects.equals(chat, that.chat) + && Objects.equals(giveaway_message_id, that.giveaway_message_id) + && Objects.equals(winners_selection_date, that.winners_selection_date) + && Objects.equals(winner_count, that.winner_count) + && Objects.deepEquals(winners, that.winners) + && Objects.equals(additional_chat_count, that.additional_chat_count) + && Objects.equals(premium_subscription_month_count, that.premium_subscription_month_count) + && Objects.equals(unclaimed_prize_count, that.unclaimed_prize_count) + && Objects.equals(only_new_members, that.only_new_members) + && Objects.equals(was_refunded, that.was_refunded) + && Objects.equals(prize_description, that.prize_description) + && Objects.equals(prize_star_count, that.prize_star_count); } @Override public int hashCode() { - return Objects.hash(chat, giveaway_message_id, winners_selection_date, winner_count, Arrays.hashCode(winners), additional_chat_count, premium_subscription_month_count, unclaimed_prize_count, only_new_members, was_refunded, prize_description); + return Objects.hash( + chat, + giveaway_message_id, + winners_selection_date, + winner_count, + Arrays.hashCode(winners), + additional_chat_count, + premium_subscription_month_count, + unclaimed_prize_count, + only_new_members, + was_refunded, + prize_description, + prize_star_count); } @Override @@ -95,6 +122,7 @@ public String toString() { ", only_new_members=" + only_new_members + ", was_refunded=" + was_refunded + ", prize_description='" + prize_description + '\'' + + ", prize_star_count=" + prize_star_count + '}'; } } From 138b04b19a76b83988a66bc248bb0ff59b8ec2cb Mon Sep 17 00:00:00 2001 From: Andrew Anfanik Date: Thu, 31 Oct 2024 18:59:09 +0200 Subject: [PATCH 4/4] Add is_star_giveaway to GiveawayCompleted --- .../model/giveaway/GiveawayCompleted.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayCompleted.java b/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayCompleted.java index 215dbed9..72ae23e6 100644 --- a/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayCompleted.java +++ b/library/src/main/java/com/pengrad/telegrambot/model/giveaway/GiveawayCompleted.java @@ -12,7 +12,7 @@ public class GiveawayCompleted implements Serializable { private Integer winner_count; private Integer unclaimed_prize_count; private Message giveaway_message; - + private Boolean is_star_giveaway; public Integer winnerCount() { return winner_count; @@ -26,6 +26,9 @@ public Message giveawayMessage() { return giveaway_message; } + public Boolean isStarGiveaway() { + return is_star_giveaway; + } @Override public boolean equals(Object o) { @@ -34,12 +37,17 @@ public boolean equals(Object o) { GiveawayCompleted that = (GiveawayCompleted) o; return Objects.equals(winner_count, that.winner_count) && Objects.equals(unclaimed_prize_count, that.unclaimed_prize_count) - && Objects.equals(giveaway_message, that.giveaway_message); + && Objects.equals(giveaway_message, that.giveaway_message) + && Objects.equals(is_star_giveaway, that.is_star_giveaway); } @Override public int hashCode() { - return Objects.hash(winner_count, unclaimed_prize_count, giveaway_message); + return Objects.hash( + winner_count, + unclaimed_prize_count, + giveaway_message, + is_star_giveaway); } @Override @@ -48,6 +56,7 @@ public String toString() { "winner_count='" + winner_count + "'," + "unclaimed_prize_count='" + unclaimed_prize_count + "'," + "giveaway_message='" + giveaway_message + "'" + + "is_star_giveaway='" + is_star_giveaway + "'" + '}'; }