Skip to content

Commit 56ec945

Browse files
committed
Added the field premium_subscription_duration and transaction_type to the class TransactionPartnerUser
1 parent 2c4f034 commit 56ec945

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

library/src/main/java/com/pengrad/telegrambot/model/stars/partner/TransactionPartnerUser.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ import com.pengrad.telegrambot.model.stars.affiliate.AffiliateInfo
77
import com.pengrad.telegrambot.model.stars.partner.TransactionPartnerType.USER
88

99
data class TransactionPartnerUser(
10+
@get:JvmName("transactionType") val transactionType: String,
1011
@get:JvmName("user") val user: User,
1112
@get:JvmName("affiliate") val affiliate: AffiliateInfo,
1213
@get:JvmName("invoicePayload") val invoicePayload: String? = null,
1314
@get:JvmName("paidMedia") val paidMedia: Array<PaidMedia>? = null,
1415
@get:JvmName("paidMediaPayload") val paidMediaPayload: String? = null,
1516
@get:JvmName("subscriptionPeriod") val subscriptionPeriod: Int? = null,
16-
@get:JvmName("gift") val gift: Gift? = null
17+
@get:JvmName("gift") val gift: Gift? = null,
18+
@get:JvmName("premiumSubscriptionDuration") val premiumSubscriptionDuration: Int? = null
1719
) : TransactionPartner {
1820

1921
override val type: String
@@ -26,6 +28,7 @@ data class TransactionPartnerUser(
2628
other as TransactionPartnerUser
2729

2830
if (subscriptionPeriod != other.subscriptionPeriod) return false
31+
if (transactionType != other.transactionType) return false
2932
if (user != other.user) return false
3033
if (affiliate != other.affiliate) return false
3134
if (invoicePayload != other.invoicePayload) return false
@@ -35,19 +38,22 @@ data class TransactionPartnerUser(
3538
} else if (other.paidMedia != null) return false
3639
if (paidMediaPayload != other.paidMediaPayload) return false
3740
if (gift != other.gift) return false
41+
if (premiumSubscriptionDuration != other.premiumSubscriptionDuration) return false
3842
if (type != other.type) return false
3943

4044
return true
4145
}
4246

4347
override fun hashCode(): Int {
4448
var result = subscriptionPeriod ?: 0
49+
result = 31 * result + transactionType.hashCode()
4550
result = 31 * result + user.hashCode()
4651
result = 31 * result + affiliate.hashCode()
4752
result = 31 * result + (invoicePayload?.hashCode() ?: 0)
4853
result = 31 * result + (paidMedia?.contentHashCode() ?: 0)
4954
result = 31 * result + (paidMediaPayload?.hashCode() ?: 0)
5055
result = 31 * result + (gift?.hashCode() ?: 0)
56+
result = 31 * result + (premiumSubscriptionDuration?.hashCode() ?: 0)
5157
result = 31 * result + type.hashCode()
5258
return result
5359
}

library/src/main/java/com/pengrad/telegrambot/request/GiftTelegramSubscription.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.pengrad.telegrambot.request
22

33
import com.pengrad.telegrambot.model.MessageEntity
4-
import com.pengrad.telegrambot.request.business.TransferGift
54
import com.pengrad.telegrambot.response.BaseResponse
65
import com.pengrad.telegrambot.utility.kotlin.optionalRequestParameter
76
import com.pengrad.telegrambot.utility.kotlin.requestParameter

0 commit comments

Comments
 (0)