preview adding of several sources chats

2025-12-11 23:45:40 +00:00 · 2023-12-11 00:19:18 +06:00
25 changed files with 96 additions and 100 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,5 @@
 # PlaguPoster

-## 0.5.5
-
-* Dependencies update
-
-## 0.5.4
-
-* Dependencies update
-
-## 0.5.3
-
-* Dependencies update
-
 ## 0.5.2

 * Dependencies update
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ allprojects {
        mavenLocal()
        mavenCentral()
        google()
-        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
+        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
    }
 }

--- a/common/src/commonMain/kotlin/ShortMessageInfo.kt
+++ b/common/src/commonMain/kotlin/ShortMessageInfo.kt
@@ -1,6 +1,9 @@
 package dev.inmo.plaguposter.common

-import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
+import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import kotlinx.serialization.Serializable

@@ -8,7 +11,7 @@ import kotlinx.serialization.Serializable
 data class ShortMessageInfo(
    @Serializable(FullChatIdentifierSerializer::class)
    val chatId: IdChatIdentifier,
-    val messageId: MessageId
+    val messageId: MessageIdentifier
 )

 fun Message.short() = ShortMessageInfo(chat.id, messageId)
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,4 @@ android.enableJetifier=true
 # Project data

 group=dev.inmo
-version=0.5.5
+version=0.5.2
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,16 +1,16 @@
 [versions]

-kotlin = "1.9.23"
-kotlin-serialization = "1.6.3"
+kotlin = "1.9.21"
+kotlin-serialization = "1.6.2"

-plagubot = "8.3.0"
-tgbotapi = "12.0.1"
-microutils = "0.20.45"
-kslog = "1.3.3"
-krontab = "2.2.9"
-plagubot-plugins = "0.18.3"
+plagubot = "7.4.1"
+tgbotapi = "9.4.2"
+microutils = "0.20.19"
+kslog = "1.3.1"
+krontab = "2.2.4"
+plagubot-plugins = "0.17.1"

-dokka = "1.9.20"
+dokka = "1.9.10"

 psql = "42.6.0"

