Merge pull request #21 from InsanusMokrassar/0.5.2

0.5.2

CHANGELOG.md

@@ -1,5 +1,13 @@
 # PlaguPoster
 
+## 0.5.2
+
+* Dependencies update
+
+## 0.5.1
+
+* Add opportunity to set unique 
+
 ## 0.5.0
 
 * Dependencies update

gradle.properties

@@ -10,4 +10,4 @@ android.enableJetifier=true
 # Project data
 
 group=dev.inmo
-version=0.5.0
+version=0.5.2

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
 
-kotlin = "1.9.20"
-kotlin-serialization = "1.6.0"
+kotlin = "1.9.21"
+kotlin-serialization = "1.6.2"
 
-plagubot = "7.3.0"
-tgbotapi = "9.3.0"
-microutils = "0.20.12"
-kslog = "1.2.4"
-krontab = "2.2.3"
-plagubot-plugins = "0.16.0"
+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.10"
 

posts/gc/src/jvmMain/kotlin/Plugin.kt

@@ -11,6 +11,9 @@ import dev.inmo.micro_utils.coroutines.actor
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.repos.deleteById
 import dev.inmo.plagubot.Plugin
+import dev.inmo.plagubot.plugins.inline.queries.models.Format
+import dev.inmo.plagubot.plugins.inline.queries.models.OfferTemplate
+import dev.inmo.plagubot.plugins.inline.queries.repos.InlineTemplatesRepo
 import dev.inmo.plaguposter.common.ChatConfig
 import dev.inmo.plaguposter.posts.models.NewPost
 import dev.inmo.plaguposter.posts.models.PostContentInfo
@@ -20,7 +23,10 @@ import dev.inmo.tgbotapi.extensions.api.edit.edit
 import dev.inmo.tgbotapi.extensions.api.forwardMessage
 import dev.inmo.tgbotapi.extensions.api.send.send
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitInlineMessageIdDataCallbackQuery
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitMessageDataCallbackQuery
+import dev.inmo.tgbotapi.extensions.behaviour_builder.oneOf
+import dev.inmo.tgbotapi.extensions.behaviour_builder.parallel
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
 import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
@@ -147,9 +153,18 @@ object Plugin : Plugin {
                     }
                 )
 
-                val answer = waitMessageDataCallbackQuery().filter {
-                    it.message.sameMessage(message)
-                }.first()
+                val answer = oneOf(
+                    parallel {
+                        waitMessageDataCallbackQuery().filter {
+                            it.message.sameMessage(message)
+                        }.first()
+                    },
+                    parallel {
+                        waitInlineMessageIdDataCallbackQuery().filter {
+                            it.data == yesData || it.data == noData
+                        }.first()
+                    }
+                )
 
                 if (answer.data == yesData) {
                     if (recheckActor.trySend(Unit).isSuccess) {
@@ -164,5 +179,14 @@ object Plugin : Plugin {
                 }
             }
         }
+        koin.getOrNull<InlineTemplatesRepo>() ?.addTemplate(
+            OfferTemplate(
+                "Force posts check",
+                listOf(
+                    Format("/force_garbage_collection")
+                ),
+                "Force check posts without exists messages"
+            )
+        )
     }
 }

ratings/selector/src/commonMain/kotlin/DefaultSelector.kt

@@ -1,5 +1,6 @@
 package dev.inmo.plaguposter.ratings.selector
 
+import dev.inmo.micro_utils.repos.KeyValueRepo
 import korlibs.time.DateTime
 import dev.inmo.plaguposter.posts.models.PostId
 import dev.inmo.plaguposter.posts.repo.PostsRepo
