small fixes

0.0.4

.github/workflows/build.yml

@@ -12,8 +12,5 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Fix android 32.0.0 dx
-        continue-on-error: true
-        run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
       - name: Build with Gradle
         run: ./gradlew build

build.gradle

@@ -7,8 +7,6 @@ buildscript {
     }
 
     dependencies {
-        classpath libs.android.tools.build
-        classpath libs.android.dexcount
         classpath libs.kotlin.gradle.plugin
         classpath libs.kotlin.serialization.plugin
         classpath libs.kotlin.dokka.plugin

common/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"

defaultAndroidSettings.gradle

@@ -1,66 +0,0 @@
-apply plugin: 'com.getkeepsafe.dexcount'
-
-android {
-    ext {
-        jvmKotlinFolderFile = {
-            String sep = File.separator
-            return new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin")
-        }
-
-        enableIncludingJvmCodeInAndroidPart = {
-            File jvmKotlinFolder = jvmKotlinFolderFile()
-            if (jvmKotlinFolder.exists()) {
-                android.sourceSets.main.java.srcDirs += jvmKotlinFolder.path
-            }
-        }
-
-        disableIncludingJvmCodeInAndroidPart = {
-            File jvmKotlinFolder = jvmKotlinFolderFile()
-            String[] oldDirs = android.sourceSets.main.java.srcDirs
-            android.sourceSets.main.java.srcDirs = []
-            for (oldDir in oldDirs) {
-                if (oldDir != jvmKotlinFolder.path) {
-                    android.sourceSets.main.java.srcDirs += oldDir
-                }
-            }
-        }
-    }
-
-    compileSdkVersion libs.versions.android.compileSdk.get().toInteger()
-    buildToolsVersion libs.versions.android.buildTools.get()
-
-    defaultConfig {
-        minSdkVersion libs.versions.android.minSdk.get().toInteger()
-        targetSdkVersion libs.versions.android.compileSdk.get().toInteger()
-        versionCode "${android_code_version}".toInteger()
-        versionName "$version"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-        debug {
-            debuggable true
-        }
-    }
-
-    packagingOptions {
-        exclude 'META-INF/kotlinx-serialization-runtime.kotlin_module'
-        exclude 'META-INF/kotlinx-serialization-cbor.kotlin_module'
-        exclude 'META-INF/kotlinx-serialization-properties.kotlin_module'
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    sourceSets {
-        String sep = File.separator
-        main.java.srcDirs += "src${sep}main${sep}kotlin"
-    }
-}

gradle.properties

@@ -10,5 +10,5 @@ android.enableJetifier=true
 # Project data
 
 group=dev.inmo
-version=0.0.2
-android_code_version=2
+version=0.0.5
+android_code_version=5

gradle/libs.versions.toml

@@ -1,26 +1,17 @@
 [versions]
 
-kotlin = "1.7.10"
-kotlin-serialization = "1.4.0"
+kotlin = "1.7.20"
+kotlin-serialization = "1.4.1"
 
-plagubot = "2.3.1"
-tgbotapi = "3.2.1"
-microutils = "0.12.13"
+plagubot = "2.4.0"
+tgbotapi = "3.3.0"
+microutils = "0.13.1"
 kslog = "0.5.2"
 krontab = "0.8.1"
-tgbotapi-libraries = "0.5.3"
+tgbotapi-libraries = "0.5.6"
+plagubot-plugins = "0.5.0"
 
-psql = "42.3.6"
-
-dexcount = "3.1.0"
-junit_version = "4.12"
-test_ext_junit_version = "1.1.3"
-espresso_core = "3.4.0"
-
-android-gradle-plugin = "7.2.2"
-android-minSdk = "21"
-android-compileSdk = "32"
-android-buildTools = "32.0.0"
+psql = "42.5.0"
 
 [libraries]
 
@@ -30,12 +21,11 @@ kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", versi
 kotlin-test-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 kotlin-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kotlin" }
-android-test-junit = { module = "androidx.test.ext:junit", version.ref = "test_ext_junit_version" }
-android-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso_core" }
 
 tgbotapi = { module = "dev.inmo:tgbotapi", version.ref = "tgbotapi" }
 plagubot-plugin = { module = "dev.inmo:plagubot.plugin", version.ref = "plagubot" }
 plagubot-bot = { module = "dev.inmo:plagubot.bot", version.ref = "plagubot" }
+plagubot-plugins-inline-queries = { module = "dev.inmo:plagubot.plugins.inline.queries", version.ref = "plagubot-plugins" }
 microutils-repos-common = { module = "dev.inmo:micro_utils.repos.common", version.ref = "microutils" }
 microutils-repos-exposed = { module = "dev.inmo:micro_utils.repos.exposed", version.ref = "microutils" }
 microutils-repos-cache = { module = "dev.inmo:micro_utils.repos.cache", version.ref = "microutils" }
@@ -47,8 +37,6 @@ psql = { module = "org.postgresql:postgresql", version.ref = "psql" }
 
 # buildscript classpaths
 
-android-tools-build = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gradle-plugin", version.ref = "dexcount" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
 kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "kotlin" }

inlines/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"
@@ -15,6 +14,7 @@ kotlin {
         }
         jvmMain {
             dependencies {
+                api libs.plagubot.plugins.inline.queries
             }
         }
     }