--- a/posts/panel/src/jvmMain/kotlin/Plugin.kt
+++ b/posts/panel/src/jvmMain/kotlin/Plugin.kt
@@ -30,8 +30,7 @@ import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard
 import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.ReplyParameters
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.message.ParseMode
@@ -113,7 +112,7 @@ object Plugin : Plugin {
                firstContent.chatId,
                text = config.text,
                parseMode = config.parseMode,
-                replyParameters = ReplyParameters(firstContent.chatId, firstContent.messageId),
+                replyToMessageId = firstContent.messageId,
                replyMarkup = InlineKeyboardMarkup(buttons),
                disableNotification = true
            ).also { sentMessage ->
@@ -129,7 +128,7 @@ object Plugin : Plugin {
        suspend fun refreshPostMessage(
            postId: PostId,
            chatId: IdChatIdentifier,
-            messageId: MessageId
+            messageId: MessageIdentifier
        ) {
            val post = postsRepo.getById(postId) ?: return
            val buttons = api.buttonsBuilders.chunked(config.buttonsPerRow).mapNotNull { row ->
--- a/posts/panel/src/jvmMain/kotlin/repos/PostsMessages.kt
+++ b/posts/panel/src/jvmMain/kotlin/repos/PostsMessages.kt
@@ -4,18 +4,21 @@ import dev.inmo.micro_utils.repos.KeyValueRepo
 import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
 import dev.inmo.micro_utils.repos.mappers.withMapper
 import dev.inmo.plaguposter.posts.models.PostId
-import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
+import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import kotlinx.serialization.builtins.PairSerializer
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.Json
 import org.jetbrains.exposed.sql.Database

-private val ChatIdToMessageSerializer = PairSerializer(FullChatIdentifierSerializer, MessageId.serializer())
+private val ChatIdToMessageSerializer = PairSerializer(FullChatIdentifierSerializer, MessageIdentifier.serializer())

 fun PostsMessages(
    database: Database,
    json: Json
-): KeyValueRepo<PostId, Pair<IdChatIdentifier, MessageId>> = ExposedKeyValueRepo<String, String>(
+): KeyValueRepo<PostId, Pair<IdChatIdentifier, MessageIdentifier>> = ExposedKeyValueRepo<String, String>(
    database,
    { text("postId") },
    { text("chatToMessage") },
--- a/posts/src/commonMain/kotlin/models/PostContentInfo.kt
+++ b/posts/src/commonMain/kotlin/models/PostContentInfo.kt
@@ -1,7 +1,10 @@
 package dev.inmo.plaguposter.posts.models

 import dev.inmo.tgbotapi.extensions.utils.possiblyMediaGroupMessageOrNull
-import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
+import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
 import kotlinx.serialization.Serializable
@@ -10,8 +13,8 @@ import kotlinx.serialization.Serializable
 data class PostContentInfo(
    @Serializable(FullChatIdentifierSerializer::class)
    val chatId: IdChatIdentifier,
-    val messageId: MessageId,
-    val group: MediaGroupId?,
+    val messageId: MessageIdentifier,
+    val group: String?,
    val order: Int
 ) {
    companion object {
--- a/posts/src/commonMain/kotlin/repo/ReadPostsRepo.kt
+++ b/posts/src/commonMain/kotlin/repo/ReadPostsRepo.kt
@@ -5,10 +5,10 @@ import dev.inmo.micro_utils.repos.ReadCRUDRepo
 import dev.inmo.plaguposter.posts.models.*
 import dev.inmo.tgbotapi.types.ChatId
 import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.MessageIdentifier

 interface ReadPostsRepo : ReadCRUDRepo<RegisteredPost, PostId> {
-    suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageId): PostId?
+    suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageIdentifier): PostId?
    suspend fun getPostCreationTime(postId: PostId): DateTime?
    suspend fun getFirstMessageInfo(postId: PostId): PostContentInfo?
 }
--- a/posts/src/jvmMain/kotlin/Plugin.kt
+++ b/posts/src/jvmMain/kotlin/Plugin.kt
@@ -58,7 +58,7 @@ object Plugin : Plugin {
        }
        single {
            val config = get<Config>()
-            PostPublisher(get(), get(), config.chats.cacheChatId, config.chats.allTargetChatIds.toList(), config.deleteAfterPublishing)
+            PostPublisher(get(), get(), config.chats.cacheChatId, config.chats.allTargetChatIds, config.deleteAfterPublishing)
        }
    }

--- a/posts/src/jvmMain/kotlin/cached/CachedPostsRepo.kt
+++ b/posts/src/jvmMain/kotlin/cached/CachedPostsRepo.kt
@@ -16,7 +16,7 @@ import dev.inmo.plaguposter.posts.models.PostId
 import dev.inmo.plaguposter.posts.models.RegisteredPost
 import dev.inmo.plaguposter.posts.repo.PostsRepo
 import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow

@@ -34,7 +34,7 @@ class CachedPostsRepo(
 ) {
    override val removedPostsFlow: Flow<RegisteredPost> by parentRepo::removedPostsFlow

-    override suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageId): PostId? {
+    override suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageIdentifier): PostId? {
        doForAllWithNextPaging(firstPageWithOneElementPagination) {
            kvCache.values(it).also {
                it.results.forEach {
--- a/posts/src/jvmMain/kotlin/exposed/ExposedContentInfoRepo.kt
+++ b/posts/src/jvmMain/kotlin/exposed/ExposedContentInfoRepo.kt
@@ -4,7 +4,8 @@ import com.benasher44.uuid.uuid4
 import dev.inmo.micro_utils.repos.KeyValuesRepo
 import dev.inmo.micro_utils.repos.exposed.*
 import dev.inmo.plaguposter.posts.models.*
-import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import org.jetbrains.exposed.sql.*

 internal class ExposedContentInfoRepo(
@@ -20,9 +21,9 @@ internal class ExposedContentInfoRepo(

    val ResultRow.asObject
        get() = PostContentInfo(
-            IdChatIdentifier(RawChatId(get(chatIdColumn)), get(threadIdColumn) ?.let(::MessageThreadId)),
-            MessageId(get(messageIdColumn)),
-            get(groupColumn) ?.let(::MediaGroupId),
+            IdChatIdentifier(get(chatIdColumn), get(threadIdColumn)),
+            get(messageIdColumn),
+            get(groupColumn),
            get(orderColumn)
        )

--- a/posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt
+++ b/posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt
@@ -10,7 +10,7 @@ import dev.inmo.plaguposter.posts.models.*
 import dev.inmo.plaguposter.posts.repo.PostsRepo
 import dev.inmo.tgbotapi.types.ChatId
 import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import kotlinx.coroutines.flow.*
 import kotlinx.serialization.json.Json
 import org.jetbrains.exposed.sql.*
@@ -93,10 +93,10 @@ class ExposedPostsRepo(
                post.content.forEach { contentInfo ->
                    insert {
                        it[postIdColumn] = post.id.string
-                        it[chatIdColumn] = contentInfo.chatId.chatId.long
-                        it[threadIdColumn] = contentInfo.chatId.threadId ?.long
-                        it[messageIdColumn] = contentInfo.messageId.long
-                        it[groupColumn] = contentInfo.group ?.string
+                        it[chatIdColumn] = contentInfo.chatId.chatId
+                        it[threadIdColumn] = contentInfo.chatId.threadId
+                        it[messageIdColumn] = contentInfo.messageId
+                        it[groupColumn] = contentInfo.group
                        it[orderColumn] = contentInfo.order
                    }
                }
@@ -153,13 +153,13 @@ class ExposedPostsRepo(
        }
    }

-    override suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageId): PostId? {
+    override suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageIdentifier): PostId? {
        return transaction(database) {
            with(contentRepo) {
                select {
-                    chatIdColumn.eq(chatId.chatId.long)
-                        .and(chatId.threadId ?.let { threadIdColumn.eq(it.long) } ?: threadIdColumn.isNull())
-                        .and(messageIdColumn.eq(messageId.long))
+                    chatIdColumn.eq(chatId.chatId)
+                        .and(chatId.threadId ?.let { threadIdColumn.eq(it) } ?: threadIdColumn.isNull())
+                        .and(messageIdColumn.eq(messageId))
                }.limit(1).firstOrNull() ?.get(postIdColumn)
            } ?.let(::PostId)
        }
--- a/ratings/source/src/commonMain/kotlin/repos/CachedPollsToMessagesInfoRepo.kt
+++ b/ratings/source/src/commonMain/kotlin/repos/CachedPollsToMessagesInfoRepo.kt
@@ -1,15 +1,14 @@
 package dev.inmo.plaguposter.ratings.source.repos

 import dev.inmo.micro_utils.repos.KeyValueRepo
-import dev.inmo.micro_utils.repos.MapKeyValueRepo
 import dev.inmo.micro_utils.repos.cache.cache.FullKVCache
 import dev.inmo.micro_utils.repos.cache.full.fullyCached
 import dev.inmo.plaguposter.common.ShortMessageInfo
-import dev.inmo.tgbotapi.types.PollId
+import dev.inmo.tgbotapi.types.PollIdentifier
 import kotlinx.coroutines.CoroutineScope

 class CachedPollsToMessagesInfoRepo(
    private val repo: PollsToMessagesInfoRepo,
    private val scope: CoroutineScope,
-    private val kvCache: KeyValueRepo<PollId, ShortMessageInfo> = MapKeyValueRepo()
-) : PollsToMessagesInfoRepo, KeyValueRepo<PollId, ShortMessageInfo> by repo.fullyCached(kvCache, scope)
+    private val kvCache: FullKVCache<PollIdentifier, ShortMessageInfo> = FullKVCache()
+) : PollsToMessagesInfoRepo, KeyValueRepo<PollIdentifier, ShortMessageInfo> by repo.fullyCached(kvCache, scope)
--- a/ratings/source/src/commonMain/kotlin/repos/CachedPollsToPostsIdsRepo.kt
+++ b/ratings/source/src/commonMain/kotlin/repos/CachedPollsToPostsIdsRepo.kt
@@ -1,15 +1,14 @@
 package dev.inmo.plaguposter.ratings.source.repos

 import dev.inmo.micro_utils.repos.KeyValueRepo
-import dev.inmo.micro_utils.repos.MapKeyValueRepo
 import dev.inmo.micro_utils.repos.cache.cache.FullKVCache
 import dev.inmo.micro_utils.repos.cache.full.fullyCached
 import dev.inmo.plaguposter.posts.models.PostId
-import dev.inmo.tgbotapi.types.PollId
+import dev.inmo.tgbotapi.types.PollIdentifier
 import kotlinx.coroutines.CoroutineScope

 class CachedPollsToPostsIdsRepo(
    private val repo: PollsToPostsIdsRepo,
    private val scope: CoroutineScope,
-    private val kvCache: KeyValueRepo<PollId, PostId> = MapKeyValueRepo()
-) : PollsToPostsIdsRepo, KeyValueRepo<PollId, PostId> by repo.fullyCached(kvCache, scope)
+    private val kvCache: FullKVCache<PollIdentifier, PostId> = FullKVCache()
+) : PollsToPostsIdsRepo, KeyValueRepo<PollIdentifier, PostId> by repo.fullyCached(kvCache, scope)
--- a/ratings/source/src/commonMain/kotlin/repos/PollsToMessagesInfoRepo.kt
+++ b/ratings/source/src/commonMain/kotlin/repos/PollsToMessagesInfoRepo.kt
@@ -3,6 +3,6 @@ package dev.inmo.plaguposter.ratings.source.repos
 import dev.inmo.micro_utils.repos.KeyValueRepo
 import dev.inmo.plaguposter.common.ShortMessageInfo
 import dev.inmo.plaguposter.posts.models.PostId
-import dev.inmo.tgbotapi.types.PollId
+import dev.inmo.tgbotapi.types.PollIdentifier

-interface PollsToMessagesInfoRepo : KeyValueRepo<PollId, ShortMessageInfo>
+interface PollsToMessagesInfoRepo : KeyValueRepo<PollIdentifier, ShortMessageInfo>
--- a/ratings/source/src/commonMain/kotlin/repos/PollsToPostsIdsRepo.kt
+++ b/ratings/source/src/commonMain/kotlin/repos/PollsToPostsIdsRepo.kt
@@ -2,6 +2,6 @@ package dev.inmo.plaguposter.ratings.source.repos

 import dev.inmo.micro_utils.repos.KeyValueRepo
 import dev.inmo.plaguposter.posts.models.PostId
-import dev.inmo.tgbotapi.types.PollId
+import dev.inmo.tgbotapi.types.PollIdentifier

-interface PollsToPostsIdsRepo : KeyValueRepo<PollId, PostId>
+interface PollsToPostsIdsRepo : KeyValueRepo<PollIdentifier, PostId>
--- a/ratings/source/src/jvmMain/kotlin/Plugin.kt
+++ b/ratings/source/src/jvmMain/kotlin/Plugin.kt
@@ -37,7 +37,6 @@ import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard
-import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
 import dev.inmo.tgbotapi.types.message.textsources.bold
 import dev.inmo.tgbotapi.types.message.textsources.regular
@@ -130,7 +129,7 @@ object Plugin : Plugin {
                        content.chatId,
                        config.ratingOfferText,
                        config.variants.keys.toList(),
-                        replyParameters = ReplyParameters(content.chatId, content.messageId)
+                        replyToMessageId = content.messageId
                    )
                    pollsToPostsIdsRepo.set(sent.content.poll.id, postId)
                    pollsToMessageInfoRepo.set(sent.content.poll.id, sent.short())
--- a/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt
+++ b/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt
@@ -3,7 +3,9 @@ package dev.inmo.plaguposter.ratings.source.repos
 import dev.inmo.micro_utils.repos.exposed.initTable
 import dev.inmo.micro_utils.repos.exposed.keyvalue.AbstractExposedKeyValueRepo
 import dev.inmo.plaguposter.common.ShortMessageInfo
-import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.PollIdentifier
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNull
@@ -11,7 +13,7 @@ import org.jetbrains.exposed.sql.statements.*

 class ExposedPollsToMessagesInfoRepo(
    database: Database
-) : PollsToMessagesInfoRepo, AbstractExposedKeyValueRepo<PollId, ShortMessageInfo>(
+) : PollsToMessagesInfoRepo, AbstractExposedKeyValueRepo<PollIdentifier, ShortMessageInfo>(
    database,
    "polls_to_their_messages_info"
 ) {
@@ -19,32 +21,31 @@ class ExposedPollsToMessagesInfoRepo(
    private val chatIdColumn = long("chat_id")
    private val threadIdColumn = long("thread_id").nullable().default(null)
    private val messageIdColumn = long("message_id")
-    override val selectById: ISqlExpressionBuilder.(PollId) -> Op<Boolean> = { keyColumn.eq(it.string) }
+    override val selectById: ISqlExpressionBuilder.(PollIdentifier) -> Op<Boolean> = { keyColumn.eq(it) }
    override val selectByValue: ISqlExpressionBuilder.(ShortMessageInfo) -> Op<Boolean> = {
-        chatIdColumn.eq(it.chatId.chatId.long)
-            .and(it.chatId.threadId?.let { threadIdColumn.eq(it.long) } ?: threadIdColumn.isNull()).and(
-            messageIdColumn.eq(it.messageId.long)
+        chatIdColumn.eq(it.chatId.chatId).and(it.chatId.threadId ?.let { threadIdColumn.eq(it) } ?: threadIdColumn.isNull()).and(
+            messageIdColumn.eq(it.messageId)
        )
    }
-    override val ResultRow.asKey: PollId
-        get() = PollId(get(keyColumn))
+    override val ResultRow.asKey: PollIdentifier
+        get() = get(keyColumn)
    override val ResultRow.asObject: ShortMessageInfo
        get() = ShortMessageInfo(
-            IdChatIdentifier(RawChatId(get(chatIdColumn)), get(threadIdColumn) ?.let(::MessageThreadId)),
-            MessageId(get(messageIdColumn))
+            IdChatIdentifier(get(chatIdColumn), get(threadIdColumn)),
+            get(messageIdColumn)
        )

    init {
        initTable()
    }

-    override fun update(k: PollId, v: ShortMessageInfo, it: UpdateBuilder<Int>) {
-        it[chatIdColumn] = v.chatId.chatId.long
-        it[threadIdColumn] = v.chatId.threadId ?.long
-        it[messageIdColumn] = v.messageId.long
+    override fun update(k: PollIdentifier, v: ShortMessageInfo, it: UpdateBuilder<Int>) {
+        it[chatIdColumn] = v.chatId.chatId
+        it[threadIdColumn] = v.chatId.threadId
+        it[messageIdColumn] = v.messageId
    }

-    override fun insertKey(k: PollId, v: ShortMessageInfo, it: InsertStatement<Number>) {
-        it[keyColumn] = k.string
+    override fun insertKey(k: PollIdentifier, v: ShortMessageInfo, it: InsertStatement<Number>) {
+        it[keyColumn] = k
    }
 }
--- a/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt
+++ b/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt
@@ -3,19 +3,19 @@ package dev.inmo.plaguposter.ratings.source.repos
 import dev.inmo.micro_utils.repos.exposed.initTable
 import dev.inmo.micro_utils.repos.exposed.keyvalue.AbstractExposedKeyValueRepo
 import dev.inmo.plaguposter.posts.models.PostId
-import dev.inmo.tgbotapi.types.PollId
+import dev.inmo.tgbotapi.types.PollIdentifier
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.statements.*

 class ExposedPollsToPostsIdsRepo(
    database: Database
-) : PollsToPostsIdsRepo, AbstractExposedKeyValueRepo<PollId, PostId>(database, "polls_to_posts") {
+) : PollsToPostsIdsRepo, AbstractExposedKeyValueRepo<PollIdentifier, PostId>(database, "polls_to_posts") {
    override val keyColumn = text("poll_id")
    val postIdColumn = text("postId")
-    override val selectById: ISqlExpressionBuilder.(PollId) -> Op<Boolean> = { keyColumn.eq(it.string) }
+    override val selectById: ISqlExpressionBuilder.(PollIdentifier) -> Op<Boolean> = { keyColumn.eq(it) }
    override val selectByValue: ISqlExpressionBuilder.(PostId) -> Op<Boolean> = { postIdColumn.eq(it.string) }
-    override val ResultRow.asKey: PollId
-        get() = PollId(get(keyColumn))
+    override val ResultRow.asKey: PollIdentifier
+        get() = get(keyColumn)
    override val ResultRow.asObject: PostId
        get() = get(postIdColumn).let(::PostId)

@@ -23,11 +23,11 @@ class ExposedPollsToPostsIdsRepo(
        initTable()
    }

-    override fun update(k: PollId, v: PostId, it: UpdateBuilder<Int>) {
+    override fun update(k: PollIdentifier, v: PostId, it: UpdateBuilder<Int>) {
        it[postIdColumn] = v.string
    }

-    override fun insertKey(k: PollId, v: PostId, it: InsertStatement<Number>) {
-        it[keyColumn] = k.string
+    override fun insertKey(k: PollIdentifier, v: PostId, it: InsertStatement<Number>) {
+        it[keyColumn] = k
    }
 }
--- a/ratings/src/commonMain/kotlin/repo/CachedRatingsRepo.kt
+++ b/ratings/src/commonMain/kotlin/repo/CachedRatingsRepo.kt
@@ -2,7 +2,7 @@ package dev.inmo.plaguposter.ratings.repo

 import dev.inmo.micro_utils.pagination.utils.doForAllWithNextPaging
 import dev.inmo.micro_utils.repos.KeyValueRepo
-import dev.inmo.micro_utils.repos.MapKeyValueRepo
+import dev.inmo.micro_utils.repos.cache.cache.FullKVCache
 import dev.inmo.micro_utils.repos.cache.full.FullKeyValueCacheRepo
 import dev.inmo.plaguposter.posts.models.PostId
 import dev.inmo.plaguposter.ratings.models.Rating
@@ -11,7 +11,7 @@ import kotlinx.coroutines.CoroutineScope
 class CachedRatingsRepo(
    private val base: RatingsRepo,
    private val scope: CoroutineScope,
-    private val kvCache: MapKeyValueRepo<PostId, Rating> = MapKeyValueRepo()
+    private val kvCache: FullKVCache<PostId, Rating> = FullKVCache()
 ) : RatingsRepo, KeyValueRepo<PostId, Rating> by FullKeyValueCacheRepo(base, kvCache, scope) {
    override suspend fun getPosts(
        range: ClosedRange<Rating>,
--- a/ratings/src/jvmMain/kotlin/Plugin.kt
+++ b/ratings/src/jvmMain/kotlin/Plugin.kt
@@ -5,6 +5,7 @@ import dev.inmo.micro_utils.koin.singleWithBinds
 import dev.inmo.micro_utils.repos.unset
 import dev.inmo.plagubot.Plugin
 import dev.inmo.plaguposter.common.useCache
+import dev.inmo.plaguposter.posts.exposed.ExposedPostsRepo
 import dev.inmo.plaguposter.posts.repo.PostsRepo
 import dev.inmo.plaguposter.ratings.exposed.ExposedRatingsRepo
 import dev.inmo.plaguposter.ratings.repo.*
@@ -13,6 +14,7 @@ import kotlinx.serialization.json.*
 import org.jetbrains.exposed.sql.Database
 import org.koin.core.Koin
 import org.koin.core.module.Module
+import org.koin.dsl.binds

 object Plugin : Plugin {
    override fun Module.setupDI(database: Database, params: JsonObject) {
--- a/ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt
+++ b/ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt
@@ -49,7 +49,7 @@ class ExposedRatingsRepo (
        count: Int?,
        exclude: List<PostId>
    ): Map<PostId, Rating> = transaction(database) {
-        selectAll().where {
+        select {
            ratingsColumn.greaterEq(range.start.double).and(
                ratingsColumn.lessEq(range.endInclusive.double)
            ).and(
@@ -66,7 +66,7 @@ class ExposedRatingsRepo (
        count: Int?,
        exclude: List<PostId>
    ) = transaction(database) {
-        selectAll().where { ratingsColumn.greaterEq(then.double).and(keyColumn.notInList(exclude.map { it.string })) }.optionallyLimit(count).optionallyReverse(reversed).map {
+        select { ratingsColumn.greaterEq(then.double).and(keyColumn.notInList(exclude.map { it.string })) }.optionallyLimit(count).optionallyReverse(reversed).map {
            it.asKey to it.asObject
        }
    }.toMap()
@@ -77,7 +77,7 @@ class ExposedRatingsRepo (
        count: Int?,
        exclude: List<PostId>
    ): Map<PostId, Rating> = transaction(database) {
-        selectAll().where { ratingsColumn.lessEq(then.double).and(keyColumn.notInList(exclude.map { it.string })) }.optionallyLimit(count).optionallyReverse(reversed).map {
+        select { ratingsColumn.lessEq(then.double).and(keyColumn.notInList(exclude.map { it.string })) }.optionallyLimit(count).optionallyReverse(reversed).map {
            it.asKey to it.asObject
        }
    }.toMap()
--- a/triggers/command/src/jvmMain/kotlin/Plugin.kt
+++ b/triggers/command/src/jvmMain/kotlin/Plugin.kt
@@ -24,7 +24,7 @@ import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard
 import dev.inmo.tgbotapi.types.ChatId
-import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
 import dev.inmo.tgbotapi.types.message.textsources.regular
 import kotlinx.coroutines.flow.first
@@ -38,8 +38,8 @@ object Plugin : Plugin {
    @Serializable
    private data class PublishState(
        override val context: ChatId,
-        val sourceMessageId: MessageId,
-        val messageInReply: MessageId
+        val sourceMessageId: MessageIdentifier,
+        val messageInReply: MessageIdentifier
    ) : State
    @Serializable
    internal data class Config(
--- a/triggers/timer/src/commonMain/kotlin/TimersHandler.kt
+++ b/triggers/timer/src/commonMain/kotlin/TimersHandler.kt
@@ -7,7 +7,6 @@ import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.repos.unset
 import dev.inmo.plaguposter.posts.models.PostId
 import dev.inmo.plaguposter.posts.sending.PostPublisher
-import korlibs.time.millisecondsLong
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay