cache/content/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/common/DefaultMessageContentCache.kt

@@ -1,128 +0,0 @@
-package dev.inmo.tgbotapi.libraries.cache.media.common
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.DownloadFileStream
-import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.requests.get.GetFile
-import dev.inmo.tgbotapi.requests.send.media.*
-import dev.inmo.tgbotapi.types.ChatId
-import dev.inmo.tgbotapi.types.InputMedia.*
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
-import dev.inmo.tgbotapi.utils.asInput
-import io.ktor.utils.io.core.Input
-
-class DefaultMessageContentCache<K>(
-    private val bot: TelegramBot,
-    private val filesRefreshingChatId: ChatId,
-    private val simpleMessageContentCache: MessagesSimpleCache<K>,
-    private val messagesFilesCache: MessagesFilesCache<K> = InMemoryMessagesFilesCache()
-) : MessageContentCache<K> {
-    override suspend fun save(content: MessageContent): K {
-        return when (content) {
-            is MediaContent -> {
-                val extendedInfo = bot.execute(
-                    GetFile(content.media.fileId)
-                )
-                val allocator = bot.execute(
-                    DownloadFileStream(
-                        extendedInfo.filePath
-                    )
-                )
-
-                save(content, extendedInfo.fileName) {
-                    allocator.invoke().asInput()
-                }
-            }
-            else -> simpleMessageContentCache.add(content)
-        }
-    }
-
-    override suspend fun save(
-        content: MediaContent,
-        filename: String,
-        inputAllocator: suspend () -> Input
-    ): K {
-        val key = simpleMessageContentCache.add(content)
-        runCatching {
-            messagesFilesCache.set(key, filename, inputAllocator)
-        }.onFailure {
-            simpleMessageContentCache.remove(key)
-        }
-
-        return key
-    }
-
-    override suspend fun get(k: K): MessageContent? {
-        val savedSimpleContent = simpleMessageContentCache.get(k) ?: return null
-
-        if (savedSimpleContent is MediaContent) {
-            runCatching {
-                bot.execute(GetFile(savedSimpleContent.media.fileId))
-            }.onFailure {
-                val savedFileContentAllocator = messagesFilesCache.get(k) ?: error("Unexpected absence of $k file for content ($simpleMessageContentCache)")
-                val newContent = bot.execute(
-                    when (savedSimpleContent.asInputMedia()) {
-                        is InputMediaAnimation -> SendAnimation(
-                            filesRefreshingChatId,
-                            MultipartFile(
-                                savedFileContentAllocator
-                            ),
-                            disableNotification = true
-                        )
-                        is InputMediaAudio -> SendAudio(
-                            filesRefreshingChatId,
-                            MultipartFile(
-                                savedFileContentAllocator
-                            ),
-                            disableNotification = true
-                        )
-                        is InputMediaVideo -> SendVideo(
-                            filesRefreshingChatId,
-                            MultipartFile(
-                                savedFileContentAllocator
-                            ),
-                            disableNotification = true
-                        )
-                        is InputMediaDocument -> SendDocument(
-                            filesRefreshingChatId,
-                            MultipartFile(
-                                savedFileContentAllocator
-                            ),
-                            disableNotification = true
-                        )
-                        is InputMediaPhoto -> SendPhoto(
-                            filesRefreshingChatId,
-                            MultipartFile(
-                                savedFileContentAllocator
-                            ),
-                            disableNotification = true
-                        )
-                    }
-                )
-
-                simpleMessageContentCache.update(k, newContent.content)
-                return newContent.content
-            }
-        }
-        return savedSimpleContent
-    }
-
-    override suspend fun contains(k: K): Boolean {
-        return simpleMessageContentCache.contains(k)
-    }
-
-    override suspend fun remove(k: K) {
-        simpleMessageContentCache.remove(k)
-        messagesFilesCache.remove(k)
-    }
-
-    companion object {
-        operator fun invoke(
-            bot: TelegramBot,
-            filesRefreshingChatId: ChatId,
-            simpleMessageContentCache: MessagesSimpleCache<String> = InMemoryMessagesSimpleCache(),
-            messagesFilesCache: MessagesFilesCache<String> = InMemoryMessagesFilesCache()
-        ) = DefaultMessageContentCache(bot, filesRefreshingChatId, simpleMessageContentCache, messagesFilesCache)
-    }
-}

cache/content/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/common/MessageContentCache.kt

@@ -1,17 +0,0 @@
-package dev.inmo.tgbotapi.libraries.cache.media.common
-
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
-import io.ktor.utils.io.core.Input
-
-interface MessageContentCache<K> {
-    suspend fun save(content: MessageContent): K
-    suspend fun save(
-        content: MediaContent,
-        filename: String,
-        inputAllocator: suspend () -> Input
-    ): K
-    suspend fun get(k: K): MessageContent?
-    suspend fun contains(k: K): Boolean
-    suspend fun remove(k: K)
-}

cache/content/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/common/MessagesFilesCache.kt

@@ -1,41 +0,0 @@
-package dev.inmo.tgbotapi.libraries.cache.media.common
-
-import dev.inmo.tgbotapi.types.ChatId
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.utils.StorageFile
-import io.ktor.utils.io.core.*
-
-interface MessagesFilesCache<K> {
-    suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input)
-    suspend fun get(k: K): StorageFile?
-    suspend fun remove(k: K)
-    suspend fun contains(k: K): Boolean
-}
-
-/**
- * It is not recommended to use in production realization of [MessagesFilesCache] which has been created for fast
- * start of application creation with usage of [MessageContentCache] with aim to replace this realization by some
- * disks-oriented one
- */
-class InMemoryMessagesFilesCache<K> : MessagesFilesCache<K> {
-    private val map = mutableMapOf<K, StorageFile>()
-
-    override suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) {
-        map[k] = StorageFile(
-            filename,
-            inputAllocator().readBytes()
-        )
-    }
-
-    override suspend fun get(k: K): StorageFile? {
-        return map[k]
-    }
-
-    override suspend fun remove(k: K) {
-        map.remove(k)
-    }
-
-    override suspend fun contains(k: K): Boolean {
-        return map.contains(k)
-    }
-}

cache/content/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/common/MessagesSimpleCache.kt

@@ -1,63 +0,0 @@
-package dev.inmo.tgbotapi.libraries.cache.media.common
-
-import com.benasher44.uuid.uuid4
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
-
-interface MessagesSimpleCache<K> {
-    suspend fun add(content: MessageContent): K
-    suspend fun update(k: K, content: MessageContent): Boolean
-    suspend fun get(k: K): MessageContent?
-    suspend fun remove(k: K)
-    suspend fun contains(k: K): Boolean
-}
-
-/**
- * It is not recommended to use in production realization of [MessagesFilesCache] which has been created for fast
- * start of application creation with usage of [MessageContentCache] with aim to replace this realization by some
- * disks-oriented one
- */
-class InMemoryMessagesSimpleCache<K>(
-    private val keyGenerator: () -> K
-) : MessagesSimpleCache<K> {
-    private val map = mutableMapOf<K, MessageContent>()
-
-    override suspend fun add(
-        content: MessageContent
-    ): K {
-        val key = keyGenerator()
-        map[key] = content
-        return key
-    }
-
-    override suspend fun update(
-        k: K,
-        content: MessageContent
-    ): Boolean {
-        return map.runCatching {
-            if (contains(k)) {
-                put(k, content)
-                true
-            } else {
-                false
-            }
-        }.getOrDefault(false)
-    }
-
-    override suspend fun get(k: K): MessageContent? {
-        return map[k]
-    }
-
-    override suspend fun remove(k: K) {
-        map.remove(k)
-    }
-
-    override suspend fun contains(k: K): Boolean {
-        return map.contains(k)
-    }
-
-    companion object {
-        operator fun invoke() = InMemoryMessagesSimpleCache {
-            uuid4().toString()
-        }
-    }
-}

cache/content/common/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/common/InFilesMessagesFilesCache.kt

@@ -1,74 +0,0 @@
-package dev.inmo.tgbotapi.libraries.cache.media.common
-
-import dev.inmo.tgbotapi.utils.*
-import io.ktor.utils.io.core.Input
-import io.ktor.utils.io.core.copyTo
-import io.ktor.utils.io.streams.asInput
-import io.ktor.utils.io.streams.asOutput
-import java.io.File
-
-class InFilesMessagesFilesCache<K>(
-    private val folderFile: File,
-    private val filePrefixBuilder: (K) -> String
-) : MessagesFilesCache<K> {
-    private val K.storageFile: StorageFile?
-        get() {
-            val prefix = filePrefix(this)
-            val filename = folderFile.list() ?.firstOrNull { it.startsWith(prefix) } ?: return null
-            val file = File(folderFile, filename)
-            val storageFileFilename = file.name.removePrefix("$prefix ")
-
-            return StorageFile(
-                StorageFileInfo(storageFileFilename)
-            ) {
-                file.inputStream().asInput()
-            }
-        }
-
-    init {
-        require(!folderFile.isFile) { "Folder of messages files cache can't be file, but was $folderFile" }
-        folderFile.mkdirs()
-    }
-
-    private fun filePrefix(k: K): String = filePrefixBuilder(k)
-
-    private fun fileName(k: K, filename: String): String {
-        return "${filePrefix(k)} $filename"
-    }
-
-    override suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) {
-        val fullFileName = fileName(k, filename)
-        val file = File(folderFile, fullFileName).apply {
-            delete()
-        }
-        inputAllocator().use { input ->
-            file.outputStream().asOutput().use { output ->
-                input.copyTo(output)
-            }
-        }
-    }
-
-    override suspend fun get(k: K): StorageFile? {
-        return k.storageFile
-    }
-
-    override suspend fun remove(k: K) {
-        val prefix = filePrefix(k)
-        folderFile.listFiles() ?.forEach {
-            if (it.name.startsWith(prefix)) {
-                it.delete()
-            }
-        }
-    }
-
-    override suspend fun contains(k: K): Boolean {
-        val prefix = filePrefix(k)
-        return folderFile.list() ?.any { it.startsWith(prefix) } == true
-    }
-
-    companion object {
-        operator fun invoke(folderFile: File) = InFilesMessagesFilesCache<String>(
-            folderFile
-        ) { it }
-    }
-}

cache/content/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.content.common"/>

cache/content/micro_utils/build.gradle

@@ -1,19 +0,0 @@
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
-}
-
-apply from: "$mppProjectWithSerializationPresetPath"
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api "dev.inmo:micro_utils.repos.common:$micro_utils_version"
-                api project(":tgbotapi.libraries.cache.content.common")
-            }
-        }
-    }
-}
-

cache/content/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/micro_utils/SimpleKeyValueMessageContentCache.kt

@@ -1,104 +0,0 @@
-package dev.inmo.tgbotapi.libraries.cache.media.micro_utils
-
-import com.benasher44.uuid.uuid4
-import dev.inmo.micro_utils.repos.*
-import dev.inmo.micro_utils.repos.mappers.withMapper
-import dev.inmo.tgbotapi.libraries.cache.media.common.MessagesSimpleCache
-import dev.inmo.tgbotapi.types.ChatId
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.PairSerializer
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.modules.SerializersModule
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
-
-class SimpleKeyValueMessageContentCache<K>(
-    private val keyValueRepo: KeyValueRepo<K, MessageContent>,
-    private val keyGenerator: () -> K
-) : MessagesSimpleCache<K> {
-    override suspend fun add(content: MessageContent): K {
-        val key = keyGenerator()
-        keyValueRepo.set(key, content)
-
-        return key
-    }
-
-    override suspend fun update(k: K, content: MessageContent): Boolean {
-        return keyValueRepo.runCatching {
-            if (contains(k)) {
-                keyValueRepo.set(k, content)
-                true
-            } else {
-                false
-            }
-        }.getOrDefault(false)
-    }
-
-    override suspend fun get(k: K): MessageContent? {
-        return keyValueRepo.get(k)
-    }
-
-    override suspend fun contains(k: K): Boolean {
-        return keyValueRepo.contains(k)
-    }
-
-    override suspend fun remove(k: K) {
-        keyValueRepo.unset(k)
-    }
-
-    companion object {
-        operator fun invoke(
-            keyValueRepo: KeyValueRepo<String, MessageContent>
-        ) = SimpleKeyValueMessageContentCache(keyValueRepo) { uuid4().toString() }
-    }
-}
-
-val chatIdToMessageIdentifierSerializer = PairSerializer(
-    ChatId.serializer(),
-    MessageIdentifier.serializer()
-)
-
-val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class)
-
-inline fun KeyValueRepo<String, String>.asMessageContentCache(
-    serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } }
-): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
-    val serialFormat = serialFormatCreator(MessageContent.serializationModule())
-    return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, String, String>(
-        { serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) },
-        { serialFormat.encodeToString(messageContentSerializer, this) },
-        { serialFormat.decodeFromString(chatIdToMessageIdentifierSerializer, this) },
-        { serialFormat.decodeFromString(messageContentSerializer, this) },
-    )
-}
-
-@JvmName("stringsKeyValueAsHexMessageContentCache")
-@JsName("stringsKeyValueAsHexMessageContentCache")
-inline fun KeyValueRepo<String, String>.asMessageContentCache(
-    serialFormatCreator: (SerializersModule) -> BinaryFormat
-): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
-    val serialFormat = serialFormatCreator(MessageContent.serializationModule())
-    return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, String, String>(
-        { serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) },
-        { serialFormat.encodeToHexString(messageContentSerializer, this) },
-        { serialFormat.decodeFromHexString(chatIdToMessageIdentifierSerializer, this) },
-        { serialFormat.decodeFromHexString(messageContentSerializer, this) },
-    )
-}
-
-@JvmName("bytesKeyValueAsMessageContentCache")
-@JsName("bytesKeyValueAsMessageContentCache")
-inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache(
-    serialFormatCreator: (SerializersModule) -> BinaryFormat
-): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
-    val serialFormat = serialFormatCreator(MessageContent.serializationModule())
-    return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, ByteArray, ByteArray>(
-        { serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) },
-        { serialFormat.encodeToByteArray(messageContentSerializer, this) },
-        { serialFormat.decodeFromByteArray(chatIdToMessageIdentifierSerializer, this) },
-        { serialFormat.decodeFromByteArray(messageContentSerializer, this) },
-    )
-}

cache/content/micro_utils/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.content.micro_utils"/>

cache/media/build.gradle

@@ -6,13 +6,3 @@ plugins {
 
 apply from: "$mppProjectWithSerializationPresetPath"
 
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api "dev.inmo:tgbotapi.core:$tgbotapi_version"
-            }
-        }
-    }
-}
-

cache/media/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="dev.inmo.tgbotapi.libraries.cache.media"/>

gradle.properties

@@ -11,9 +11,9 @@ kotlin_serialisation_core_version=1.3.2
 
 github_release_plugin_version=2.2.12
 
-tgbotapi_version=0.38.12
+tgbotapi_version=0.38.4
-micro_utils_version=0.9.20
+micro_utils_version=0.9.5
-exposed_version=0.37.3
+exposed_version=0.37.2
 plagubot_version=0.5.1
 
 # ANDROID
@@ -33,5 +33,5 @@ dokka_version=1.6.10
 # Project data
 
 group=dev.inmo
-version=0.0.17
+version=0.0.16
-android_code_version=17
+android_code_version=16

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -4,15 +4,13 @@ String[] includes = [
     ":cache:admins:common",
     ":cache:admins:micro_utils",
     ":cache:admins:plagubot",
-
+    ":cache:media"
-    ":cache:content:common",
-    ":cache:content:micro_utils",
 ]
 
 
 includes.each { originalName ->
-    String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replace(":", File.separator)}"
+    String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replaceAll(":", File.separator)}"
-    String projectName = "${rootProject.name}${originalName.replace(":", ".")}"
+    String projectName = "${rootProject.name}${originalName.replaceAll(":", ".")}"
     String projectIdentifier = ":${projectName}"
     include projectIdentifier
     ProjectDescriptor project = project(projectIdentifier)