Skip to content

Commit 24269cc

Browse files
InsanusMokrassarInsanusMokrassar
committed
improve SendInvoice API one more time
1 parent d960d94 commit 24269cc

File tree

4 files changed

+7
-42
lines changed

4 files changed

+7
-42
lines changed

‎tgbotapi.api/api/tgbotapi.api.api

+4-4
Original file line numberDiff line numberDiff line change
@@ -2089,12 +2089,12 @@ public final class dev/inmo/tgbotapi/extensions/api/send/payments/RefundStarPaym
20892089
}
20902090

20912091
public final class dev/inmo/tgbotapi/extensions/api/send/payments/SendInvoiceKt {
2092+
public static final fun sendInvoice-JwfE-H4 (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2093+
public static synthetic fun sendInvoice-JwfE-H4$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
20922094
public static final fun sendInvoice-NCwJssg (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;ZZZZZZZLdev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
20932095
public static synthetic fun sendInvoice-NCwJssg$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;ZZZZZZZLdev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
2094-
public static final fun sendInvoice-e1xKmjI (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;ZZZZZZZLdev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2095-
public static synthetic fun sendInvoice-e1xKmjI$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;ZZZZZZZLdev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
2096-
public static final fun sendInvoice-qOPzLPU (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/CommonUser;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;ZZZZZZZZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2097-
public static synthetic fun sendInvoice-qOPzLPU$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/CommonUser;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;ZZZZZZZZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
2096+
public static final fun sendInvoice-a-j8NSU (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/CommonUser;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2097+
public static synthetic fun sendInvoice-a-j8NSU$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/CommonUser;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
20982098
public static final fun sendInvoice-tXTtQSU (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/CommonUser;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;ZZZZZZZZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
20992099
public static synthetic fun sendInvoice-tXTtQSU$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/CommonUser;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;ZZZZZZZZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
21002100
}

‎tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/payments/SendInvoice.kt

+1-22
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,14 @@ suspend fun TelegramBot.sendInvoice(
8585
price: LabeledPrice,
8686
startParameter: StartParameter? = null,
8787
providerData: String? = null,
88-
requireName: Boolean = false,
89-
requirePhoneNumber: Boolean = false,
90-
requireEmail: Boolean = false,
91-
requireShippingAddress: Boolean = false,
92-
shouldSendPhoneNumberToProvider: Boolean = false,
93-
shouldSendEmailToProvider: Boolean = false,
94-
priceDependOnShipAddress: Boolean = false,
9588
threadId: MessageThreadId? = chatId.threadId,
9689
disableNotification: Boolean = false,
9790
protectContent: Boolean = false,
9891
effectId: EffectId? = null,
9992
replyParameters: ReplyParameters? = null,
10093
replyMarkup: InlineKeyboardMarkup? = null
10194
) = execute(
102-
SendInvoice(chatId, title, description, payload, price, startParameter, providerData, requireName, requirePhoneNumber, requireEmail, requireShippingAddress, shouldSendPhoneNumberToProvider, shouldSendEmailToProvider, priceDependOnShipAddress, threadId, disableNotification, protectContent, effectId, replyParameters, replyMarkup)
95+
SendInvoice(chatId, title, description, payload, price, startParameter, providerData, threadId, disableNotification, protectContent, effectId, replyParameters, replyMarkup)
10396
)
10497

10598
/**
@@ -114,13 +107,6 @@ suspend fun TelegramBot.sendInvoice(
114107
price: LabeledPrice,
115108
startParameter: StartParameter? = null,
116109
providerData: String? = null,
117-
requireName: Boolean = false,
118-
requirePhoneNumber: Boolean = false,
119-
requireEmail: Boolean = false,
120-
requireShippingAddress: Boolean = false,
121-
shouldSendPhoneNumberToProvider: Boolean = false,
122-
shouldSendEmailToProvider: Boolean = false,
123-
priceDependOnShipAddress: Boolean = false,
124110
disableNotification: Boolean = false,
125111
protectContent: Boolean = false,
126112
effectId: EffectId? = null,
@@ -134,13 +120,6 @@ suspend fun TelegramBot.sendInvoice(
134120
price = price,
135121
startParameter = startParameter,
136122
providerData = providerData,
137-
requireName = requireName,
138-
requirePhoneNumber = requirePhoneNumber,
139-
requireEmail = requireEmail,
140-
requireShippingAddress = requireShippingAddress,
141-
shouldSendPhoneNumberToProvider = shouldSendPhoneNumberToProvider,
142-
shouldSendEmailToProvider = shouldSendEmailToProvider,
143-
priceDependOnShipAddress = priceDependOnShipAddress,
144123
threadId = null,
145124
disableNotification = disableNotification,
146125
protectContent = protectContent,

‎tgbotapi.core/api/tgbotapi.core.api

+2-2
Original file line numberDiff line numberDiff line change
@@ -6116,8 +6116,8 @@ public final class dev/inmo/tgbotapi/requests/send/payments/RefundStarPayment$Co
61166116

61176117
public final class dev/inmo/tgbotapi/requests/send/payments/SendInvoice : dev/inmo/tgbotapi/abstracts/CommonSendInvoiceData, dev/inmo/tgbotapi/abstracts/types/ChatRequest, dev/inmo/tgbotapi/abstracts/types/DisableNotification, dev/inmo/tgbotapi/abstracts/types/WithReplyMarkup, dev/inmo/tgbotapi/abstracts/types/WithReplyParameters, dev/inmo/tgbotapi/requests/send/abstracts/OptionallyWithEffectRequest, dev/inmo/tgbotapi/requests/send/abstracts/SendMessageRequest {
61186118
public static final field Companion Ldev/inmo/tgbotapi/requests/send/payments/SendInvoice$Companion;
6119-
public synthetic fun <init> (Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;ZZZZZZZLdev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
6120-
public synthetic fun <init> (Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;ZZZZZZZLdev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
6119+
public synthetic fun <init> (Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
6120+
public synthetic fun <init> (Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/LabeledPrice;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
61216121
public synthetic fun <init> (Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;ZZZZZZZLdev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
61226122
public synthetic fun <init> (Ldev/inmo/tgbotapi/types/IdChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;ZZZZZZZLdev/inmo/tgbotapi/types/MessageThreadId;ZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
61236123
public final fun component1 ()Ldev/inmo/tgbotapi/types/IdChatIdentifier;

‎tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt

-14
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,6 @@ data class SendInvoice(
108108
price: LabeledPrice,
109109
startParameter: StartParameter? = null,
110110
providerData: String? = null,
111-
requireName: Boolean = false,
112-
requirePhoneNumber: Boolean = false,
113-
requireEmail: Boolean = false,
114-
requireShippingAddress: Boolean = false,
115-
shouldSendPhoneNumberToProvider: Boolean = false,
116-
shouldSendEmailToProvider: Boolean = false,
117-
priceDependOnShipAddress: Boolean = false,
118111
threadId: MessageThreadId? = chatId.threadId,
119112
disableNotification: Boolean = false,
120113
protectContent: Boolean = false,
@@ -131,13 +124,6 @@ data class SendInvoice(
131124
prices = listOf(price),
132125
startParameter = startParameter,
133126
providerData = providerData,
134-
requireName = requireName,
135-
requirePhoneNumber = requirePhoneNumber,
136-
requireEmail = requireEmail,
137-
requireShippingAddress = requireShippingAddress,
138-
shouldSendPhoneNumberToProvider = shouldSendPhoneNumberToProvider,
139-
shouldSendEmailToProvider = shouldSendEmailToProvider,
140-
priceDependOnShipAddress = priceDependOnShipAddress,
141127
threadId = threadId,
142128
disableNotification = disableNotification,
143129
protectContent = protectContent,

0 commit comments

Comments
 (0)