mirror of
https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
synced 2025-10-25 17:20:10 +00:00
Compare commits
17 Commits
ec69456bcc
...
0.2.1
| Author | SHA1 | Date | |
|---|---|---|---|
| b2d3ded0da | |||
| fbbd8e640c | |||
| 15c0f9979a | |||
| e6d04de433 | |||
| a6b837f633 | |||
| 866b016e08 | |||
| b67212ec0b | |||
| dc83bbc9aa | |||
| 14b56c659b | |||
| 99218de932 | |||
| ce14a78e09 | |||
| 827d9b43f7 | |||
| 6aaa801fe0 | |||
| 5cb7d30431 | |||
| c34d7597b4 | |||
| d5ae880e77 | |||
| 570568cd26 |
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.libraries.cache.admins
|
||||
|
||||
import dev.inmo.tgbotapi.extensions.utils.asGroupContentMessage
|
||||
import dev.inmo.tgbotapi.types.*
|
||||
import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
|
||||
import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
|
||||
import dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage
|
||||
import dev.inmo.tgbotapi.types.message.abstracts.Message
|
||||
|
||||
|
||||
@@ -5,7 +5,8 @@ import dev.inmo.tgbotapi.bot.TelegramBot
|
||||
import dev.inmo.tgbotapi.extensions.api.bot.getMe
|
||||
import dev.inmo.tgbotapi.extensions.api.chat.get.getChatAdministrators
|
||||
import dev.inmo.tgbotapi.types.*
|
||||
import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
|
||||
import dev.inmo.tgbotapi.types.chat.ExtendedBot
|
||||
import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
|
||||
import dev.inmo.tgbotapi.types.message.abstracts.*
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
|
||||
import dev.inmo.micro_utils.repos.*
|
||||
import dev.inmo.tgbotapi.libraries.cache.admins.DefaultAdminsCacheAPIRepo
|
||||
import dev.inmo.tgbotapi.types.*
|
||||
import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
|
||||
import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.channels.Channel
|
||||
import kotlin.coroutines.*
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
package dev.inmo.tgbotapi.libraries.cache.admins
|
||||
|
||||
import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
|
||||
import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedOneToManyKeyValueRepo
|
||||
import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedKeyValuesRepo
|
||||
import dev.inmo.micro_utils.repos.mappers.withMapper
|
||||
import dev.inmo.tgbotapi.bot.TelegramBot
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||
import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepo
|
||||
import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DynamicAdminsCacheSettingsAPI
|
||||
import dev.inmo.tgbotapi.types.*
|
||||
import dev.inmo.tgbotapi.types.ChatMember.AdministratorChatMemberImpl
|
||||
import dev.inmo.tgbotapi.types.ChatMember.CreatorChatMember
|
||||
import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
|
||||
import dev.inmo.tgbotapi.types.chat.member.*
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.serialization.*
|
||||
import kotlinx.serialization.cbor.Cbor
|
||||
@@ -38,7 +36,7 @@ fun AdminsCacheAPI(
|
||||
) : AdminsCacheAPI = DefaultAdminsCacheAPI(
|
||||
bot,
|
||||
DefaultAdminsCacheAPIRepo(
|
||||
ExposedOneToManyKeyValueRepo(
|
||||
ExposedKeyValuesRepo(
|
||||
database,
|
||||
{ long("chatId") },
|
||||
{ text("member") },
|
||||
|
||||
@@ -8,10 +8,17 @@ import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.Transient
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import org.koin.core.Koin
|
||||
import org.koin.core.module.Module
|
||||
import org.koin.core.scope.Scope
|
||||
|
||||
val Map<String, Any>.adminsPlugin: AdminsPlugin?
|
||||
get() = get("admins") as? AdminsPlugin
|
||||
val Scope.adminsPlugin: AdminsPlugin?
|
||||
get() = getOrNull()
|
||||
|
||||
val Koin.adminsPlugin: AdminsPlugin?
|
||||
get() = getOrNull()
|
||||
|
||||
@Serializable
|
||||
class AdminsPlugin(
|
||||
@@ -35,18 +42,24 @@ class AdminsPlugin(
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContext.invoke(database: Database, params: Map<String, Any>) {
|
||||
when (chatsSettings) {
|
||||
null -> {
|
||||
mutex.withLock {
|
||||
val flow = databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) }
|
||||
if (flow.value == null) {
|
||||
flow.value = AdminsCacheAPI(database)
|
||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||
single { this@AdminsPlugin }
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||
with(koin) {
|
||||
when (chatsSettings) {
|
||||
null -> {
|
||||
mutex.withLock {
|
||||
val flow = databaseToAdminsCacheAPI.getOrPut(koin.get()){ MutableStateFlow(null) }
|
||||
if (flow.value == null) {
|
||||
flow.value = AdminsCacheAPI(koin.get())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else -> mutex.withLock {
|
||||
globalAdminsCacheAPI.value = AdminsCacheAPI(database)
|
||||
else -> mutex.withLock {
|
||||
globalAdminsCacheAPI.value = AdminsCacheAPI(koin.get())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,13 +2,12 @@ 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.types.media.*
|
||||
import dev.inmo.tgbotapi.types.message.content.MediaContent
|
||||
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
||||
import dev.inmo.tgbotapi.utils.asInput
|
||||
import io.ktor.utils.io.core.Input
|
||||
|
||||
@@ -16,10 +15,13 @@ class DefaultMessageContentCache<K>(
|
||||
private val bot: TelegramBot,
|
||||
private val filesRefreshingChatId: ChatId,
|
||||
private val simpleMessageContentCache: MessagesSimpleCache<K>,
|
||||
private val mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
|
||||
MediaFileActualityChecker.Default(filesRefreshingChatId)
|
||||
),
|
||||
private val messagesFilesCache: MessagesFilesCache<K> = InMemoryMessagesFilesCache()
|
||||
) : MessageContentCache<K> {
|
||||
override suspend fun save(content: MessageContent): K {
|
||||
return when (content) {
|
||||
override suspend fun save(k: K, content: MessageContent) {
|
||||
when (content) {
|
||||
is MediaContent -> {
|
||||
val extendedInfo = bot.execute(
|
||||
GetFile(content.media.fileId)
|
||||
@@ -30,80 +32,69 @@ class DefaultMessageContentCache<K>(
|
||||
)
|
||||
)
|
||||
|
||||
save(content, extendedInfo.fileName) {
|
||||
save(k, content, extendedInfo.fileName) {
|
||||
allocator.invoke().asInput()
|
||||
}
|
||||
}
|
||||
else -> simpleMessageContentCache.add(content)
|
||||
else -> simpleMessageContentCache.set(k, content)
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun save(
|
||||
k: K,
|
||||
content: MediaContent,
|
||||
filename: String,
|
||||
inputAllocator: suspend () -> Input
|
||||
): K {
|
||||
val key = simpleMessageContentCache.add(content)
|
||||
) {
|
||||
simpleMessageContentCache.set(k, content)
|
||||
runCatching {
|
||||
messagesFilesCache.set(key, filename, inputAllocator)
|
||||
messagesFilesCache.set(k, filename, inputAllocator)
|
||||
}.onFailure {
|
||||
simpleMessageContentCache.remove(key)
|
||||
simpleMessageContentCache.remove(k)
|
||||
}.onSuccess {
|
||||
with(mediaFileActualityChecker) {
|
||||
bot.saved(content)
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
)
|
||||
}
|
||||
)
|
||||
if (savedSimpleContent is MediaContent && !with(mediaFileActualityChecker) { bot.isActual(savedSimpleContent) }) {
|
||||
val savedFileContentAllocator = messagesFilesCache.get(k) ?: error("Unexpected absence of $k file for content ($simpleMessageContentCache)")
|
||||
val newContent = bot.execute(
|
||||
when (savedSimpleContent.asTelegramMedia()) {
|
||||
is TelegramMediaAnimation -> SendAnimation(
|
||||
filesRefreshingChatId,
|
||||
savedFileContentAllocator,
|
||||
disableNotification = true
|
||||
)
|
||||
is TelegramMediaAudio -> SendAudio(
|
||||
filesRefreshingChatId,
|
||||
savedFileContentAllocator,
|
||||
disableNotification = true
|
||||
)
|
||||
is TelegramMediaVideo -> SendVideo(
|
||||
filesRefreshingChatId,
|
||||
savedFileContentAllocator,
|
||||
disableNotification = true
|
||||
)
|
||||
is TelegramMediaDocument -> SendDocument(
|
||||
filesRefreshingChatId,
|
||||
savedFileContentAllocator,
|
||||
disableNotification = true
|
||||
)
|
||||
is TelegramMediaPhoto -> SendPhoto(
|
||||
filesRefreshingChatId,
|
||||
savedFileContentAllocator,
|
||||
disableNotification = true
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
simpleMessageContentCache.update(k, newContent.content)
|
||||
return newContent.content
|
||||
}
|
||||
simpleMessageContentCache.update(k, newContent.content)
|
||||
return newContent.content
|
||||
}
|
||||
return savedSimpleContent
|
||||
}
|
||||
@@ -122,7 +113,10 @@ class DefaultMessageContentCache<K>(
|
||||
bot: TelegramBot,
|
||||
filesRefreshingChatId: ChatId,
|
||||
simpleMessageContentCache: MessagesSimpleCache<String> = InMemoryMessagesSimpleCache(),
|
||||
mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
|
||||
MediaFileActualityChecker.Default(filesRefreshingChatId)
|
||||
),
|
||||
messagesFilesCache: MessagesFilesCache<String> = InMemoryMessagesFilesCache()
|
||||
) = DefaultMessageContentCache(bot, filesRefreshingChatId, simpleMessageContentCache, messagesFilesCache)
|
||||
) = DefaultMessageContentCache(bot, filesRefreshingChatId, simpleMessageContentCache, mediaFileActualityChecker, messagesFilesCache)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
package dev.inmo.tgbotapi.libraries.cache.media.common
|
||||
|
||||
import com.soywiz.klock.DateTime
|
||||
import com.soywiz.klock.milliseconds
|
||||
import dev.inmo.tgbotapi.bot.TelegramBot
|
||||
import dev.inmo.tgbotapi.requests.DeleteMessage
|
||||
import dev.inmo.tgbotapi.requests.abstracts.FileId
|
||||
import dev.inmo.tgbotapi.types.ChatId
|
||||
import dev.inmo.tgbotapi.types.MilliSeconds
|
||||
import dev.inmo.tgbotapi.types.message.content.MediaContent
|
||||
|
||||
fun interface MediaFileActualityChecker {
|
||||
suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean
|
||||
suspend fun TelegramBot.saved(mediaContent: MediaContent) {}
|
||||
|
||||
class Default(
|
||||
private val checkingChatId: ChatId
|
||||
) : MediaFileActualityChecker {
|
||||
override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean {
|
||||
return runCatching {
|
||||
execute(mediaContent.createResend(checkingChatId)).also { sentMessage ->
|
||||
execute(DeleteMessage(sentMessage.chat.id, sentMessage.messageId))
|
||||
}
|
||||
}.isSuccess
|
||||
}
|
||||
}
|
||||
|
||||
class WithDelay(
|
||||
private val underhoodChecker: MediaFileActualityChecker,
|
||||
private val checkingDelay: MilliSeconds = 24 * 60 * 60 * 1000L // one day
|
||||
) : MediaFileActualityChecker {
|
||||
private val fileIdChecksMap = mutableMapOf<FileId, DateTime>()
|
||||
private val checkingDelayTimeSpan = checkingDelay.milliseconds
|
||||
|
||||
override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean {
|
||||
val now = DateTime.now()
|
||||
val lastCheck = fileIdChecksMap[mediaContent.media.fileId]
|
||||
return if (lastCheck == null || now - lastCheck > checkingDelayTimeSpan) {
|
||||
with(underhoodChecker) {
|
||||
isActual(mediaContent)
|
||||
}.also {
|
||||
if (it) {
|
||||
fileIdChecksMap[mediaContent.media.fileId] = now
|
||||
}
|
||||
}
|
||||
} else {
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun TelegramBot.saved(mediaContent: MediaContent) {
|
||||
fileIdChecksMap[mediaContent.media.fileId] = DateTime.now()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,18 @@
|
||||
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 dev.inmo.tgbotapi.types.message.content.MediaContent
|
||||
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
||||
import io.ktor.utils.io.core.Input
|
||||
|
||||
interface MessageContentCache<K> {
|
||||
suspend fun save(content: MessageContent): K
|
||||
suspend fun save(k: K, content: MessageContent)
|
||||
suspend fun save(
|
||||
k: K,
|
||||
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)
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
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 dev.inmo.tgbotapi.requests.abstracts.MultipartFile
|
||||
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 get(k: K): MultipartFile?
|
||||
suspend fun remove(k: K)
|
||||
suspend fun contains(k: K): Boolean
|
||||
}
|
||||
@@ -18,16 +16,18 @@ interface MessagesFilesCache<K> {
|
||||
* disks-oriented one
|
||||
*/
|
||||
class InMemoryMessagesFilesCache<K> : MessagesFilesCache<K> {
|
||||
private val map = mutableMapOf<K, StorageFile>()
|
||||
private val map = mutableMapOf<K, MultipartFile>()
|
||||
|
||||
override suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) {
|
||||
map[k] = StorageFile(
|
||||
filename,
|
||||
inputAllocator().readBytes()
|
||||
)
|
||||
val input = inputAllocator()
|
||||
map[k] = MultipartFile(
|
||||
filename
|
||||
) {
|
||||
input
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun get(k: K): StorageFile? {
|
||||
override suspend fun get(k: K): MultipartFile? {
|
||||
return map[k]
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
package dev.inmo.tgbotapi.libraries.cache.media.common
|
||||
|
||||
import com.benasher44.uuid.uuid4
|
||||
import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
|
||||
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
||||
|
||||
interface MessagesSimpleCache<K> {
|
||||
suspend fun add(content: MessageContent): K
|
||||
suspend fun set(k: K, content: MessageContent)
|
||||
suspend fun update(k: K, content: MessageContent): Boolean
|
||||
suspend fun get(k: K): MessageContent?
|
||||
suspend fun remove(k: K)
|
||||
@@ -16,17 +15,14 @@ interface MessagesSimpleCache<K> {
|
||||
* 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> {
|
||||
class InMemoryMessagesSimpleCache<K> : MessagesSimpleCache<K> {
|
||||
private val map = mutableMapOf<K, MessageContent>()
|
||||
|
||||
override suspend fun add(
|
||||
override suspend fun set(
|
||||
k: K,
|
||||
content: MessageContent
|
||||
): K {
|
||||
val key = keyGenerator()
|
||||
map[key] = content
|
||||
return key
|
||||
) {
|
||||
map[k] = content
|
||||
}
|
||||
|
||||
override suspend fun update(
|
||||
@@ -54,10 +50,4 @@ class InMemoryMessagesSimpleCache<K>(
|
||||
override suspend fun contains(k: K): Boolean {
|
||||
return map.contains(k)
|
||||
}
|
||||
|
||||
companion object {
|
||||
operator fun invoke() = InMemoryMessagesSimpleCache {
|
||||
uuid4().toString()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package dev.inmo.tgbotapi.libraries.cache.media.common
|
||||
|
||||
import dev.inmo.tgbotapi.utils.*
|
||||
import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
|
||||
import io.ktor.utils.io.core.Input
|
||||
import io.ktor.utils.io.core.copyTo
|
||||
import io.ktor.utils.io.streams.asInput
|
||||
@@ -11,16 +11,14 @@ class InFilesMessagesFilesCache<K>(
|
||||
private val folderFile: File,
|
||||
private val filePrefixBuilder: (K) -> String
|
||||
) : MessagesFilesCache<K> {
|
||||
private val K.storageFile: StorageFile?
|
||||
private val K.multipartFile: MultipartFile?
|
||||
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)
|
||||
) {
|
||||
return MultipartFile(storageFileFilename) {
|
||||
file.inputStream().asInput()
|
||||
}
|
||||
}
|
||||
@@ -48,8 +46,8 @@ class InFilesMessagesFilesCache<K>(
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun get(k: K): StorageFile? {
|
||||
return k.storageFile
|
||||
override suspend fun get(k: K): MultipartFile? {
|
||||
return k.multipartFile
|
||||
}
|
||||
|
||||
override suspend fun remove(k: K) {
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
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 dev.inmo.tgbotapi.types.message.content.MessageContent
|
||||
import kotlinx.serialization.*
|
||||
import kotlinx.serialization.builtins.PairSerializer
|
||||
import kotlinx.serialization.builtins.serializer
|
||||
@@ -16,14 +15,10 @@ import kotlin.js.JsName
|
||||
import kotlin.jvm.JvmName
|
||||
|
||||
class SimpleKeyValueMessageContentCache<K>(
|
||||
private val keyValueRepo: KeyValueRepo<K, MessageContent>,
|
||||
private val keyGenerator: () -> K
|
||||
private val keyValueRepo: KeyValueRepo<K, MessageContent>
|
||||
) : MessagesSimpleCache<K> {
|
||||
override suspend fun add(content: MessageContent): K {
|
||||
val key = keyGenerator()
|
||||
keyValueRepo.set(key, content)
|
||||
|
||||
return key
|
||||
override suspend fun set(k: K, content: MessageContent) {
|
||||
keyValueRepo.set(k, content)
|
||||
}
|
||||
|
||||
override suspend fun update(k: K, content: MessageContent): Boolean {
|
||||
@@ -48,12 +43,6 @@ class SimpleKeyValueMessageContentCache<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(
|
||||
@@ -63,6 +52,8 @@ val chatIdToMessageIdentifierSerializer = PairSerializer(
|
||||
|
||||
val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class)
|
||||
|
||||
inline fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleKeyValueMessageContentCache(this)
|
||||
|
||||
inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
||||
serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } }
|
||||
): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
|
||||
|
||||
@@ -6,32 +6,32 @@ kotlin.incremental.js=true
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
|
||||
kotlin_version=1.6.10
|
||||
kotlin_serialisation_core_version=1.3.2
|
||||
kotlin_version=1.6.21
|
||||
kotlin_serialisation_core_version=1.3.3
|
||||
|
||||
github_release_plugin_version=2.2.12
|
||||
github_release_plugin_version=2.3.7
|
||||
|
||||
tgbotapi_version=0.38.12
|
||||
micro_utils_version=0.9.20
|
||||
exposed_version=0.37.3
|
||||
plagubot_version=0.5.1
|
||||
tgbotapi_version=2.0.2
|
||||
micro_utils_version=0.11.1
|
||||
exposed_version=0.38.2
|
||||
plagubot_version=1.1.1
|
||||
|
||||
# ANDROID
|
||||
|
||||
android_minSdkVersion=21
|
||||
android_compileSdkVersion=32
|
||||
android_buildToolsVersion=32.0.0
|
||||
dexcount_version=3.0.1
|
||||
dexcount_version=3.1.0
|
||||
junit_version=4.12
|
||||
test_ext_junit_version=1.1.2
|
||||
espresso_core=3.3.0
|
||||
|
||||
# Dokka
|
||||
|
||||
dokka_version=1.6.10
|
||||
dokka_version=1.6.21
|
||||
|
||||
# Project data
|
||||
|
||||
group=dev.inmo
|
||||
version=0.0.17
|
||||
android_code_version=17
|
||||
version=0.2.1
|
||||
android_code_version=21
|
||||
|
||||
@@ -5,7 +5,11 @@ apply from: "$publishGradlePath"
|
||||
|
||||
kotlin {
|
||||
jvm {
|
||||
compilations.main.kotlinOptions.useIR = true
|
||||
compilations.main {
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -4,7 +4,13 @@ project.group = "$group"
|
||||
apply from: "$publishGradlePath"
|
||||
|
||||
kotlin {
|
||||
jvm()
|
||||
jvm {
|
||||
compilations.main {
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
}
|
||||
}
|
||||
}
|
||||
js (IR) {
|
||||
browser()
|
||||
nodejs()
|
||||
|
||||
Reference in New Issue
Block a user