addAnimatedStickerToSet

CHANGELOG.md

@@ -39,6 +39,8 @@
     * `CreateNewStickerSet` renamed to `CreateStaticNewStickerSet`
     * `CreateNewAnimatedStickerSet` request was added (it handle work with `tgs_sticker`)
     * `StickerSet#thumb` was added
+    * `AddStickerToSet` renamed to `AddStaticStickerToSet`
+    * `AddAnimatedStickerToSet` request was added
 * `TelegramBotAPI-extensions-api`:
     * Extensions `sendDice` was added
     * Extension `getMyCommands` request was added
@@ -46,6 +48,8 @@
     * Extension `getMe` was replaced into package `com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot.GetMeKt.getMe`
     * **All extensions `createNewStickerSet` was renamed to `createNewStaticStickerSet`**
     * Extensions `createNewAnimatedStickerSet` was added
+    * **All extensions `addStickerToSet` was renamed to `addStaticStickerToSet`**
+    * Extensions `addAnimatedStickerToSet` was added
 
 ### 0.25.1
 

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/AddAnimatedStickerToSet.kt

@@ -0,0 +1,90 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.stickers
+
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
+import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.AddAnimatedStickerToSet
+import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser
+import com.github.insanusmokrassar.TelegramBotAPI.types.UserId
+import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition
+import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.StickerSet
+
+suspend fun RequestsExecutor.addAnimatedStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = execute(
+    AddAnimatedStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+)
+
+suspend fun RequestsExecutor.addAnimatedStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = execute(
+    AddAnimatedStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+)
+
+suspend fun RequestsExecutor.addAnimatedStickerToSet(
+    user: CommonUser,
+    stickerSetName: String,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    user.id, stickerSetName, sticker, emojis, maskPosition
+)
+
+suspend fun RequestsExecutor.addAnimatedStickerToSet(
+    user: CommonUser,
+    stickerSetName: String,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    user.id, stickerSetName, sticker, emojis, maskPosition
+)
+
+suspend fun RequestsExecutor.addAnimatedStickerToSet(
+    userId: UserId,
+    stickerSet: StickerSet,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    userId, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun RequestsExecutor.addAnimatedStickerToSet(
+    userId: UserId,
+    stickerSet: StickerSet,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    userId, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun RequestsExecutor.addAnimatedStickerToSet(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    sticker: FileId,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    user.id, stickerSet.name, sticker, emojis, maskPosition
+)
+
+suspend fun RequestsExecutor.addAnimatedStickerToSet(
+    user: CommonUser,
+    stickerSet: StickerSet,
+    sticker: MultipartFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = addAnimatedStickerToSet(
+    user.id, stickerSet.name, sticker, emojis, maskPosition
+)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/stickers/AddStaticStickerToSet.kt

@@ -3,88 +3,88 @@ package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.stickers
 import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
-import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.AddStickerToSet
+import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.AddStaticStickerToSet
 import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser
 import com.github.insanusmokrassar.TelegramBotAPI.types.UserId
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.StickerSet
 
-suspend fun RequestsExecutor.addStickerToSet(
+suspend fun RequestsExecutor.addStaticStickerToSet(
     userId: UserId,
     stickerSetName: String,
     sticker: FileId,
     emojis: String,
     maskPosition: MaskPosition? = null
 ) = execute(
-    AddStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+    AddStaticStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
 )
 
-suspend fun RequestsExecutor.addStickerToSet(
+suspend fun RequestsExecutor.addStaticStickerToSet(
     userId: UserId,
     stickerSetName: String,
     sticker: MultipartFile,
     emojis: String,
     maskPosition: MaskPosition? = null
 ) = execute(
-    AddStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+    AddStaticStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
 )
 
-suspend fun RequestsExecutor.addStickerToSet(
+suspend fun RequestsExecutor.addStaticStickerToSet(
     user: CommonUser,
     stickerSetName: String,
     sticker: FileId,
     emojis: String,
     maskPosition: MaskPosition? = null
-) = addStickerToSet(
+) = addStaticStickerToSet(
     user.id, stickerSetName, sticker, emojis, maskPosition
 )
 
-suspend fun RequestsExecutor.addStickerToSet(
+suspend fun RequestsExecutor.addStaticStickerToSet(
     user: CommonUser,
     stickerSetName: String,
     sticker: MultipartFile,
     emojis: String,
     maskPosition: MaskPosition? = null
-) = addStickerToSet(
+) = addStaticStickerToSet(
     user.id, stickerSetName, sticker, emojis, maskPosition
 )
 
-suspend fun RequestsExecutor.addStickerToSet(
+suspend fun RequestsExecutor.addStaticStickerToSet(
     userId: UserId,
     stickerSet: StickerSet,
     sticker: FileId,
     emojis: String,
     maskPosition: MaskPosition? = null
-) = addStickerToSet(
+) = addStaticStickerToSet(
     userId, stickerSet.name, sticker, emojis, maskPosition
 )
 
-suspend fun RequestsExecutor.addStickerToSet(
+suspend fun RequestsExecutor.addStaticStickerToSet(
     userId: UserId,
     stickerSet: StickerSet,
     sticker: MultipartFile,
     emojis: String,
     maskPosition: MaskPosition? = null
-) = addStickerToSet(
+) = addStaticStickerToSet(
     userId, stickerSet.name, sticker, emojis, maskPosition
 )
 
-suspend fun RequestsExecutor.addStickerToSet(
+suspend fun RequestsExecutor.addStaticStickerToSet(
     user: CommonUser,
     stickerSet: StickerSet,
     sticker: FileId,
     emojis: String,
     maskPosition: MaskPosition? = null
-) = addStickerToSet(
+) = addStaticStickerToSet(
     user.id, stickerSet.name, sticker, emojis, maskPosition
 )
 
-suspend fun RequestsExecutor.addStickerToSet(
+suspend fun RequestsExecutor.addStaticStickerToSet(
     user: CommonUser,
     stickerSet: StickerSet,
     sticker: MultipartFile,
     emojis: String,
     maskPosition: MaskPosition? = null
-) = addStickerToSet(
+) = addStaticStickerToSet(
     user.id, stickerSet.name, sticker, emojis, maskPosition
 )

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddAnimatedStickerToSet.kt

@@ -6,15 +6,14 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.St
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition
 import kotlinx.serialization.*
-
+fun AddAnimatedStickerToSet(
-fun AddStickerToSet(
     userId: UserId,
     stickerSetName: String,
     sticker: InputFile,
     emojis: String,
     maskPosition: MaskPosition? = null
 ): Request<Boolean> {
-    val data = AddStickerToSet(userId, stickerSetName, emojis, sticker as? FileId, maskPosition)
+    val data = AddAnimatedStickerToSet(userId, stickerSetName, emojis, sticker as? FileId, maskPosition)
     return when (sticker) {
         is MultipartFile -> CommonMultipartFileRequest(
             data,
@@ -25,14 +24,14 @@ fun AddStickerToSet(
 }
 
 @Serializable
-data class AddStickerToSet internal constructor(
+data class AddAnimatedStickerToSet internal constructor(
     @SerialName(userIdField)
     override val userId: UserId,
     @SerialName(nameField)
     override val name: String,
     @SerialName(emojisField)
     override val emojis: String,
-    @SerialName(pngStickerField)
+    @SerialName(tgsStickerField)
     val sticker: FileId? = null,
     @SerialName(maskPositionField)
     override val maskPosition: MaskPosition? = null

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddStaticStickerToSet.kt

@@ -0,0 +1,67 @@
+package com.github.insanusmokrassar.TelegramBotAPI.requests.stickers
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.requests.common.CommonMultipartFileRequest
+import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.StickerSetAction
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition
+import kotlinx.serialization.*
+fun AddStaticStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: InputFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+): Request<Boolean> {
+    val data = AddStaticStickerToSet(userId, stickerSetName, emojis, sticker as? FileId, maskPosition)
+    return when (sticker) {
+        is MultipartFile -> CommonMultipartFileRequest(
+            data,
+            mapOf(pngStickerField to sticker)
+        )
+        is FileId -> data
+    }
+}
+
+@Deprecated(
+    "Renamed",
+    ReplaceWith("AddStaticStickerToSet", "com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.AddStaticStickerToSet")
+)
+fun AddStickerToSet(
+    userId: UserId,
+    stickerSetName: String,
+    sticker: InputFile,
+    emojis: String,
+    maskPosition: MaskPosition? = null
+) = AddStaticStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
+
+@Deprecated(
+    "Renamed",
+    ReplaceWith("AddStaticStickerToSet", "com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.AddStaticStickerToSet")
+)
+typealias AddStickerToSet = AddStaticStickerToSet
+
+@Serializable
+data class AddStaticStickerToSet internal constructor(
+    @SerialName(userIdField)
+    override val userId: UserId,
+    @SerialName(nameField)
+    override val name: String,
+    @SerialName(emojisField)
+    override val emojis: String,
+    @SerialName(pngStickerField)
+    val sticker: FileId? = null,
+    @SerialName(maskPositionField)
+    override val maskPosition: MaskPosition? = null
+) : StickerSetAction {
+    init {
+        if(emojis.isEmpty()) {
+            throw IllegalArgumentException("Emojis must not be empty")
+        }
+    }
+
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "addStickerToSet"
+}