update krontab

0.1.0

.github/workflows/docker-publish.yml

@@ -1,8 +1,7 @@
 name: Docker
-on:
-  push:
-    branches:
-      - master
+
+on: [push]
+
 jobs:
   publishing:
     runs-on: ubuntu-latest
@@ -12,6 +11,14 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+      - name: Rewrite version
+        run: |
+          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
+            rm gradle.properties
+            mv gradle.properties.tmp gradle.properties
+          fi
       - name: Log into registry
         uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
         with:

CHANGELOG.md

@@ -1,8 +1,15 @@
 # PlaguPoster
 
+## 0.1.1
+
+* Update dependencies
+* `Triggers`
+  * `SelectorWithTimer`
+    * Opportunity to get schedule of posts using `publishing_autoschedule` command
+
 ## 0.0.10
 
 ## 0.0.9
 
-* Update depedencies
+* Update dependencies
 

common/src/commonMain/kotlin/DateTimeSerializer.kt

@@ -8,7 +8,6 @@ import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 
-@Serializer(DateTime::class)
 object DateTimeSerializer : KSerializer<DateTime> {
     override val descriptor: SerialDescriptor = Double.serializer().descriptor
     override fun deserialize(decoder: Decoder): DateTime = DateTime(decoder.decodeDouble())

gradle.properties

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

gradle/libs.versions.toml

@@ -1,17 +1,17 @@
 [versions]
 
-kotlin = "1.7.22"
-kotlin-serialization = "1.4.1"
+kotlin = "1.8.10"
+kotlin-serialization = "1.5.0"
 
-plagubot = "3.5.0"
-tgbotapi = "5.2.1"
-microutils = "0.16.11"
-kslog = "0.5.4"
-krontab = "0.8.5"
-tgbotapi-libraries = "0.8.2"
-plagubot-plugins = "0.8.1"
+plagubot = "5.0.1"
+tgbotapi = "7.0.1"
+microutils = "0.17.5"
+kslog = "1.0.0"
+krontab = "0.10.0"
+tgbotapi-libraries = "0.10.1"
+plagubot-plugins = "0.10.1"
 
-dokka = "1.7.20"
+dokka = "1.8.10"
 
 psql = "42.5.0"
 

posts_registrar/src/jvmMain/kotlin/Plugin.kt

@@ -21,7 +21,6 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
 import dev.inmo.tgbotapi.extensions.utils.extensions.raw.text
 import dev.inmo.tgbotapi.extensions.utils.extensions.sameChat
 import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
-import dev.inmo.tgbotapi.extensions.utils.formatting.buildEntities
 import dev.inmo.tgbotapi.extensions.utils.textContentOrNull
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage

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

@@ -1,10 +1,9 @@
 package dev.inmo.plaguposter.ratings.gc
 
-import com.soywiz.klock.milliseconds
 import com.soywiz.klock.seconds
 import dev.inmo.krontab.KrontabTemplate
 import dev.inmo.krontab.toSchedule
-import dev.inmo.krontab.utils.asFlow
+import dev.inmo.krontab.utils.asFlowWithDelays
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.repos.*
 import dev.inmo.plagubot.Plugin
@@ -12,7 +11,6 @@ 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.types.MilliSeconds
 import dev.inmo.tgbotapi.types.Seconds
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.*
@@ -50,7 +48,7 @@ object Plugin : Plugin {
             }
         }
         config.autoclear ?.let { autoclear ->
-            autoclear.autoClearKrontab.toSchedule().asFlow().subscribeSafelyWithoutExceptions(scope) {
+            autoclear.autoClearKrontab.toSchedule().asFlowWithDelays().subscribeSafelyWithoutExceptions(scope) {
                 val dropCreatedBefore = it - (autoclear.skipPostAge ?: 0).seconds
                 ratingsRepo.getPostsWithRatingLessEq(autoclear.rating).keys.forEach {
                     if ((postsRepo.getPostCreationTime(it) ?: return@forEach) < dropCreatedBefore) {

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

@@ -11,11 +11,11 @@ class DefaultSelector (
     private val ratingsRepo: RatingsRepo,
     private val postsRepo: PostsRepo
 ) : Selector {
-    override suspend fun take(n: Int, now: DateTime): List<PostId> {
+    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, now) ?: break
+            val selected = config.active(now.time) ?.rating ?.select(ratingsRepo, postsRepo, result + exclude, now) ?: break
             result.add(selected)
         } while (result.size < n)
 

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

@@ -4,5 +4,5 @@ import com.soywiz.klock.DateTime
 import dev.inmo.plaguposter.posts.models.PostId
 
 interface Selector {
-    suspend fun take(n: Int = 1, now: DateTime = DateTime.now()): List<PostId>
+    suspend fun take(n: Int = 1, now: DateTime = DateTime.now(), exclude: List<PostId> = emptyList()): List<PostId>
 }

runner/Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11
+FROM bellsoft/liberica-openjdk-alpine:19
 
 USER 1000
 

runner/deploy.sh

@@ -14,7 +14,7 @@ function assert_success() {
 }
 
 app=plaguposter
-version="`grep ../gradle.properties -e "^version=" | grep -e "[0-9.]*" -o`"
+version="`grep ../gradle.properties -e "^version=" | sed -e "s/version=\(.*\)/\1/"`"
 server=docker.io/insanusmokrassar
 
 assert_success ../gradlew build

runner/nonsudo_deploy.sh

@@ -14,7 +14,7 @@ function assert_success() {
 }
 
 app=plaguposter
-version="`grep ../gradle.properties -e "^version=" | grep -e "[0-9.]*" -o`"
+version="`grep ../gradle.properties -e "^version=" | sed -e "s/version=\(.*\)/\1/"`"
 server=insanusmokrassar
 
 assert_success ../gradlew build

settings.gradle

@@ -11,7 +11,6 @@ String[] includes = [
     ":ratings:gc",
     ":triggers:command",
     ":triggers:selector_with_timer",
-    ":triggers:selector_with_scheduling",
     ":triggers:timer",
     ":triggers:timer:disablers:ratings",
     ":triggers:timer:disablers:autoposts",

triggers/selector_with_scheduling/build.gradle

@@ -1,16 +0,0 @@
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-}
-
-apply from: "$mppProjectWithSerializationPresetPath"
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api project(":plaguposter.common")
-            }
-        }
-    }
-}

triggers/selector_with_scheduling/src/commonMain/kotlin/PackageInfo.kt

@@ -1 +0,0 @@
-package dev.inmo.plaguposter.triggers.selector_with_scheduling

triggers/selector_with_scheduling/src/jvmMain/kotlin/Plugin.kt

@@ -1,11 +0,0 @@
-package dev.inmo.plaguposter.triggers.selector_with_scheduling
-
-import dev.inmo.plagubot.Plugin
-import kotlinx.serialization.json.*
-import org.jetbrains.exposed.sql.Database
-import org.koin.core.module.Module
-
-object Plugin : Plugin {
-    override fun Module.setupDI(database: Database, params: JsonObject) {
-    }
-}

triggers/selector_with_scheduling/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.plaguposter.triggers.selector_with_scheduling"/>

triggers/selector_with_timer/src/jvmMain/kotlin/Plugin.kt

@@ -1,14 +1,43 @@
 package dev.inmo.plaguposter.triggers.selector_with_timer
 
+import com.soywiz.klock.DateFormat
 import dev.inmo.krontab.KrontabTemplate
 import dev.inmo.krontab.toSchedule
-import dev.inmo.krontab.utils.asFlow
+import dev.inmo.krontab.utils.asFlowWithDelays
+import dev.inmo.krontab.utils.asFlowWithoutDelays
+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.pagination.FirstPagePagination
+import dev.inmo.micro_utils.pagination.Pagination
+import dev.inmo.micro_utils.pagination.firstIndex
+import dev.inmo.micro_utils.pagination.lastIndexExclusive
 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.PostId
+import dev.inmo.plaguposter.posts.repo.ReadPostsRepo
 import dev.inmo.plaguposter.posts.sending.PostPublisher
 import dev.inmo.plaguposter.ratings.selector.Selector
+import dev.inmo.tgbotapi.extensions.api.answers.answer
+import dev.inmo.tgbotapi.extensions.api.edit.edit
+import dev.inmo.tgbotapi.extensions.api.send.send
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMessageDataCallbackQuery
+import dev.inmo.tgbotapi.extensions.utils.extensions.sameChat
+import dev.inmo.tgbotapi.extensions.utils.formatting.makeLinkToMessage
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.urlButton
+import dev.inmo.tgbotapi.types.BotCommand
+import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
+import dev.inmo.tgbotapi.utils.row
 import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.collectIndexed
+import kotlinx.coroutines.flow.take
 import kotlinx.serialization.*
 import kotlinx.serialization.json.*
 import org.jetbrains.exposed.sql.Database
@@ -16,15 +45,21 @@ import org.koin.core.Koin
 import org.koin.core.module.Module
 
 object Plugin : Plugin {
-    @Serializable
+    private const val pageCallbackDataQueryPrefix = "publishing_autoschedule page"
+    private const val pageCallbackDataQuerySize = 5
+        @Serializable
     internal data class Config(
         @SerialName("krontab")
-        val krontabTemplate: KrontabTemplate
+        val krontabTemplate: KrontabTemplate,
+        val dateTimeFormat: String = "HH:mm:ss, dd.MM.yyyy"
     ) {
         @Transient
         val krontab by lazy {
             krontabTemplate.toSchedule()
         }
+
+        @Transient
+        val format: DateFormat = DateFormat(dateTimeFormat)
     }
     override fun Module.setupDI(database: Database, params: JsonObject) {
         single { get<Json>().decodeFromJsonElement(Config.serializer(), params["timer_trigger"] ?: return@single null) }
@@ -35,12 +70,103 @@ object Plugin : Plugin {
         val publisher = koin.get<PostPublisher>()
         val selector = koin.get<Selector>()
         val filters = koin.getAll<AutopostFilter>().distinct()
-        koin.get<Config>().krontab.asFlow().subscribeSafelyWithoutExceptions(this) { dateTime ->
+        val chatConfig = koin.get<ChatConfig>()
+        val postsRepo = koin.get<ReadPostsRepo>()
+
+        koin.getOrNull<InlineTemplatesRepo>() ?.apply {
+            addTemplate(
+                OfferTemplate(
+                    "Autoschedule buttons",
+                    listOf(
+                        Format(
+                            "/autoschedule_panel"
+                        )
+                    ),
+                    "Show autoscheduling publishing info"
+                )
+            )
+        }
+
+        val krontab = koin.get<Config>().krontab
+        val dateTimeFormat = koin.get<Config>().format
+        krontab.asFlowWithDelays().subscribeSafelyWithoutExceptions(this) { dateTime ->
             selector.take(now = dateTime).forEach { postId ->
                 if (filters.all { it.check(postId, dateTime) }) {
                     publisher.publish(postId)
                 }
             }
         }
+
+        suspend fun buildPage(pagination: Pagination = FirstPagePagination(size = pageCallbackDataQuerySize)): InlineKeyboardMarkup {
+            return inlineKeyboard {
+                row {
+                    if (pagination.page > 1) {
+                        dataButton("⬅️", "${pageCallbackDataQueryPrefix}0")
+                    }
+                    if (pagination.page > 0) {
+                        dataButton("◀️", "${pageCallbackDataQueryPrefix}${pagination.page - 1}")
+                    }
+
+                    dataButton("\uD83D\uDD04 ${pagination.page}", "${pageCallbackDataQueryPrefix}${pagination.page}")
+                    dataButton("▶️", "${pageCallbackDataQueryPrefix}${pagination.page + 1}")
+                }
+
+                val selected = mutableListOf<PostId>()
+                krontab.asFlowWithoutDelays().take(pagination.lastIndexExclusive).collectIndexed { i, dateTime ->
+                    val postId = selector.take(now = dateTime, exclude = selected).firstOrNull() ?.also { postId ->
+                        if (filters.all { it.check(postId, dateTime) }) {
+                            selected.add(postId)
+                        } else {
+                            return@collectIndexed
+                        }
+                    }
+
+                    val post = postsRepo.getFirstMessageInfo(postId ?: return@collectIndexed)
+                    if (i < pagination.firstIndex || post == null) {
+                        return@collectIndexed
+                    }
+
+                    row {
+                        urlButton(
+                            dateTime.local.format(dateTimeFormat),
+                            makeLinkToMessage(post.chatId, post.messageId)
+                        )
+                    }
+                }
+            }
+        }
+
+        onCommand("autoschedule_panel", initialFilter = { it.sameChat(chatConfig.sourceChatId) }) {
+            val keyboard = buildPage()
+
+            runCatchingSafely {
+                edit(it, replyMarkup = keyboard) {
+                    +"Your schedule:"
+                }
+            }.onFailure { _ ->
+                send(it.chat, replyMarkup = keyboard) {
+                    +"Your schedule:"
+                }
+            }
+        }
+
+        onMessageDataCallbackQuery(
+            Regex("^$pageCallbackDataQueryPrefix\\d+"),
+            initialFilter = { it.message.sameChat(chatConfig.sourceChatId) }
+        ) {
+            val page = it.data.removePrefix(pageCallbackDataQueryPrefix).toIntOrNull() ?: let { _ ->
+                answer(it)
+                return@onMessageDataCallbackQuery
+            }
+
+            runCatchingSafely {
+                edit(
+                    it.message,
+                    replyMarkup = buildPage(Pagination(page, size = pageCallbackDataQuerySize))
+                )
+            }.onFailure { _ ->
+                answer(it)
+            }
+        }
     }
 }