add support for sending of gifts to chats

2025-09-15 13:19:30 +00:00 · 2025-02-13 12:17:05 +06:00
parent 3504776344
commit b3b9070cd6
7 changed files with 339 additions and 102 deletions
--- a/tgbotapi.core/api/tgbotapi.core.api
+++ b/tgbotapi.core/api/tgbotapi.core.api
@@ -4570,19 +4570,21 @@ public final class dev/inmo/tgbotapi/requests/gifts/GetAvailableGifts : dev/inmo

 public final class dev/inmo/tgbotapi/requests/gifts/SendGift : dev/inmo/tgbotapi/abstracts/TextedOutput, dev/inmo/tgbotapi/requests/abstracts/SimpleRequest {
 	public static final field Companion Ldev/inmo/tgbotapi/requests/gifts/SendGift$Companion;
-	public synthetic fun <init> (JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JLjava/lang/String;Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JLjava/lang/String;Ljava/util/List;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-tHkBKVM ()J
-	public final fun component2-OyCYJok ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ldev/inmo/tgbotapi/types/message/ParseMode;
-	public final fun component6 ()Z
-	public final fun copy-ekxNoiw (JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;Ljava/util/List;Z)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
-	public static synthetic fun copy-ekxNoiw$default (Ldev/inmo/tgbotapi/requests/gifts/SendGift;JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;Ljava/util/List;ZILjava/lang/Object;)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
+	public synthetic fun <init> (Ldev/inmo/tgbotapi/types/ChatId;Ldev/inmo/tgbotapi/types/ChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1-_eYXl24 ()Ldev/inmo/tgbotapi/types/ChatId;
+	public final fun component2 ()Ldev/inmo/tgbotapi/types/ChatIdentifier;
+	public final fun component3-OyCYJok ()Ljava/lang/String;
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()Ldev/inmo/tgbotapi/types/message/ParseMode;
+	public final fun component7 ()Z
+	public final fun copy-xmxulwY (Ldev/inmo/tgbotapi/types/ChatId;Ldev/inmo/tgbotapi/types/ChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;Ljava/util/List;Z)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
+	public static synthetic fun copy-xmxulwY$default (Ldev/inmo/tgbotapi/requests/gifts/SendGift;Ldev/inmo/tgbotapi/types/ChatId;Ldev/inmo/tgbotapi/types/ChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;Ljava/util/List;ZILjava/lang/Object;)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getChatId ()Ldev/inmo/tgbotapi/types/ChatIdentifier;
 	public fun getEntities ()Ljava/util/List;
 	public final fun getGiftId-OyCYJok ()Ljava/lang/String;
 	public fun getParseMode ()Ldev/inmo/tgbotapi/types/message/ParseMode;
@@ -4591,7 +4593,7 @@ public final class dev/inmo/tgbotapi/requests/gifts/SendGift : dev/inmo/tgbotapi
 	public fun getText ()Ljava/lang/String;
 	public fun getTextSources ()Ljava/util/List;
 	public final fun getUpgradableToUnique ()Z
-	public final fun getUserId-tHkBKVM ()J
+	public final fun getUserId-_eYXl24 ()Ldev/inmo/tgbotapi/types/ChatId;
 	public fun hashCode ()I
 	public fun method ()Ljava/lang/String;
 	public fun toString ()Ljava/lang/String;
@@ -4609,6 +4611,14 @@ public synthetic class dev/inmo/tgbotapi/requests/gifts/SendGift$$serializer : k

 public final class dev/inmo/tgbotapi/requests/gifts/SendGift$Companion {
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+	public final fun toChat-A6CMM0Q (Ldev/inmo/tgbotapi/types/ChatIdentifier;Ljava/lang/String;Ljava/util/List;Z)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
+	public static synthetic fun toChat-A6CMM0Q$default (Ldev/inmo/tgbotapi/requests/gifts/SendGift$Companion;Ldev/inmo/tgbotapi/types/ChatIdentifier;Ljava/lang/String;Ljava/util/List;ZILjava/lang/Object;)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
+	public final fun toChat-MXj3T_8 (Ldev/inmo/tgbotapi/types/ChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;Z)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
+	public static synthetic fun toChat-MXj3T_8$default (Ldev/inmo/tgbotapi/requests/gifts/SendGift$Companion;Ldev/inmo/tgbotapi/types/ChatIdentifier;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZILjava/lang/Object;)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
+	public final fun toUser-IEl38uo (JLjava/lang/String;Ljava/util/List;Z)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
+	public static synthetic fun toUser-IEl38uo$default (Ldev/inmo/tgbotapi/requests/gifts/SendGift$Companion;JLjava/lang/String;Ljava/util/List;ZILjava/lang/Object;)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
+	public final fun toUser-LbrZz8c (JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;Z)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
+	public static synthetic fun toUser-LbrZz8c$default (Ldev/inmo/tgbotapi/requests/gifts/SendGift$Companion;JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZILjava/lang/Object;)Ldev/inmo/tgbotapi/requests/gifts/SendGift;
 }

 public final class dev/inmo/tgbotapi/requests/inline/SavePreparedInlineMessage : dev/inmo/tgbotapi/requests/abstracts/SimpleRequest {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/gifts/SendGift.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/gifts/SendGift.kt
@@ -19,11 +19,13 @@ import kotlinx.serialization.builtins.serializer
@Serializable
 data class SendGift internal constructor(
    @SerialName(userIdField)
-    val userId: UserId,
+    val userId: UserId? = null,
+    @SerialName(chatIdField)
+    val chatId: ChatIdentifier? = null,
    @SerialName(giftIdField)
    val giftId: GiftId,
    @SerialName(textField)
-    override val text: String,
+    override val text: String? = null,
    @SerialName(textParseModeField)
    override val parseMode: ParseMode?,
    @SerialName(textEntitiesField)
@@ -32,7 +34,11 @@ data class SendGift internal constructor(
    val upgradableToUnique: Boolean = false
 ) : SimpleRequest<Boolean>, TextedOutput {
    override val textSources: TextSourcesList? by lazy {
-        rawEntities ?.asTextSources(text)
+        rawEntities ?.let {
+            text ?.let { _ ->
+                it.asTextSources(text)
+            }
+        }
    }

    override fun method(): String = "sendGift"
@@ -44,6 +50,7 @@ data class SendGift internal constructor(
    override val resultDeserializer: DeserializationStrategy<Boolean>
        get() = Boolean.serializer()

+    @Deprecated("Use factory function `toUser` instead", ReplaceWith("toUser(userId, giftId, text, parseMode, upgradableToUnique)"))
    constructor(
        userId: UserId,
        giftId: GiftId,
@@ -59,17 +66,75 @@ data class SendGift internal constructor(
        upgradableToUnique = upgradableToUnique
    )

+    @Deprecated("Use factory function `toUser` instead", ReplaceWith("toUser(userId, giftId, textSources, upgradableToUnique)"))
    constructor(
        userId: UserId,
        giftId: GiftId,
-        textSources: TextSourcesList,
+        textSources: TextSourcesList? = null,
        upgradableToUnique: Boolean = false,
    ) : this(
        userId = userId,
        giftId = giftId,
-        text = textSources.makeSourceString(),
+        text = textSources ?.makeSourceString(),
        parseMode = null,
-        rawEntities = textSources.toRawMessageEntities(),
+        rawEntities = textSources ?.toRawMessageEntities(),
        upgradableToUnique = upgradableToUnique
    )
+
+    companion object {
+        fun toUser(
+            userId: UserId,
+            giftId: GiftId,
+            text: String,
+            parseMode: ParseMode?,
+            upgradableToUnique: Boolean = false
+        ) = SendGift(
+            userId = userId,
+            giftId = giftId,
+            text = text,
+            parseMode = parseMode,
+            rawEntities = null,
+            upgradableToUnique = upgradableToUnique
+        )
+        fun toUser(
+            userId: UserId,
+            giftId: GiftId,
+            textSources: TextSourcesList? = null,
+            upgradableToUnique: Boolean = false,
+        ) = SendGift(
+            userId = userId,
+            giftId = giftId,
+            text = textSources ?.makeSourceString(),
+            parseMode = null,
+            rawEntities = textSources ?.toRawMessageEntities(),
+            upgradableToUnique = upgradableToUnique
+        )
+        fun toChat(
+            chatId: ChatIdentifier,
+            giftId: GiftId,
+            text: String,
+            parseMode: ParseMode?,
+            upgradableToUnique: Boolean = false
+        ) = SendGift(
+            chatId = chatId,
+            giftId = giftId,
+            text = text,
+            parseMode = parseMode,
+            rawEntities = null,
+            upgradableToUnique = upgradableToUnique
+        )
+        fun toChat(
+            chatId: ChatIdentifier,
+            giftId: GiftId,
+            textSources: TextSourcesList? = null,
+            upgradableToUnique: Boolean = false,
+        ) = SendGift(
+            chatId = chatId,
+            giftId = giftId,
+            text = textSources ?.makeSourceString(),
+            parseMode = null,
+            rawEntities = textSources ?.toRawMessageEntities(),
+            upgradableToUnique = upgradableToUnique
+        )
+    }
 }