inlines/src/commonMain/kotlin/PackageInfo.kt

@@ -1 +1 @@
-package dev.inmo.plaguposter.inlines
+package dev.inmo.plagubot.plugins.inline.queries

inlines/src/jvmMain/kotlin/Plugin.kt

@@ -1,81 +1,21 @@
 package dev.inmo.plaguposter.inlines
 
-import dev.inmo.micro_utils.pagination.Pagination
-import dev.inmo.micro_utils.pagination.utils.paginate
+import dev.inmo.kslog.common.TagLogger
+import dev.inmo.kslog.common.w
 import dev.inmo.plagubot.Plugin
-import dev.inmo.plaguposter.common.ChatConfig
-import dev.inmo.plaguposter.inlines.models.Format
-import dev.inmo.plaguposter.inlines.models.OfferTemplate
-import dev.inmo.plaguposter.inlines.repos.InlineTemplatesRepo
-import dev.inmo.tgbotapi.bot.exceptions.RequestException
-import dev.inmo.tgbotapi.extensions.api.answers.answerInlineQuery
-import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onBaseInlineQuery
-import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
-import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
-import dev.inmo.tgbotapi.types.inlineQueryAnswerResultsLimit
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.*
-import org.jetbrains.exposed.sql.Database
 import org.koin.core.Koin
-import org.koin.core.module.Module
 
-object Plugin : Plugin {
-    @Serializable
-    internal data class Config(
-        val preset: List<OfferTemplate>
-    )
-    override fun Module.setupDI(database: Database, params: JsonObject) {
-        single { get<Json>().decodeFromJsonElement(Config.serializer(), params["inlines"] ?: return@single Config(emptyList())) }
-        single { InlineTemplatesRepo(getOrNull<Config>() ?.preset ?.toMutableSet() ?: mutableSetOf()) }
-    }
+private val actualPlugin = dev.inmo.plagubot.plugins.inline.queries.Plugin
 
+object Plugin : Plugin by actualPlugin {
+    private val log = TagLogger("InlinePlugin")
     override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
-        val templatesRepo = koin.get<InlineTemplatesRepo>()
-        onBaseInlineQuery { query ->
-            val page = query.offset.toIntOrNull() ?: 0
-            val queryString = query.query.trim()
-            try {
-                answerInlineQuery(
-                    query,
-                    templatesRepo.templates.paginate(
-                        Pagination(
-                            page,
-                            inlineQueryAnswerResultsLimit.last + 1
-                        )
-                    ).results.mapIndexedNotNull { index, offerTemplate ->
-                        offerTemplate.createArticleResult(
-                            index.toString(),
-                            queryString
-                        )
-                    },
-                    nextOffset = (page + 1).toString(),
-                    cachedTime = 0
-                )
-            } catch (e: RequestException) {
-                bot.answerInlineQuery(
-                    query,
-                    cachedTime = 0
-                )
-            }
+        log.w {
+            "Built-in inline plugin has been deprecated. Use \"${actualPlugin::class.qualifiedName}\" instead"
         }
-        onCommand("help", requireOnlyCommandInMessage = true) {
-            reply(
-                it,
-                "Push the button above to see available commands",
-                replyMarkup = flatInlineKeyboard {
-                    inlineQueryInCurrentChatButton("Toggle commands", "")
-                }
-            )
-        }
-        koin.getOrNull<InlineTemplatesRepo>() ?.apply {
-            addTemplate(
-                OfferTemplate(
-                    "Trigger help button",
-                    listOf(Format("/help"))
-                )
-            )
+        with(actualPlugin) {
+            setupBotPlugin(koin)
         }
     }
 }

inlines/src/jvmMain/kotlin/models/Format.kt

@@ -1,40 +0,0 @@
-package dev.inmo.plaguposter.inlines.models
-
-import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputTextMessageContent
-import dev.inmo.tgbotapi.types.message.MarkdownV2
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-
-@Serializable
-data class Format(
-    val template: String,
-    val regexTemplate: String = "^$",
-    val splitBy: String? = null,
-    val enableMarkdownSupport: Boolean = false
-) {
-    @Transient
-    val queryRegex = Regex(regexTemplate, RegexOption.DOT_MATCHES_ALL)
-
-    init {
-        println(queryRegex)
-    }
-
-    fun formatByRegex(with: String): String? {
-        return if (queryRegex.matches(with)) {
-            template.format(*(splitBy ?.let { with.split(it).toTypedArray() } ?: arrayOf(with)))
-        } else {
-            null
-        }
-    }
-
-    fun createContent(with: String): InputTextMessageContent? {
-        return if (queryRegex.matches(with)) {
-            InputTextMessageContent(
-                template.format(*(splitBy ?.let { with.split(it).toTypedArray() } ?: arrayOf(with))),
-                if (enableMarkdownSupport) MarkdownV2 else null
-            )
-        } else {
-            null
-        }
-    }
-}

inlines/src/jvmMain/kotlin/models/OfferTemplate.kt

@@ -1,22 +0,0 @@
-package dev.inmo.plaguposter.inlines.models
-
-import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.InlineQueryResultArticle
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class OfferTemplate(
-    val title: String,
-    val formats: List<Format> = emptyList(),
-    val description: String? = null
-) {
-    fun createArticleResult(id: String, query: String): InlineQueryResultArticle? = formats.firstOrNull {
-        it.queryRegex.matches(query)
-    } ?.createContent(query) ?.let { content ->
-        InlineQueryResultArticle(
-            id,
-            title,
-            content,
-            description = description
-        )
-    }
-}

inlines/src/jvmMain/kotlin/repos/InlineTemplatesRepo.kt

@@ -1,16 +0,0 @@
-package dev.inmo.plaguposter.inlines.repos
-
-import dev.inmo.plaguposter.inlines.models.OfferTemplate
-
-class InlineTemplatesRepo(
-    private val _templates: MutableSet<OfferTemplate>
-) {
-    internal val templates
-        get() = _templates.toList()
-    suspend fun addTemplate(offerTemplate: OfferTemplate): Boolean {
-        return _templates.add(offerTemplate)
-    }
-    suspend fun dropTemplate(offerTemplate: OfferTemplate): Boolean {
-        return _templates.remove(offerTemplate)
-    }
-}

inlines/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="dev.inmo.plaguposter.inlines"/>
+<manifest package="dev.inmo.plagubot.plugins.inline.queries"/>

mppAndroidProject.gradle

@@ -1,34 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-// apply from: "$publishGradlePath"
-
-kotlin {
-    android {
-        publishAllLibraryVariants()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        androidTest {
-            dependencies {
-                implementation libs.kotlin.test.junit
-                implementation libs.android.test.junit
-                implementation libs.android.test.espresso.core
-            }
-        }
-    }
-}
-
-apply from: "$defaultAndroidSettingsPresetPath"

mppProjectWithSerialization.gradle

@@ -4,21 +4,12 @@ project.group = "$group"
 // apply from: "$publishGradlePath"
 
 kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
+    jvm()
     js (IR) {
         browser()
         nodejs()
     }
-    android {
-        publishAllLibraryVariants()
-    }
-
+    
     sourceSets {
         commonMain {
             dependencies {
@@ -43,19 +34,7 @@ kotlin {
                 implementation libs.kotlin.test.junit
             }
         }
-        androidTest {
-            dependencies {
-                implementation libs.kotlin.test.junit
-                implementation libs.android.test.junit
-                implementation libs.android.test.espresso.core
-            }
-        }
+
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-apply from: "$defaultAndroidSettingsPresetPath"

posts/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"

posts/panel/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"

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

@@ -1,6 +1,7 @@
 package dev.inmo.plaguposter.posts.panel
 
 import com.benasher44.uuid.uuid4
+import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.koin.getAllDistinct
 import dev.inmo.micro_utils.repos.deleteById
@@ -10,8 +11,10 @@ import dev.inmo.plaguposter.common.ChatConfig
 import dev.inmo.plaguposter.posts.models.PostId
 import dev.inmo.plaguposter.posts.panel.repos.PostsMessages
 import dev.inmo.plaguposter.posts.repo.PostsRepo
+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.edit.text.editMessageText
 import dev.inmo.tgbotapi.extensions.api.send.send
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitMessageDataCallbackQuery
@@ -19,14 +22,11 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMessag
 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.withContentOrNull
 import dev.inmo.tgbotapi.types.ChatId
 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
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.TextContent
 import kotlinx.coroutines.flow.first
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.*
@@ -41,7 +41,8 @@ object Plugin : Plugin {
         val parseMode: ParseMode? = null,
         val buttonsPerRow: Int = 4,
         val deleteButtonText: String? = null,
-        val rootButtonText: String = "Return to panel"
+        val rootButtonText: String = "◀️",
+        val refreshButtonText: String? = "\uD83D\uDD04"
     )
     override fun Module.setupDI(database: Database, params: JsonObject) {
         params["panel"] ?.let { element ->
@@ -57,6 +58,14 @@ object Plugin : Plugin {
                             "delete ${it.id.string}"
                         )
                     }
+                },
+                config.refreshButtonText ?.let { text ->
+                    PanelButtonBuilder {
+                        CallbackDataInlineKeyboardButton(
+                            text,
+                            "refresh ${it.id.string}"
+                        )
+                    }
                 }
             )
             PanelButtonsAPI(
@@ -97,7 +106,7 @@ object Plugin : Plugin {
             delete(chatId, messageId)
         }
 
-        suspend fun updatePost(
+        suspend fun refreshPostMessage(
             postId: PostId,
             chatId: ChatId,
             messageId: MessageIdentifier
@@ -108,9 +117,10 @@ object Plugin : Plugin {
                     builder.buildButton(post)
                 }.takeIf { it.isNotEmpty() }
             }
-            edit(
+            editMessageText(
                 chatId,
                 messageId,
+                text = config.text,
                 replyMarkup = InlineKeyboardMarkup(buttons)
             )
         }
@@ -121,7 +131,8 @@ object Plugin : Plugin {
             }
         ) {
             val postId = it.data.removePrefix(PanelButtonsAPI.openGlobalMenuDataPrefix).let(::PostId)
-            updatePost(postId, it.message.chat.id, it.message.messageId)
+            refreshPostMessage(postId, it.message.chat.id, it.message.messageId)
+            answer(it)
         }
         onMessageDataCallbackQuery(
             initialFilter = {
@@ -140,6 +151,7 @@ object Plugin : Plugin {
                     api.RootPanelButtonBuilder.buildButton(post) ?.let(::add)
                 }
             )
+            answer(query)
 
             val pushedButton = waitMessageDataCallbackQuery().first {
                 it.message.sameMessage(query.message)
@@ -149,10 +161,27 @@ object Plugin : Plugin {
                 postsRepo.deleteById(postId)
             }
         }
+        onMessageDataCallbackQuery(
+            initialFilter = {
+                it.data.startsWith("refresh ") && it.message.chat.id == chatsConfig.sourceChatId
+            }
+        ) { query ->
+            val postId = query.data.removePrefix("refresh ").let(::PostId)
+            val (chatId, messageId) = postsMessages.get(postId) ?: return@onMessageDataCallbackQuery
+
+            runCatchingSafely {
+                refreshPostMessage(
+                    postId,
+                    chatId,
+                    messageId
+                )
+            }
+            answer(query)
+        }
 
         api.forceRefreshFlow.subscribeSafelyWithoutExceptions(this) {
             val (chatId, messageId) = postsMessages.get(it) ?: return@subscribeSafelyWithoutExceptions
-            updatePost(it, chatId, messageId)
+            refreshPostMessage(it, chatId, messageId)
         }
     }
 }

posts/src/jvmMain/kotlin/Plugin.kt

@@ -10,9 +10,9 @@ import dev.inmo.plaguposter.common.SuccessfulSymbol
 import dev.inmo.plaguposter.common.UnsuccessfulSymbol
 import dev.inmo.plaguposter.posts.exposed.ExposedPostsRepo
 import dev.inmo.plaguposter.common.ChatConfig
-import dev.inmo.plaguposter.inlines.models.Format
-import dev.inmo.plaguposter.inlines.models.OfferTemplate
-import dev.inmo.plaguposter.inlines.repos.InlineTemplatesRepo
+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.repo.*
 import dev.inmo.plaguposter.posts.sending.PostPublisher
 import dev.inmo.tgbotapi.extensions.api.delete

posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt

@@ -12,8 +12,7 @@ import dev.inmo.tgbotapi.types.MessageIdentifier
 import kotlinx.coroutines.flow.*
 import kotlinx.serialization.json.Json
 import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.statements.InsertStatement
-import org.jetbrains.exposed.sql.statements.UpdateStatement
+import org.jetbrains.exposed.sql.statements.*
 import org.jetbrains.exposed.sql.transactions.transaction
 
 class ExposedPostsRepo(
@@ -21,7 +20,7 @@ class ExposedPostsRepo(
 ) : PostsRepo, AbstractExposedCRUDRepo<RegisteredPost, PostId, NewPost>(
     tableName = "posts"
 ) {
-    val idColumn = text("id").clientDefault { uuid4().toString() }
+    val idColumn = text("id")
     val createdColumn = double("datetime").default(0.0)
 
     private val contentRepo by lazy {
@@ -59,18 +58,6 @@ class ExposedPostsRepo(
     override fun InsertStatement<Number>.asObject(value: NewPost): RegisteredPost {
         val id = PostId(get(idColumn))
 
-        with(contentRepo) {
-            value.content.forEach { contentInfo ->
-                insert {
-                    it[postIdColumn] = id.string
-                    it[chatIdColumn] = contentInfo.chatId.chatId
-                    it[messageIdColumn] = contentInfo.messageId
-                    it[groupColumn] = contentInfo.group
-                    it[orderColumn] = contentInfo.order
-                }
-            }
-        }
-
         return RegisteredPost(
             id,
             DateTime(get(createdColumn)),
@@ -82,7 +69,14 @@ class ExposedPostsRepo(
         )
     }
 
-    override fun update(id: PostId, value: NewPost, it: UpdateStatement) {
+    override fun createAndInsertId(value: NewPost, it: InsertStatement<Number>): PostId {
+        val id = PostId(uuid4().toString())
+        it[idColumn] = id.string
+        return id
+    }
+
+    override fun update(id: PostId?, value: NewPost, it: UpdateBuilder<Int>) {
+        id ?: error("Unable to find post id in update")
         with(contentRepo) {
             deleteWhere { postIdColumn.eq(id.string) }
             value.content.forEach { contentInfo ->
@@ -98,6 +92,7 @@ class ExposedPostsRepo(
     }
 
     override fun insert(value: NewPost, it: InsertStatement<Number>) {
+        super.insert(value, it)
         it[createdColumn] = DateTime.now().unixMillis
     }
 

posts_registrar/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"
@@ -13,9 +12,5 @@ kotlin {
                 api project(":plaguposter.posts")
             }
         }
-        jvmMain {
-            dependencies {
-            }
-        }
     }
 }

posts_registrar/src/jvmMain/kotlin/Plugin.kt

@@ -5,9 +5,9 @@ import dev.inmo.micro_utils.fsm.common.State
 import dev.inmo.micro_utils.repos.create
 import dev.inmo.plagubot.Plugin
 import dev.inmo.plaguposter.common.*
-import dev.inmo.plaguposter.inlines.models.Format
-import dev.inmo.plaguposter.inlines.models.OfferTemplate
-import dev.inmo.plaguposter.inlines.repos.InlineTemplatesRepo
+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.*
 import dev.inmo.plaguposter.posts.registrar.state.RegistrationState
 import dev.inmo.plaguposter.posts.repo.PostsRepo
@@ -18,10 +18,13 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextWithFSM
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.strictlyOn
 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.formatting.regular
 import dev.inmo.tgbotapi.extensions.utils.mediaGroupMessageOrNull
+import dev.inmo.tgbotapi.extensions.utils.textContentOrNull
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.MessageContent
@@ -65,7 +68,7 @@ object Plugin : Plugin {
                         waitContentMessage(
                             includeMediaGroups = false
                         ).filter {
-                            it.chat.id == state.context
+                            it.chat.id == state.context && it.content.textContentOrNull() ?.text != "/finish_post"
                         }.take(1).first()
                     )
                 }
@@ -80,6 +83,12 @@ object Plugin : Plugin {
                     }.first()
                     emptyList<ContentMessage<MessageContent>>()
                 }
+                add {
+                    val finishPressed = waitTextMessage().filter {
+                        it.sameChat(messageToDelete) && it.content.text == "/finish_post"
+                    }.first()
+                    emptyList<ContentMessage<MessageContent>>()
+                }
             }.ifEmpty {
                 edit(messageToDelete, "Ok, finishing your request")
                 return@strictlyOn RegistrationState.Finish(
@@ -135,8 +144,16 @@ object Plugin : Plugin {
         koin.getOrNull<InlineTemplatesRepo>() ?.apply {
             addTemplate(
                 OfferTemplate(
-                    "Start post",
-                    listOf(Format("/start_post"))
+                    "Start post creating",
+                    listOf(Format("/start_post")),
+                    "Use this command to start creating of complex post with several messages"
+                )
+            )
+            addTemplate(
+                OfferTemplate(
+                    "Finish post creating",
+                    listOf(Format("/finish_post")),
+                    "Finish creating of complex post"
                 )
             )
         }

ratings/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"
@@ -14,9 +13,5 @@ kotlin {
                 api project(":plaguposter.posts")
             }
         }
-        jvmMain {
-            dependencies {
-            }
-        }
     }
 }

ratings/gc/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"
@@ -15,9 +14,5 @@ kotlin {
                 api libs.krontab
             }
         }
-        jvmMain {
-            dependencies {
-            }
-        }
     }
 }

ratings/selector/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"
@@ -14,9 +13,5 @@ kotlin {
                 api project(":plaguposter.ratings")
             }
         }
-        jvmMain {
-            dependencies {
-            }
-        }
     }
 }

ratings/source/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"
@@ -15,9 +14,5 @@ kotlin {
                 api project(":plaguposter.posts.panel")
             }
         }
-        jvmMain {
-            dependencies {
-            }
-        }
     }
 }

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

@@ -11,9 +11,9 @@ import dev.inmo.micro_utils.repos.pagination.getAll
 import dev.inmo.micro_utils.repos.set
 import dev.inmo.plagubot.Plugin
 import dev.inmo.plaguposter.common.*
-import dev.inmo.plaguposter.inlines.models.Format
-import dev.inmo.plaguposter.inlines.models.OfferTemplate
-import dev.inmo.plaguposter.inlines.repos.InlineTemplatesRepo
+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.panel.PanelButtonBuilder
 import dev.inmo.plaguposter.posts.panel.PanelButtonsAPI
@@ -22,6 +22,7 @@ import dev.inmo.plaguposter.ratings.models.Rating
 import dev.inmo.plaguposter.ratings.repo.RatingsRepo
 import dev.inmo.plaguposter.ratings.source.models.*
 import dev.inmo.plaguposter.ratings.source.repos.*
+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
@@ -34,8 +35,10 @@ 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.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
+import dev.inmo.tgbotapi.types.message.textsources.bold
 import dev.inmo.tgbotapi.types.message.textsources.regular
-import kotlinx.coroutines.flow.filter
+import dev.inmo.tgbotapi.utils.buildEntities
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.*
@@ -79,6 +82,7 @@ object Plugin : Plugin {
         val postsRepo = koin.get<PostsRepo>()
         val config = koin.get<Config>()
         val panelApi = koin.getOrNull<PanelButtonsAPI>()
+        val chatConfig = koin.get<ChatConfig>()
 
         onPollUpdates (markerFactory = { it.id }) { poll ->
             val postId = pollsToPostsIdsRepo.get(poll.id) ?: return@onPollUpdates
@@ -105,6 +109,9 @@ object Plugin : Plugin {
                     pollsToPostsIdsRepo.set(sent.content.poll.id, postId)
                     pollsToMessageInfoRepo.set(sent.content.poll.id, sent.short())
                 }.getOrNull() ?: continue
+
+                delay(500L)
+
                 panelApi ?.forceRefresh(postId)
                 return true
             }
@@ -136,6 +143,7 @@ object Plugin : Plugin {
 
         if (config.autoAttach) {
             postsRepo.newObjectsFlow.subscribeSafelyWithoutExceptions(this) {
+                delay(500L)
                 attachPoll(it.id)
             }
         }
@@ -208,6 +216,22 @@ object Plugin : Plugin {
                 }
             }
         }
+        onCommand("ratings", requireOnlyCommandInMessage = true) {
+            if (it.chat.id == chatConfig.sourceChatId) {
+                val ratings = ratingsRepo.postsByRatings().toList().sortedByDescending { it.first }
+                val textSources = buildEntities {
+                    + "Ratings amount: " + bold("${ratings.sumOf { it.second.size }}") + "\n\n"
+                    ratings.forEach {
+                        + "• " + bold("% 3.1f".format(it.first.double)) + ": " + bold(it.second.size.toString()) + "\n"
+                    }
+                }
+                runCatchingSafely {
+                    edit(it, textSources)
+                }.onFailure { _ ->
+                    reply(it, textSources)
+                }
+            }
+        }
 
         koin.getOrNull<InlineTemplatesRepo>() ?.apply {
             addTemplate(
@@ -273,6 +297,7 @@ object Plugin : Plugin {
                         attachPoll(postId)
                     }
                 }
+                answer(it)
             }
         }
     }

ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt

@@ -6,8 +6,7 @@ import dev.inmo.plaguposter.common.ShortMessageInfo
 import dev.inmo.tgbotapi.types.ChatId
 import dev.inmo.tgbotapi.types.PollIdentifier
 import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.statements.InsertStatement
-import org.jetbrains.exposed.sql.statements.UpdateStatement
+import org.jetbrains.exposed.sql.statements.*
 
 class ExposedPollsToMessagesInfoRepo(
     database: Database
@@ -36,14 +35,12 @@ class ExposedPollsToMessagesInfoRepo(
         initTable()
     }
 
-    override fun update(k: PollIdentifier, v: ShortMessageInfo, it: UpdateStatement) {
+    override fun update(k: PollIdentifier, v: ShortMessageInfo, it: UpdateBuilder<Int>) {
         it[chatIdColumn] = v.chatId.chatId
         it[messageIdColumn] = v.messageId
     }
 
-    override fun insert(k: PollIdentifier, v: ShortMessageInfo, it: InsertStatement<Number>) {
+    override fun insertKey(k: PollIdentifier, v: ShortMessageInfo, it: InsertStatement<Number>) {
         it[keyColumn] = k
-        it[chatIdColumn] = v.chatId.chatId
-        it[messageIdColumn] = v.messageId
     }
 }

ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt

@@ -5,8 +5,7 @@ import dev.inmo.micro_utils.repos.exposed.keyvalue.AbstractExposedKeyValueRepo
 import dev.inmo.plaguposter.posts.models.PostId
 import dev.inmo.tgbotapi.types.PollIdentifier
 import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.statements.InsertStatement
-import org.jetbrains.exposed.sql.statements.UpdateStatement
+import org.jetbrains.exposed.sql.statements.*
 
 class ExposedPollsToPostsIdsRepo(
     database: Database
@@ -24,12 +23,11 @@ class ExposedPollsToPostsIdsRepo(
         initTable()
     }
 
-    override fun update(k: PollIdentifier, v: PostId, it: UpdateStatement) {
+    override fun update(k: PollIdentifier, v: PostId, it: UpdateBuilder<Int>) {
         it[postIdColumn] = v.string
     }
 
-    override fun insert(k: PollIdentifier, v: PostId, it: InsertStatement<Number>) {
+    override fun insertKey(k: PollIdentifier, v: PostId, it: InsertStatement<Number>) {
         it[keyColumn] = k
-        it[postIdColumn] = v.string
     }
 }

ratings/src/commonMain/kotlin/utils/PostsByRatings.kt

@@ -0,0 +1,15 @@
+package dev.inmo.plaguposter.ratings.utils
+
+import dev.inmo.micro_utils.pagination.utils.getAll
+import dev.inmo.micro_utils.repos.pagination.getAll
+import dev.inmo.plaguposter.posts.models.PostId
+import dev.inmo.plaguposter.ratings.models.Rating
+import dev.inmo.plaguposter.ratings.repo.RatingsRepo
+
+suspend fun RatingsRepo.postsByRatings(): Map<Rating, List<PostId>> {
+    return getAll { keys(it) }.groupBy {
+        it.second
+    }.map {
+        it.key to it.value.map { it.first }
+    }.toMap()
+}

ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt

@@ -6,8 +6,7 @@ import dev.inmo.plaguposter.posts.models.PostId
 import dev.inmo.plaguposter.ratings.models.Rating
 import dev.inmo.plaguposter.ratings.repo.RatingsRepo
 import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.statements.InsertStatement
-import org.jetbrains.exposed.sql.statements.UpdateStatement
+import org.jetbrains.exposed.sql.statements.*
 import org.jetbrains.exposed.sql.transactions.transaction
 
 class ExposedRatingsRepo (
@@ -25,13 +24,12 @@ class ExposedRatingsRepo (
     override val ResultRow.asObject: Rating
         get() = get(ratingsColumn).let(::Rating)
 
-    override fun update(k: PostId, v: Rating, it: UpdateStatement) {
+    override fun update(k: PostId, v: Rating, it: UpdateBuilder<Int>) {
         it[ratingsColumn] = v.double
     }
 
-    override fun insert(k: PostId, v: Rating, it: InsertStatement<Number>) {
+    override fun insertKey(k: PostId, v: Rating, it: InsertStatement<Number>) {
         it[keyColumn] = k.string
-        it[ratingsColumn] = v.double
     }
 
     private fun Query.optionallyLimit(limit: Int?) = if (limit == null) {

runner/config.json

@@ -7,25 +7,30 @@
   },
   "botToken": "1234567890:ABCDEFGHIJKLMNOP_qrstuvwxyz12345678",
   "plugins": [
+    "dev.inmo.plagubot.plugins.inline.queries.Plugin",
     "dev.inmo.plaguposter.posts.Plugin",
     "dev.inmo.plaguposter.posts.registrar.Plugin",
     "dev.inmo.plaguposter.ratings.Plugin",
     "dev.inmo.plaguposter.ratings.source.Plugin",
     "dev.inmo.plaguposter.ratings.selector.Plugin",
     "dev.inmo.plaguposter.triggers.selector_with_timer.Plugin",
-    "dev.inmo.plaguposter.ratings.gc.Plugin",
-    "dev.inmo.plaguposter.inlines.Plugin",
-    "dev.inmo.plaguposter.triggers.command.Plugin"
+    "dev.inmo.plaguposter.triggers.command.Plugin",
+    "dev.inmo.plaguposter.posts.panel.Plugin"
   ],
   "posts": {
-    "targetChat": 12345678,
-    "cacheChat": 12345678,
-    "sourceChat": 12345678
+    "chats": {
+      "targetChat": 12345678,
+      "cacheChat": 12345678,
+      "sourceChat": 12345678
+    }
   },
   "ratingsPolls": {
     "variants": {
-      "Ok": 1,
-      "Not ok": -1
+      "Круть": 2,
+      "Ок": 1,
+      "Не ок": -1,
+      "Совсем не ок": -2,
+      "Посмотреть результаты": 0
     },
     "autoAttach": true,
     "ratingOfferText": "What do you think about it?"
@@ -35,33 +40,18 @@
       {
         "time": {
           "from": "00:00",
-          "to": "00:00"
+          "to": "23:59"
         },
         "rating": {
-          "min": 0.0,
-          "max": 1.0,
-          "prefer": "random"
+          "prefer": "max"
         }
       },
       {
         "time": {
-          "from": "00:00",
+          "from": "23:59",
           "to": "00:00"
         },
         "rating": {
-          "min": 0.0,
-          "max": 1.0,
-          "prefer": "min"
-        }
-      },
-      {
-        "time": {
-          "from": "00:00",
-          "to": "00:00"
-        },
-        "rating": {
-          "min": 0.0,
-          "max": 1.0,
           "prefer": "max"
         }
       }
@@ -70,11 +60,13 @@
   "timer_trigger": {
     "krontab": "0 30 2/4 * *"
   },
-  "gc": {
-    "autoclear": {
-      "rating": -2,
-      "autoClearKrontab": "0 0 0 * *",
-      "skipPostAge": 86400
-    }
+  "panel": {
+    "textPrefix": "Post management:",
+    "buttonsPerRow": 2,
+    "parseMode": "MarkdownV2",
+    "deleteButtonText": "Delete"
+  },
+  "publish_command": {
+    "panelButtonText": "Publish"
   }
 }

sample/config.json

@@ -14,7 +14,7 @@
     "dev.inmo.plaguposter.ratings.selector.Plugin",
     "dev.inmo.plaguposter.triggers.selector_with_timer.Plugin",
     "dev.inmo.plaguposter.ratings.gc.Plugin",
-    "dev.inmo.plaguposter.inlines.Plugin",
+    "dev.inmo.plagubot.plugins.inline.queries.Plugin",
     "dev.inmo.plaguposter.triggers.command.Plugin"
   ],
   "posts": {

settings.gradle

@@ -11,6 +11,7 @@ String[] includes = [
     ":ratings:gc",
     ":triggers:command",
     ":triggers:selector_with_timer",
+    ":triggers:selector_with_scheduling",
     ":inlines",
 //    ":settings",
     ":runner"

settings/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"

template/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"
@@ -13,9 +12,5 @@ kotlin {
                 api project(":plaguposter.common")
             }
         }
-        jvmMain {
-            dependencies {
-            }
-        }
     }
 }

triggers/command/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"
@@ -16,9 +15,5 @@ kotlin {
                 api project(":plaguposter.posts.panel")
             }
         }
-        jvmMain {
-            dependencies {
-            }
-        }
     }
 }

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

@@ -7,9 +7,9 @@ import dev.inmo.micro_utils.pagination.firstPageWithOneElementPagination
 import dev.inmo.plagubot.Plugin
 import dev.inmo.plaguposter.common.SuccessfulSymbol
 import dev.inmo.plaguposter.common.UnsuccessfulSymbol
-import dev.inmo.plaguposter.inlines.models.Format
-import dev.inmo.plaguposter.inlines.models.OfferTemplate
-import dev.inmo.plaguposter.inlines.repos.InlineTemplatesRepo
+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.panel.PanelButtonBuilder
 import dev.inmo.plaguposter.posts.panel.PanelButtonsAPI

triggers/selector_with_scheduling/build.gradle

@@ -0,0 +1,16 @@
+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

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

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

@@ -0,0 +1,11 @@
+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

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

triggers/selector_with_timer/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"
@@ -16,9 +16,5 @@ kotlin {
                 api libs.krontab
             }
         }
-        jvmMain {
-            dependencies {
-            }
-        }
     }
 }