update github ci/cd scripts

0.5.6

.github/workflows/build_and_publish.yml

@@ -14,6 +14,7 @@ jobs:
           java-version: 17
       - name: Rewrite version
         run: |
+          printf "\norg.gradle.jvmargs=-Xmx1g -Xms500m\nkotlin.daemon.jvmargs=-Xmx1g -Xms500m\norg.gradle.daemon=false" >> gradle.properties
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
           cat gradle.properties | sed -e "s/^version=\([0-9\.]*\)/version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
           rm gradle.properties

.github/workflows/docker-publish.yml

@@ -16,6 +16,7 @@ jobs:
           java-version: 17
       - name: Rewrite version
         run: |
+          printf "\norg.gradle.jvmargs=-Xmx1g -Xms500m\nkotlin.daemon.jvmargs=-Xmx1g -Xms500m\norg.gradle.daemon=false" >> gradle.properties
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
           if [[ "$branch" != "master" ]]; then
             cat gradle.properties | sed -e "s/^version=\([0-9\.]*\)/version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp

CHANGELOG.md

@@ -1,5 +1,15 @@
 # PlaguPoster
 
+## 0.6.0
+
+* Dependencies update
+
+## 0.5.6
+
+* `Ratings`:
+    * `GC`:
+        * Now GC will autoclear ratings even if post is absent in posts repo
+
 ## 0.5.5
 
 * Dependencies update

gradle.properties

@@ -1,5 +1,4 @@
 kotlin.code.style=official
-org.gradle.jvmargs=-Xmx1024m
 org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true
@@ -10,4 +9,4 @@ android.enableJetifier=true
 # Project data
 
 group=dev.inmo
-version=0.5.5
+version=0.6.0

gradle/libs.versions.toml

@@ -3,12 +3,12 @@
 kotlin = "1.9.23"
 kotlin-serialization = "1.6.3"
 
-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 = "8.4.0"
+tgbotapi = "15.0.0"
+microutils = "0.21.1"
+kslog = "1.3.4"
+krontab = "2.3.0"
+plagubot-plugins = "0.19.0"
 
 dokka = "1.9.20"
 

gradle/wrapper/gradle-wrapper.properties

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

mppProjectWithSerialization.gradle

@@ -4,7 +4,13 @@ project.group = "$group"
 apply from: "$publishGradlePath"
 
 kotlin {
-    jvm()
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+    }
     js (IR) {
         browser()
         nodejs()
@@ -38,3 +44,8 @@ kotlin {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+

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

@@ -5,15 +5,22 @@ import korlibs.time.seconds
 import dev.inmo.krontab.KrontabTemplate
 import dev.inmo.krontab.toSchedule
 import dev.inmo.krontab.utils.asFlowWithDelays
+import dev.inmo.kslog.common.KSLog
+import dev.inmo.kslog.common.i
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.micro_utils.koin.singleWithRandomQualifier
 import dev.inmo.micro_utils.repos.*
 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.posts.models.PostId
 import dev.inmo.plaguposter.posts.repo.PostsRepo
 import dev.inmo.plaguposter.ratings.models.Rating
 import dev.inmo.plaguposter.ratings.repo.RatingsRepo
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
 import dev.inmo.tgbotapi.types.Seconds
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.*
@@ -59,12 +66,23 @@ object Plugin : Plugin {
             }
         }
         config.autoclear ?.let { autoclear ->
+            val autoClearLogger = KSLog("autoclear")
             suspend fun doAutoClear() {
+                autoClearLogger.i { "Start autoclear" }
                 val dropCreatedBefore = DateTime.now() - (autoclear.skipPostAge ?: 0).seconds
-                ratingsRepo.getPostsWithRatingLessEq(autoclear.rating).keys.forEach {
-                    if ((postsRepo.getPostCreationTime(it) ?: return@forEach) < dropCreatedBefore) {
-                        postsRepo.deleteById(it)
-                    }
+                autoClearLogger.i { "Posts drop created before: ${dropCreatedBefore.toStringDefault()}" }
+                val idsToDelete = ratingsRepo.getPostsWithRatingLessEq(autoclear.rating).keys.also {
+                    autoClearLogger.i { "Selected posts by rating: $it" }
+                }.filter {
+                    val postCreationDateTime = postsRepo.getPostCreationTime(it) ?: (dropCreatedBefore - 1.seconds) // do dropping if post creation time is not available
+                    postCreationDateTime < dropCreatedBefore
+                }
+                autoClearLogger.i { "Filtered posts by datetime: $idsToDelete" }
+                if (idsToDelete.isNotEmpty()) {
+                    runCatching { ratingsRepo.unset(idsToDelete) }
+                    autoClearLogger.i { "Ratings dropped" }
+                    runCatching { postsRepo.deleteById(idsToDelete) }
+                    autoClearLogger.i { "Posts dropped" }
                 }
             }
             runCatchingSafely {
@@ -73,6 +91,13 @@ object Plugin : Plugin {
             autoclear.autoClearKrontab.toSchedule().asFlowWithDelays().subscribeSafelyWithoutExceptions(scope) {
                 doAutoClear()
             }
+
+            onCommand("clean_posts_by_ratings") {
+                doAutoClear()
+            }
+            koin.getOrNull<InlineTemplatesRepo>() ?.addTemplate(
+                OfferTemplate("Force autoclear", listOf(Format("/clean_posts_by_ratings")))
+            )
         }
     }
 }

ratings/source/src/commonMain/kotlin/buttons/RootButtons.kt

@@ -122,7 +122,7 @@ suspend fun BehaviourContext.includeRootNavigationButtonsHandler(
 
                     edit(
                         it.message,
-                        onPageUpdate(SimplePagination(page, size), args.drop(3).toTypedArray()) ?: return@runCatchingSafely
+                        replyMarkup = onPageUpdate(SimplePagination(page, size), args.drop(3).toTypedArray()) ?: return@runCatchingSafely
                     )
                 }
 
@@ -155,7 +155,7 @@ suspend fun BehaviourContext.includeRootNavigationButtonsHandler(
         if (prefix == RootButtonsShowRatingData) {
             runCatchingSafely {
                 val rating = ratingRaw.toDoubleOrNull() ?: return@runCatchingSafely
-                edit(it.message, ratingsRepo.buildRatingButtons(postsRepo, Rating(rating)))
+                edit(it.message, replyMarkup = ratingsRepo.buildRatingButtons(postsRepo, Rating(rating)))
             }
 
             answer(it)

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

@@ -28,6 +28,7 @@ import dev.inmo.plaguposter.ratings.utils.postsByRatings
 import dev.inmo.tgbotapi.extensions.api.answers.answer
 import dev.inmo.tgbotapi.extensions.api.delete
 import dev.inmo.tgbotapi.extensions.api.edit.edit
+import dev.inmo.tgbotapi.extensions.api.send.polls.sendRegularPoll
 import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.api.send.send
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
@@ -41,7 +42,10 @@ 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
+import dev.inmo.tgbotapi.types.polls.InputPollOption
+import dev.inmo.tgbotapi.types.polls.PollOption
 import dev.inmo.tgbotapi.utils.buildEntities
+import dev.inmo.tgbotapi.utils.extensions.makeSourceString
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
 import kotlinx.serialization.Serializable
@@ -112,7 +116,7 @@ object Plugin : Plugin {
         onPollUpdates (markerFactory = { it.id }) { poll ->
             val postId = pollsToPostsIdsRepo.get(poll.id) ?: return@onPollUpdates
             val newRating = poll.options.sumOf {
-                (variantsTransformer(it.text) ?.double ?.times(it.votes)) ?: 0.0
+                (variantsTransformer(it.textSources.makeSourceString()) ?.double ?.times(it.votes)) ?: 0.0
             }
             ratingsRepo.set(postId, Rating(newRating))
         }
@@ -129,7 +133,9 @@ object Plugin : Plugin {
                     val sent = send(
                         content.chatId,
                         config.ratingOfferText,
-                        config.variants.keys.toList(),
+                        options = config.variants.map {
+                            InputPollOption(it.key)
+                        },
                         replyParameters = ReplyParameters(content.chatId, content.messageId)
                     )
                     pollsToPostsIdsRepo.set(sent.content.poll.id, postId)
@@ -265,7 +271,7 @@ object Plugin : Plugin {
         onMessageDataCallbackQuery("ratings_interactive", initialFilter = { it.message.chat.id in chatConfig.allSourceChatIds }) {
             edit(
                 it.message,
-                ratingsRepo.buildRootButtons()
+                replyMarkup = ratingsRepo.buildRootButtons()
             )
         }
 

ratings/src/commonMain/kotlin/repo/CachedRatingsRepo.kt

@@ -1,6 +1,8 @@
 package dev.inmo.plaguposter.ratings.repo
 
 import dev.inmo.micro_utils.pagination.utils.doForAllWithNextPaging
+import dev.inmo.micro_utils.pagination.utils.optionallyReverse
+import dev.inmo.micro_utils.pagination.utils.paginate
 import dev.inmo.micro_utils.repos.KeyValueRepo
 import dev.inmo.micro_utils.repos.MapKeyValueRepo
 import dev.inmo.micro_utils.repos.cache.full.FullKeyValueCacheRepo
@@ -13,26 +15,30 @@ class CachedRatingsRepo(
     private val scope: CoroutineScope,
     private val kvCache: MapKeyValueRepo<PostId, Rating> = MapKeyValueRepo()
 ) : RatingsRepo, KeyValueRepo<PostId, Rating> by FullKeyValueCacheRepo(base, kvCache, scope) {
+    private suspend fun getPosts(
+        reversed: Boolean,
+        count: Int?,
+        exclude: List<PostId>,
+        ratingFilter: (Rating) -> Boolean
+    ): Map<PostId, Rating> {
+        return kvCache.getAll().filter { (it, rating) ->
+            it !in exclude && ratingFilter(rating)
+        }.let {
+            if (count == null) {
+                it
+            } else {
+                val keys = it.keys.optionallyReverse(reversed).take(count)
+                keys.associateWith { id -> it.getValue(id) }
+            }
+        }
+    }
     override suspend fun getPosts(
         range: ClosedRange<Rating>,
         reversed: Boolean,
         count: Int?,
         exclude: List<PostId>
-    ): Map<PostId, Rating> {
-        val result = mutableMapOf<PostId, Rating>()
-
-        doForAllWithNextPaging {
-            kvCache.keys(it).also {
-                it.results.forEach {
-                    val rating = get(it) ?: return@forEach
-                    if (it !in exclude && rating in range) {
-                        result[it] = rating
-                    }
-                }
-            }
-        }
-
-        return result.toMap()
+    ): Map<PostId, Rating> = getPosts(reversed, count, exclude) {
+        it in range
     }
 
     override suspend fun getPostsWithRatingGreaterEq(
@@ -40,22 +46,16 @@ class CachedRatingsRepo(
         reversed: Boolean,
         count: Int?,
         exclude: List<PostId>
-    ): Map<PostId, Rating> = getPosts(
-        then .. Rating(Double.MAX_VALUE),
-        reversed,
-        count,
-        exclude
-    )
+    ): Map<PostId, Rating> = getPosts(reversed, count, exclude) {
+        it >= then
+    }
 
     override suspend fun getPostsWithRatingLessEq(
         then: Rating,
         reversed: Boolean,
         count: Int?,
         exclude: List<PostId>
-    ): Map<PostId, Rating> = getPosts(
-        Rating(Double.MIN_VALUE) .. then,
-        reversed,
-        count,
-        exclude
-    )
+    ): Map<PostId, Rating> = getPosts(reversed, count, exclude) {
+        it <= then
+    }
 }

runner/deploy.sh

@@ -15,7 +15,7 @@ function assert_success() {
 
 app=plaguposter
 version="`grep ../gradle.properties -e "^version=" | sed -e "s/version=\(.*\)/\1/"`"
-server=insanusmokrassar
+server=docker.inmo.dev
 
 assert_success ../gradlew build
 assert_success sudo docker build -t $app:"$version" .