@@ -9,13 +10,14 @@ import dev.inmo.plaguposter.ratings.selector.models.SelectorConfig
 class DefaultSelector (
     private val config: SelectorConfig,
     private val ratingsRepo: RatingsRepo,
-    private val postsRepo: PostsRepo
+    private val postsRepo: PostsRepo,
+    private val latestChosenRepo: KeyValueRepo<PostId, DateTime>
 ) : Selector {
     override suspend fun take(n: Int, now: DateTime, exclude: List<PostId>): List<PostId> {
         val result = mutableListOf<PostId>()
 
         do {
-            val selected = config.active(now.time) ?.rating ?.select(ratingsRepo, postsRepo, result + exclude, now) ?: break
+            val selected = config.active(now.time) ?.rating ?.select(ratingsRepo, postsRepo, result + exclude, now, latestChosenRepo) ?: break
             result.add(selected)
         } while (result.size < n)
 

ratings/selector/src/commonMain/kotlin/models/RatingConfig.kt

@@ -2,11 +2,9 @@ package dev.inmo.plaguposter.ratings.selector.models
 
 import korlibs.time.DateTime
 import korlibs.time.seconds
-import dev.inmo.micro_utils.pagination.FirstPagePagination
-import dev.inmo.micro_utils.pagination.Pagination
 import dev.inmo.micro_utils.pagination.utils.getAllByWithNextPaging
-import dev.inmo.micro_utils.repos.pagination.getAll
-import dev.inmo.plaguposter.common.DateTimeSerializer
+import dev.inmo.micro_utils.repos.KeyValueRepo
+import dev.inmo.micro_utils.repos.unset
 import dev.inmo.plaguposter.posts.models.PostId
 import dev.inmo.plaguposter.posts.repo.PostsRepo
 import dev.inmo.plaguposter.ratings.models.Rating
@@ -25,17 +23,23 @@ data class RatingConfig(
     val max: Rating? = null,
     val prefer: Prefer = Prefer.Random,
     val otherwise: RatingConfig? = null,
-    val postAge: Seconds? = null
+    val postAge: Seconds? = null,
+    val uniqueCount: Int? = null
 ) {
     suspend fun select(
         ratingsRepo: RatingsRepo,
         postsRepo: PostsRepo,
         exclude: List<PostId>,
-        now: DateTime
+        now: DateTime,
+        latestChosenRepo: KeyValueRepo<PostId, DateTime>
     ): PostId? {
         var reversed: Boolean = false
         var count: Int? = null
         val allowedCreationTime = now - (postAge ?: 0).seconds
+        val excludedByRepo = uniqueCount ?.let {
+            latestChosenRepo.getAll().toList().sortedBy { it.second }.takeLast(uniqueCount).map { it.first }
+        } ?: emptyList()
+        val resultExcluded = exclude + excludedByRepo
 
         when (prefer) {
             Prefer.Max -> {
@@ -59,40 +63,53 @@ data class RatingConfig(
                         ratingsRepo.getAllByWithNextPaging { keys(it) }
                     }
                     else -> {
-                        ratingsRepo.getPostsWithRatingLessEq(max, exclude = exclude).keys
+                        ratingsRepo.getPostsWithRatingLessEq(max, exclude = resultExcluded).keys
                     }
                 }
             }
             else -> {
                 when (max) {
                     null -> {
-                        ratingsRepo.getPostsWithRatingGreaterEq(min, exclude = exclude).keys
+                        ratingsRepo.getPostsWithRatingGreaterEq(min, exclude = resultExcluded).keys
                     }
                     else -> {
-                        ratingsRepo.getPosts(min .. max, reversed, count, exclude = exclude).keys
+                        ratingsRepo.getPosts(min .. max, reversed, count, exclude = resultExcluded).keys
                     }
                 }
             }
         }.filter {
-            it !in exclude && (postsRepo.getPostCreationTime(it) ?.let { it < allowedCreationTime } ?: true)
+            it !in resultExcluded && (postsRepo.getPostCreationTime(it) ?.let { it < allowedCreationTime } ?: true)
         }
 
-        return when (prefer) {
+        val resultPosts: PostId = when (prefer) {
             Prefer.Max,
             Prefer.Min -> posts.firstOrNull()
             Prefer.Random -> posts.randomOrNull()
-        } ?: otherwise ?.select(ratingsRepo, postsRepo, exclude, now)
+        } ?: otherwise ?.select(ratingsRepo, postsRepo, resultExcluded, now, latestChosenRepo) ?: return null
+
+        val postsToKeep = uniqueCount ?.let {
+            (excludedByRepo + resultPosts).takeLast(it)
+        } ?: return resultPosts
+
+        val postsToRemoveFromKeep = excludedByRepo.filter { it !in postsToKeep }
+        latestChosenRepo.unset(postsToRemoveFromKeep)
+        val postsToAdd = postsToKeep.filter { it !in excludedByRepo }
+        latestChosenRepo.set(
+            postsToAdd.associateWith { DateTime.now() }
+        )
+
+        return resultPosts
     }
 
     @Serializable(Prefer.Serializer::class)
     sealed interface Prefer {
         val type: String
         @Serializable(Serializer::class)
-        object Max : Prefer { override val type: String = "max" }
+        data object Max : Prefer { override val type: String = "max" }
         @Serializable(Serializer::class)
-        object Min : Prefer { override val type: String = "min" }
+        data object Min : Prefer { override val type: String = "min" }
         @Serializable(Serializer::class)
-        object Random : Prefer { override val type: String = "random" }
+        data object Random : Prefer { override val type: String = "random" }
 
         object Serializer : KSerializer<Prefer> {
             override val descriptor: SerialDescriptor = String.serializer().descriptor

ratings/selector/src/jvmMain/kotlin/Plugin.kt

@@ -1,14 +1,33 @@
 package dev.inmo.plaguposter.ratings.selector
 
+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.plagubot.Plugin
+import dev.inmo.plaguposter.posts.models.PostId
 import dev.inmo.plaguposter.ratings.selector.models.SelectorConfig
+import korlibs.time.DateTime
 import kotlinx.serialization.json.*
 import org.jetbrains.exposed.sql.Database
 import org.koin.core.module.Module
+import org.koin.core.qualifier.qualifier
 
 object Plugin : Plugin {
     override fun Module.setupDI(database: Database, params: JsonObject) {
         single { get<Json>().decodeFromJsonElement(SelectorConfig.serializer(), params["selector"] ?: return@single null) }
-        single<Selector> { DefaultSelector(get(), get(), get()) }
+        single<KeyValueRepo<PostId, DateTime>>(qualifier("latestChosenRepo")) {
+            ExposedKeyValueRepo(
+                get(),
+                { text("post_id") },
+                { double("date_time") },
+                "LatestChosenRepo"
+            ).withMapper(
+                { string },
+                { unixMillis },
+                { PostId(this) },
+                { DateTime(this) }
+            )
+        }
+        single<Selector> { DefaultSelector(get(), get(), get(), get(qualifier("latestChosenRepo"))) }
     }
 }

sample/config.json

@@ -51,7 +51,8 @@
           "to": "23:59"
         },
         "rating": {
-          "prefer": "max"
+          "prefer": "max",
+          "uniqueCount": 1
         }
       },
       {
@@ -60,7 +61,8 @@
           "to": "00:00"
         },
         "rating": {
-          "prefer": "max"
+          "prefer": "max",
+          "uniqueCount": 1
         }
       }
     ]

sample/docker-compose.yml

@@ -11,12 +11,14 @@ services:
       POSTGRES_DB: "test"
     volumes:
       - "./db/:/var/lib/postgresql/data"
+      - "/etc/timezone:/etc/timezone:ro"
   plaguposter:
     image: insanusmokrassar/plaguposter:latest
     container_name: "plaguposter"
     restart: "unless-stopped"
     volumes:
       - "./config.json:/config.json"
+      - "/etc/timezone:/etc/timezone:ro"
     depends_on:
       - "plaguposter_postgres"
     links: