mirror of
https://github.com/InsanusMokrassar/PlaguPoster.git
synced 2025-12-05 20:45:40 +00:00
Compare commits
32 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b453401c33 | |||
| 01b9d0b2ab | |||
| 5f65095698 | |||
| 2baaac8e6d | |||
| 8899fb299f | |||
| bc0324a34f | |||
| b9c78982b5 | |||
| c632a2ba14 | |||
| 9403b133f9 | |||
| 00803fa933 | |||
| 74f3503413 | |||
| 34e253a12e | |||
| 65dfe8abd0 | |||
| 8c42f2e879 | |||
| 2b41082a48 | |||
| 0dc459d5dc | |||
| 4024b040e0 | |||
| 74cf8c1a9a | |||
| 82640a0c5d | |||
| 2052d003e5 | |||
| 791a161f8c | |||
| d6bd90267d | |||
| bea7fb7e46 | |||
| 44b2b849e4 | |||
| 8730c67084 | |||
| 3242810ef6 | |||
| 4423eba1d9 | |||
| 1f6dd7aad1 | |||
| 5366dcdba1 | |||
| 18ed638bcc | |||
| 6673b6c69b | |||
| 65f613fd97 |
@@ -18,6 +18,7 @@ allprojects {
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
google()
|
||||
maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +1,27 @@
|
||||
package dev.inmo.plaguposter.common
|
||||
|
||||
import dev.inmo.tgbotapi.types.ChatId
|
||||
import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
|
||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||
import kotlinx.serialization.SerialName
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class ChatConfig(
|
||||
@SerialName("targetChat")
|
||||
val targetChatId: ChatId,
|
||||
@Serializable(FullChatIdentifierSerializer::class)
|
||||
val targetChatId: IdChatIdentifier,
|
||||
@SerialName("sourceChat")
|
||||
val sourceChatId: ChatId,
|
||||
@Serializable(FullChatIdentifierSerializer::class)
|
||||
val sourceChatId: IdChatIdentifier,
|
||||
@SerialName("cacheChat")
|
||||
val cacheChatId: ChatId
|
||||
)
|
||||
@Serializable(FullChatIdentifierSerializer::class)
|
||||
val cacheChatId: IdChatIdentifier
|
||||
) {
|
||||
fun check(chatId: IdChatIdentifier) = when (chatId) {
|
||||
targetChatId,
|
||||
sourceChatId,
|
||||
cacheChatId -> true
|
||||
else -> false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
package dev.inmo.plaguposter.common
|
||||
|
||||
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
|
||||
|
||||
@Serializable
|
||||
data class ShortMessageInfo(
|
||||
val chatId: ChatId,
|
||||
@Serializable(FullChatIdentifierSerializer::class)
|
||||
val chatId: IdChatIdentifier,
|
||||
val messageId: MessageIdentifier
|
||||
)
|
||||
|
||||
|
||||
30
common/src/jvmMain/kotlin/CommonPlugin.kt
Normal file
30
common/src/jvmMain/kotlin/CommonPlugin.kt
Normal file
@@ -0,0 +1,30 @@
|
||||
package dev.inmo.plaguposter.common
|
||||
|
||||
import dev.inmo.kslog.common.i
|
||||
import dev.inmo.kslog.common.iS
|
||||
import dev.inmo.kslog.common.logger
|
||||
import dev.inmo.plagubot.Plugin
|
||||
import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.SupervisorJob
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import org.koin.core.Koin
|
||||
import org.koin.core.module.Module
|
||||
|
||||
object CommonPlugin : Plugin {
|
||||
private val Log = logger
|
||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||
single { CoroutineScope(Dispatchers.Default + SupervisorJob()) }
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||
val config = koin.get<ChatConfig>()
|
||||
|
||||
Log.iS { "Target chat info: ${getChat(config.targetChatId)}" }
|
||||
Log.iS { "Source chat info: ${getChat(config.sourceChatId)}" }
|
||||
Log.iS { "Cache chat info: ${getChat(config.cacheChatId)}" }
|
||||
}
|
||||
}
|
||||
@@ -10,5 +10,4 @@ android.enableJetifier=true
|
||||
# Project data
|
||||
|
||||
group=dev.inmo
|
||||
version=0.0.5
|
||||
android_code_version=5
|
||||
version=0.0.8
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
[versions]
|
||||
|
||||
kotlin = "1.7.20"
|
||||
kotlin = "1.7.22"
|
||||
kotlin-serialization = "1.4.1"
|
||||
|
||||
plagubot = "2.4.0"
|
||||
tgbotapi = "3.3.0"
|
||||
microutils = "0.13.1"
|
||||
kslog = "0.5.2"
|
||||
krontab = "0.8.1"
|
||||
tgbotapi-libraries = "0.5.6"
|
||||
plagubot-plugins = "0.5.0"
|
||||
plagubot = "3.2.1"
|
||||
tgbotapi = "4.2.1"
|
||||
microutils = "0.16.1"
|
||||
kslog = "0.5.4"
|
||||
krontab = "0.8.5"
|
||||
tgbotapi-libraries = "0.6.5"
|
||||
plagubot-plugins = "0.6.4"
|
||||
|
||||
dokka = "1.7.20"
|
||||
|
||||
psql = "42.5.0"
|
||||
|
||||
@@ -26,6 +28,7 @@ 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" }
|
||||
plagubot-plugins-inline-buttons = { module = "dev.inmo:plagubot.plugins.inline.buttons", 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" }
|
||||
@@ -39,7 +42,7 @@ psql = { module = "org.postgresql:postgresql", version.ref = "psql" }
|
||||
|
||||
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" }
|
||||
kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
|
||||
|
||||
[plugins]
|
||||
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -4,12 +4,20 @@ import dev.inmo.kslog.common.TagLogger
|
||||
import dev.inmo.kslog.common.w
|
||||
import dev.inmo.plagubot.Plugin
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import org.koin.core.Koin
|
||||
import org.koin.core.module.Module
|
||||
|
||||
private val actualPlugin = dev.inmo.plagubot.plugins.inline.queries.Plugin
|
||||
|
||||
object Plugin : Plugin by actualPlugin {
|
||||
private val log = TagLogger("InlinePlugin")
|
||||
|
||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||
single { actualPlugin }
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||
log.w {
|
||||
"Built-in inline plugin has been deprecated. Use \"${actualPlugin::class.qualifiedName}\" instead"
|
||||
|
||||
@@ -14,5 +14,10 @@ kotlin {
|
||||
api libs.microutils.koin
|
||||
}
|
||||
}
|
||||
jvmMain {
|
||||
dependencies {
|
||||
api libs.plagubot.plugins.inline.queries
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,21 @@ package dev.inmo.plaguposter.posts.panel
|
||||
import dev.inmo.plaguposter.posts.models.RegisteredPost
|
||||
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.InlineKeyboardButton
|
||||
|
||||
fun interface PanelButtonBuilder {
|
||||
interface PanelButtonBuilder {
|
||||
val weight: Int
|
||||
suspend fun buildButton(post: RegisteredPost): InlineKeyboardButton?
|
||||
|
||||
class Default(override val weight: Int = 0, private val block: suspend (RegisteredPost) -> InlineKeyboardButton?) : PanelButtonBuilder {
|
||||
override suspend fun buildButton(post: RegisteredPost): InlineKeyboardButton? = block(post)
|
||||
}
|
||||
|
||||
companion object {
|
||||
operator fun invoke(block: suspend (RegisteredPost) -> InlineKeyboardButton?) = Default(
|
||||
block = block
|
||||
)
|
||||
operator fun invoke(weight: Int, block: suspend (RegisteredPost) -> InlineKeyboardButton?) = Default(
|
||||
weight,
|
||||
block
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,14 +5,14 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineK
|
||||
import kotlinx.coroutines.flow.MutableSharedFlow
|
||||
|
||||
class PanelButtonsAPI(
|
||||
private val preset: List<PanelButtonBuilder>,
|
||||
private val preset: Map<Int, List<PanelButtonBuilder>>,
|
||||
private val rootPanelButtonText: String
|
||||
) {
|
||||
private val _buttons = mutableSetOf<PanelButtonBuilder>().also {
|
||||
it.addAll(preset)
|
||||
private val _buttonsMap = mutableMapOf<Int, MutableList<PanelButtonBuilder>>().also {
|
||||
it.putAll(preset.map { it.key to it.value.toMutableList() })
|
||||
}
|
||||
internal val buttonsBuilders: List<PanelButtonBuilder>
|
||||
get() = _buttons.toList()
|
||||
get() = _buttonsMap.toList().sortedBy { it.first }.flatMap { it.second }
|
||||
internal val forceRefreshFlow = MutableSharedFlow<PostId>()
|
||||
|
||||
val RootPanelButtonBuilder = PanelButtonBuilder {
|
||||
@@ -22,8 +22,13 @@ class PanelButtonsAPI(
|
||||
)
|
||||
}
|
||||
|
||||
fun add(button: PanelButtonBuilder) = _buttons.add(button)
|
||||
fun remove(button: PanelButtonBuilder) = _buttons.remove(button)
|
||||
fun add(button: PanelButtonBuilder, weight: Int = button.weight) = _buttonsMap.getOrPut(weight) { mutableListOf() }.add(button)
|
||||
fun remove(button: PanelButtonBuilder) = _buttonsMap.mapNotNull { (k, v) ->
|
||||
v.remove(button)
|
||||
k.takeIf { v.isEmpty() }
|
||||
}.forEach {
|
||||
_buttonsMap.remove(it)
|
||||
}
|
||||
suspend fun forceRefresh(postId: PostId) {
|
||||
forceRefreshFlow.emit(postId)
|
||||
}
|
||||
|
||||
@@ -5,9 +5,13 @@ 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
|
||||
import dev.inmo.micro_utils.repos.id
|
||||
import dev.inmo.micro_utils.repos.set
|
||||
import dev.inmo.micro_utils.repos.unset
|
||||
import dev.inmo.micro_utils.repos.value
|
||||
import dev.inmo.plagubot.Plugin
|
||||
import dev.inmo.plaguposter.common.ChatConfig
|
||||
import dev.inmo.plaguposter.common.UnsuccessfulSymbol
|
||||
import dev.inmo.plaguposter.posts.models.PostId
|
||||
import dev.inmo.plaguposter.posts.panel.repos.PostsMessages
|
||||
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
||||
@@ -15,18 +19,23 @@ 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.reply
|
||||
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
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.command
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMessageDataCallbackQuery
|
||||
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.IdChatIdentifier
|
||||
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.utils.bold
|
||||
import dev.inmo.tgbotapi.utils.buildEntities
|
||||
import dev.inmo.tgbotapi.utils.italic
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.*
|
||||
@@ -69,9 +78,13 @@ object Plugin : Plugin {
|
||||
}
|
||||
)
|
||||
PanelButtonsAPI(
|
||||
getAllDistinct<PanelButtonBuilder>() + builtInButtons,
|
||||
emptyMap(),
|
||||
config.rootButtonText
|
||||
)
|
||||
).apply {
|
||||
(getAllDistinct<PanelButtonBuilder>() + builtInButtons).forEach {
|
||||
add(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -108,7 +121,7 @@ object Plugin : Plugin {
|
||||
|
||||
suspend fun refreshPostMessage(
|
||||
postId: PostId,
|
||||
chatId: ChatId,
|
||||
chatId: IdChatIdentifier,
|
||||
messageId: MessageIdentifier
|
||||
) {
|
||||
val post = postsRepo.getById(postId) ?: return
|
||||
@@ -183,5 +196,59 @@ object Plugin : Plugin {
|
||||
val (chatId, messageId) = postsMessages.get(it) ?: return@subscribeSafelyWithoutExceptions
|
||||
refreshPostMessage(it, chatId, messageId)
|
||||
}
|
||||
|
||||
command("panel") {
|
||||
val reply = it.replyTo
|
||||
|
||||
if (reply == null) {
|
||||
runCatchingSafely {
|
||||
edit(
|
||||
it,
|
||||
it.content.textSources + buildEntities {
|
||||
+"${UnsuccessfulSymbol}\n" + bold("Result") + ": " + italic("You should reply post content to trigger panel retrieving")
|
||||
}
|
||||
)
|
||||
}.onFailure { _ ->
|
||||
reply(
|
||||
it,
|
||||
buildEntities {
|
||||
bold("Result") + ": " + italic("You should reply post content to trigger panel retrieving")
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
return@command
|
||||
}
|
||||
|
||||
val postId = postsRepo.getIdByChatAndMessage(reply.chat.id, reply.messageId)
|
||||
if (postId == null) {
|
||||
runCatchingSafely {
|
||||
edit(
|
||||
it,
|
||||
it.content.textSources + buildEntities {
|
||||
+"${UnsuccessfulSymbol}\n" + bold("Result") + ": " + italic("Unable to find post related to replied message")
|
||||
}
|
||||
)
|
||||
}.onFailure { _ ->
|
||||
reply(
|
||||
it,
|
||||
buildEntities {
|
||||
bold("Result") + ": " + italic("Unable to find post related to replied message")
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
return@command
|
||||
}
|
||||
|
||||
postsMessages.get(postId) ?.let {
|
||||
runCatchingSafely { delete(it.id, it.value) }
|
||||
postsMessages.unset(postId)
|
||||
}
|
||||
|
||||
refreshPostMessage(postId, it.chat.id, it.messageId)
|
||||
|
||||
postsMessages.set(postId, it.chat.id to it.messageId)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,18 +5,20 @@ 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.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(ChatId.serializer(), MessageIdentifier.serializer())
|
||||
private val ChatIdToMessageSerializer = PairSerializer(FullChatIdentifierSerializer, MessageIdentifier.serializer())
|
||||
|
||||
fun PostsMessages(
|
||||
database: Database,
|
||||
json: Json
|
||||
): KeyValueRepo<PostId, Pair<ChatId, MessageIdentifier>> = ExposedKeyValueRepo<String, String>(
|
||||
): KeyValueRepo<PostId, Pair<IdChatIdentifier, MessageIdentifier>> = ExposedKeyValueRepo<String, String>(
|
||||
database,
|
||||
{ text("postId") },
|
||||
{ text("chatToMessage") },
|
||||
@@ -25,5 +27,5 @@ fun PostsMessages(
|
||||
{ string },
|
||||
{ json.encodeToString(ChatIdToMessageSerializer, this) },
|
||||
{ PostId(this) },
|
||||
{ json.decodeFromString(ChatIdToMessageSerializer, this) }
|
||||
{ json.decodeFromString(ChatIdToMessageSerializer, this).let { (it.first as IdChatIdentifier) to it.second } }
|
||||
)
|
||||
|
||||
@@ -1,25 +1,39 @@
|
||||
package dev.inmo.plaguposter.posts.models
|
||||
|
||||
import dev.inmo.tgbotapi.extensions.utils.mediaGroupMessageOrNull
|
||||
import dev.inmo.tgbotapi.extensions.utils.possiblyMediaGroupMessageOrNull
|
||||
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.MessageContent
|
||||
import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class PostContentInfo(
|
||||
val chatId: ChatId,
|
||||
@Serializable(FullChatIdentifierSerializer::class)
|
||||
val chatId: IdChatIdentifier,
|
||||
val messageId: MessageIdentifier,
|
||||
val group: String?,
|
||||
val order: Int
|
||||
) {
|
||||
companion object {
|
||||
fun fromMessage(message: ContentMessage<*>, order: Int) = PostContentInfo(
|
||||
private fun fromMessage(message: ContentMessage<*>, order: Int) = PostContentInfo(
|
||||
message.chat.id,
|
||||
message.messageId,
|
||||
message.mediaGroupMessageOrNull() ?.mediaGroupId,
|
||||
message.possiblyMediaGroupMessageOrNull() ?.mediaGroupId,
|
||||
order
|
||||
)
|
||||
fun fromMessage(message: ContentMessage<*>): List<PostContentInfo> {
|
||||
val content = message.content
|
||||
|
||||
return if (content is MediaGroupContent<*>) {
|
||||
content.group.mapIndexed { i, it ->
|
||||
fromMessage(it.sourceMessage, i)
|
||||
}
|
||||
} else {
|
||||
listOf(fromMessage(message, 0))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,4 +7,6 @@ import kotlin.jvm.JvmInline
|
||||
@JvmInline
|
||||
value class PostId(
|
||||
val string: String
|
||||
)
|
||||
) {
|
||||
override fun toString(): String = string
|
||||
}
|
||||
|
||||
@@ -4,9 +4,11 @@ import com.soywiz.klock.DateTime
|
||||
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.MessageIdentifier
|
||||
|
||||
interface ReadPostsRepo : ReadCRUDRepo<RegisteredPost, PostId> {
|
||||
suspend fun getIdByChatAndMessage(chatId: ChatId, messageId: MessageIdentifier): PostId?
|
||||
suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageIdentifier): PostId?
|
||||
suspend fun getPostCreationTime(postId: PostId): DateTime?
|
||||
suspend fun getFirstMessageInfo(postId: PostId): PostContentInfo?
|
||||
}
|
||||
|
||||
@@ -12,12 +12,13 @@ import dev.inmo.tgbotapi.extensions.api.send.send
|
||||
import dev.inmo.tgbotapi.extensions.utils.*
|
||||
import dev.inmo.tgbotapi.types.*
|
||||
import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
|
||||
import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
|
||||
|
||||
class PostPublisher(
|
||||
private val bot: TelegramBot,
|
||||
private val postsRepo: PostsRepo,
|
||||
private val cachingChatId: ChatId,
|
||||
private val targetChatId: ChatId,
|
||||
private val cachingChatId: IdChatIdentifier,
|
||||
private val targetChatId: IdChatIdentifier,
|
||||
private val deleteAfterPosting: Boolean = true
|
||||
) {
|
||||
suspend fun publish(postId: PostId) {
|
||||
@@ -37,14 +38,26 @@ class PostPublisher(
|
||||
|
||||
sortedMessagesContents.forEach { (_, contents) ->
|
||||
contents.singleOrNull() ?.also {
|
||||
bot.copyMessage(targetChatId, it.chatId, it.messageId)
|
||||
runCatching {
|
||||
bot.copyMessage(targetChatId, it.chatId, it.messageId)
|
||||
}.onFailure { _ ->
|
||||
runCatching {
|
||||
bot.forwardMessage(
|
||||
it.chatId,
|
||||
targetChatId,
|
||||
it.messageId
|
||||
)
|
||||
}.onSuccess {
|
||||
bot.copyMessage(targetChatId, it)
|
||||
}
|
||||
}
|
||||
return@forEach
|
||||
}
|
||||
val resultContents = contents.mapNotNull {
|
||||
it.order to (bot.forwardMessage(toChatId = cachingChatId, fromChatId = it.chatId, messageId = it.messageId).contentMessageOrNull() ?: return@mapNotNull null)
|
||||
}.sortedBy { it.first }.mapNotNull { (_, it) ->
|
||||
it.withContentOrNull<MediaGroupContent>() ?: null.also { _ ->
|
||||
bot.copyMessage(targetChatId, it)
|
||||
}.sortedBy { it.first }.mapNotNull { (_, forwardedMessage) ->
|
||||
forwardedMessage.withContentOrNull<MediaGroupPartContent>() ?: null.also { _ ->
|
||||
bot.copyMessage(targetChatId, forwardedMessage)
|
||||
}
|
||||
}
|
||||
resultContents.singleOrNull() ?.also {
|
||||
|
||||
@@ -5,6 +5,7 @@ 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.ChatId
|
||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||
import org.jetbrains.exposed.sql.*
|
||||
|
||||
internal class ExposedContentInfoRepo(
|
||||
@@ -13,13 +14,14 @@ internal class ExposedContentInfoRepo(
|
||||
) : ExposedRepo, Table(name = "posts_content") {
|
||||
val postIdColumn = text("post_id").references(postIdColumnReference, ReferenceOption.CASCADE, ReferenceOption.CASCADE)
|
||||
val chatIdColumn = long("chat_id")
|
||||
val threadIdColumn = long("thread_id").nullable().default(null)
|
||||
val messageIdColumn = long("message_id")
|
||||
val groupColumn = text("group").nullable()
|
||||
val orderColumn = integer("order")
|
||||
|
||||
val ResultRow.asObject
|
||||
get() = PostContentInfo(
|
||||
ChatId(get(chatIdColumn)),
|
||||
IdChatIdentifier(get(chatIdColumn), get(threadIdColumn)),
|
||||
get(messageIdColumn),
|
||||
get(groupColumn),
|
||||
get(orderColumn)
|
||||
|
||||
@@ -3,15 +3,19 @@ package dev.inmo.plaguposter.posts.exposed
|
||||
import com.benasher44.uuid.uuid4
|
||||
import com.soywiz.klock.DateTime
|
||||
import dev.inmo.micro_utils.repos.KeyValuesRepo
|
||||
import dev.inmo.micro_utils.repos.UpdatedValuePair
|
||||
import dev.inmo.micro_utils.repos.exposed.AbstractExposedCRUDRepo
|
||||
import dev.inmo.micro_utils.repos.exposed.initTable
|
||||
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.MessageIdentifier
|
||||
import kotlinx.coroutines.flow.*
|
||||
import kotlinx.serialization.json.Json
|
||||
import org.jetbrains.exposed.sql.*
|
||||
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
|
||||
import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
|
||||
import org.jetbrains.exposed.sql.statements.*
|
||||
import org.jetbrains.exposed.sql.transactions.transaction
|
||||
|
||||
@@ -32,11 +36,13 @@ class ExposedPostsRepo(
|
||||
|
||||
override val primaryKey: PrimaryKey = PrimaryKey(idColumn)
|
||||
|
||||
override val selectById: SqlExpressionBuilder.(PostId) -> Op<Boolean> = { idColumn.eq(it.string) }
|
||||
override val selectByIds: SqlExpressionBuilder.(List<PostId>) -> Op<Boolean> = { idColumn.inList(it.map { it.string }) }
|
||||
override val selectById: ISqlExpressionBuilder.(PostId) -> Op<Boolean> = { idColumn.eq(it.string) }
|
||||
override val selectByIds: ISqlExpressionBuilder.(List<PostId>) -> Op<Boolean> = { idColumn.inList(it.map { it.string }) }
|
||||
override val ResultRow.asId: PostId
|
||||
get() = PostId(get(idColumn))
|
||||
override val ResultRow.asObject: RegisteredPost
|
||||
get() {
|
||||
val id = PostId(get(idColumn))
|
||||
val id = asId
|
||||
return RegisteredPost(
|
||||
id,
|
||||
DateTime(get(createdColumn)),
|
||||
@@ -75,17 +81,21 @@ class ExposedPostsRepo(
|
||||
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 ->
|
||||
insert {
|
||||
it[postIdColumn] = id.string
|
||||
it[chatIdColumn] = contentInfo.chatId.chatId
|
||||
it[messageIdColumn] = contentInfo.messageId
|
||||
it[groupColumn] = contentInfo.group
|
||||
it[orderColumn] = contentInfo.order
|
||||
override fun update(id: PostId?, value: NewPost, it: UpdateBuilder<Int>) {}
|
||||
|
||||
private fun updateContent(post: RegisteredPost) {
|
||||
transaction(database) {
|
||||
with(contentRepo) {
|
||||
deleteWhere { postIdColumn.eq(post.id.string) }
|
||||
post.content.forEach { contentInfo ->
|
||||
insert {
|
||||
it[postIdColumn] = post.id.string
|
||||
it[chatIdColumn] = contentInfo.chatId.chatId
|
||||
it[threadIdColumn] = contentInfo.chatId.threadId
|
||||
it[messageIdColumn] = contentInfo.messageId
|
||||
it[groupColumn] = contentInfo.group
|
||||
it[orderColumn] = contentInfo.order
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -96,6 +106,22 @@ class ExposedPostsRepo(
|
||||
it[createdColumn] = DateTime.now().unixMillis
|
||||
}
|
||||
|
||||
override suspend fun onAfterCreate(values: List<Pair<NewPost, RegisteredPost>>): List<RegisteredPost> {
|
||||
return values.map {
|
||||
val actual = it.second.copy(content = it.first.content)
|
||||
updateContent(actual)
|
||||
actual
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun onAfterUpdate(value: List<UpdatedValuePair<NewPost, RegisteredPost>>): List<RegisteredPost> {
|
||||
return value.map {
|
||||
val actual = it.second.copy(content = it.first.content)
|
||||
updateContent(actual)
|
||||
actual
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun deleteById(ids: List<PostId>) {
|
||||
onBeforeDelete(ids)
|
||||
val posts = ids.mapNotNull {
|
||||
@@ -104,7 +130,7 @@ class ExposedPostsRepo(
|
||||
val existsIds = posts.keys.toList()
|
||||
transaction(db = database) {
|
||||
val deleted = deleteWhere(null, null) {
|
||||
selectByIds(existsIds)
|
||||
selectByIds(it, existsIds)
|
||||
}
|
||||
with(contentRepo) {
|
||||
deleteWhere {
|
||||
@@ -124,10 +150,14 @@ class ExposedPostsRepo(
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getIdByChatAndMessage(chatId: ChatId, messageId: MessageIdentifier): PostId? {
|
||||
override suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageIdentifier): PostId? {
|
||||
return transaction(database) {
|
||||
with(contentRepo) {
|
||||
select { chatIdColumn.eq(chatId.chatId).and(messageIdColumn.eq(messageId)) }.limit(1).firstOrNull() ?.get(postIdColumn)
|
||||
select {
|
||||
chatIdColumn.eq(chatId.chatId)
|
||||
.and(chatId.threadId ?.let { threadIdColumn.eq(it) } ?: threadIdColumn.isNull())
|
||||
.and(messageIdColumn.eq(messageId))
|
||||
}.limit(1).firstOrNull() ?.get(postIdColumn)
|
||||
} ?.let(::PostId)
|
||||
}
|
||||
}
|
||||
@@ -135,4 +165,10 @@ class ExposedPostsRepo(
|
||||
override suspend fun getPostCreationTime(postId: PostId): DateTime? = transaction(database) {
|
||||
select { selectById(postId) }.limit(1).firstOrNull() ?.get(createdColumn) ?.let(::DateTime)
|
||||
}
|
||||
|
||||
override suspend fun getFirstMessageInfo(postId: PostId): PostContentInfo? = transaction(database) {
|
||||
with(contentRepo) {
|
||||
select { postIdColumn.eq(postId.string) }.limit(1).firstOrNull() ?.asObject
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,20 +3,24 @@ package dev.inmo.plaguposter.posts.registrar.state
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.plaguposter.posts.models.PostContentInfo
|
||||
import dev.inmo.tgbotapi.types.ChatId
|
||||
import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
|
||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
interface RegistrationState : State {
|
||||
override val context: ChatId
|
||||
override val context: IdChatIdentifier
|
||||
|
||||
@Serializable
|
||||
data class InProcess(
|
||||
override val context: ChatId,
|
||||
@Serializable(FullChatIdentifierSerializer::class)
|
||||
override val context: IdChatIdentifier,
|
||||
val messages: List<PostContentInfo>
|
||||
) : RegistrationState
|
||||
|
||||
@Serializable
|
||||
data class Finish(
|
||||
override val context: ChatId,
|
||||
@Serializable(FullChatIdentifierSerializer::class)
|
||||
override val context: IdChatIdentifier,
|
||||
val messages: List<PostContentInfo>
|
||||
) : RegistrationState
|
||||
}
|
||||
|
||||
@@ -22,12 +22,12 @@ 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.MediaGroupContent
|
||||
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
||||
import dev.inmo.tgbotapi.utils.regular
|
||||
import kotlinx.coroutines.flow.*
|
||||
import kotlinx.serialization.Serializable
|
||||
import org.koin.core.Koin
|
||||
@@ -43,7 +43,7 @@ object Plugin : Plugin {
|
||||
|
||||
val messageToDelete = send(
|
||||
state.context,
|
||||
buildEntities {
|
||||
dev.inmo.tgbotapi.utils.buildEntities {
|
||||
if (state.messages.isNotEmpty()) {
|
||||
regular("Your message(s) has been registered. You may send new ones or push \"Finish\" to finalize your post")
|
||||
} else {
|
||||
@@ -65,18 +65,11 @@ object Plugin : Plugin {
|
||||
val newMessagesInfo = firstOf {
|
||||
add {
|
||||
listOf(
|
||||
waitContentMessage(
|
||||
includeMediaGroups = false
|
||||
).filter {
|
||||
waitContentMessage().filter {
|
||||
it.chat.id == state.context && it.content.textContentOrNull() ?.text != "/finish_post"
|
||||
}.take(1).first()
|
||||
)
|
||||
}
|
||||
add {
|
||||
waitMediaGroupMessages().filter {
|
||||
it.first().chat.id == state.context
|
||||
}.take(1).first()
|
||||
}
|
||||
add {
|
||||
val finishPressed = waitMessageDataCallbackQuery().filter {
|
||||
it.message.sameMessage(messageToDelete) && it.data == buttonUuid
|
||||
@@ -95,8 +88,8 @@ object Plugin : Plugin {
|
||||
state.context,
|
||||
state.messages
|
||||
)
|
||||
}.map {
|
||||
PostContentInfo.fromMessage(it, state.messages.size)
|
||||
}.flatMap {
|
||||
PostContentInfo.fromMessage(it)
|
||||
}
|
||||
|
||||
RegistrationState.InProcess(
|
||||
@@ -121,25 +114,9 @@ object Plugin : Plugin {
|
||||
}
|
||||
|
||||
onContentMessage(
|
||||
initialFilter = { it.chat.id == config.sourceChatId && it.mediaGroupMessageOrNull() ?.mediaGroupId == null && !FirstSourceIsCommandsFilter(it) }
|
||||
initialFilter = { it.chat.id == config.sourceChatId && !FirstSourceIsCommandsFilter(it) }
|
||||
) {
|
||||
startChain(RegistrationState.Finish(it.chat.id, listOf(PostContentInfo.fromMessage(it, 0))))
|
||||
}
|
||||
|
||||
onMediaGroup(
|
||||
initialFilter = { it.first().chat.id == config.sourceChatId }
|
||||
) {
|
||||
startChain(
|
||||
RegistrationState.Finish(
|
||||
it.first().chat.id,
|
||||
it.map {
|
||||
PostContentInfo.fromMessage(
|
||||
it,
|
||||
0
|
||||
)
|
||||
}
|
||||
)
|
||||
)
|
||||
startChain(RegistrationState.Finish(it.chat.id, PostContentInfo.fromMessage(it)))
|
||||
}
|
||||
koin.getOrNull<InlineTemplatesRepo>() ?.apply {
|
||||
addTemplate(
|
||||
|
||||
160
ratings/source/src/commonMain/kotlin/buttons/RootButtons.kt
Normal file
160
ratings/source/src/commonMain/kotlin/buttons/RootButtons.kt
Normal file
@@ -0,0 +1,160 @@
|
||||
package dev.inmo.plaguposter.ratings.source.buttons
|
||||
|
||||
import com.soywiz.klock.DateFormat
|
||||
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
||||
import dev.inmo.micro_utils.pagination.FirstPagePagination
|
||||
import dev.inmo.micro_utils.pagination.Pagination
|
||||
import dev.inmo.micro_utils.pagination.SimplePagination
|
||||
import dev.inmo.micro_utils.pagination.utils.paginate
|
||||
import dev.inmo.plaguposter.posts.repo.ReadPostsRepo
|
||||
import dev.inmo.plaguposter.ratings.models.Rating
|
||||
import dev.inmo.plaguposter.ratings.repo.RatingsRepo
|
||||
import dev.inmo.plaguposter.ratings.utils.postsByRatings
|
||||
import dev.inmo.tgbotapi.extensions.api.answers.answer
|
||||
import dev.inmo.tgbotapi.extensions.api.edit.edit
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMessageDataCallbackQuery
|
||||
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.ChatIdentifier
|
||||
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
|
||||
import dev.inmo.tgbotapi.utils.row
|
||||
|
||||
const val RootButtonsShowRatingData = "ratings_buttons_show"
|
||||
const val RootButtonsShowRatingPageData = "ratings_buttons_show_page"
|
||||
const val RootButtonsToPageData = "ratings_buttons_to_page"
|
||||
|
||||
suspend fun RatingsRepo.buildRootButtons(
|
||||
pagination: Pagination = FirstPagePagination(16),
|
||||
rowSize: Int = 4
|
||||
): InlineKeyboardMarkup {
|
||||
val postsByRatings = postsByRatings().toList().paginate(pagination)
|
||||
return inlineKeyboard {
|
||||
if (postsByRatings.pagesNumber > 1) {
|
||||
row {
|
||||
if (postsByRatings.page > 0) {
|
||||
dataButton("<", "$RootButtonsToPageData ${postsByRatings.page - 1} ${postsByRatings.size}")
|
||||
}
|
||||
dataButton("${postsByRatings.page}: \uD83D\uDD04", "$RootButtonsToPageData ${postsByRatings.page} ${postsByRatings.size}")
|
||||
if (postsByRatings.pagesNumber - postsByRatings.page > 1) {
|
||||
dataButton(">", "$RootButtonsToPageData ${postsByRatings.page + 1} ${postsByRatings.size}")
|
||||
}
|
||||
}
|
||||
}
|
||||
postsByRatings.results.chunked(rowSize).map {
|
||||
row {
|
||||
it.forEach { (rating, posts) ->
|
||||
dataButton("${rating.double}: ${posts.size}", "$RootButtonsShowRatingData ${rating.double}")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val defaultPostCreationTimeFormat: DateFormat = DateFormat("dd.MM.yy HH:mm")
|
||||
|
||||
suspend fun RatingsRepo.buildRatingButtons(
|
||||
postsRepo: ReadPostsRepo,
|
||||
rating: Rating,
|
||||
pagination: Pagination = FirstPagePagination(8),
|
||||
rowSize: Int = 2,
|
||||
postCreationTimeFormat: DateFormat = defaultPostCreationTimeFormat
|
||||
): InlineKeyboardMarkup {
|
||||
val postsByRatings = getPosts(rating .. rating, true).keys.paginate(pagination)
|
||||
return inlineKeyboard {
|
||||
if (postsByRatings.pagesNumber > 1) {
|
||||
row {
|
||||
if (postsByRatings.page > 0) {
|
||||
dataButton("<", "$RootButtonsShowRatingPageData ${postsByRatings.page - 1} ${postsByRatings.size} ${rating.double}")
|
||||
}
|
||||
dataButton("${postsByRatings.page}: \uD83D\uDD04", "$RootButtonsShowRatingPageData ${postsByRatings.page} ${postsByRatings.size} ${rating.double}")
|
||||
if (postsByRatings.pagesNumber - postsByRatings.page > 1) {
|
||||
dataButton(">", "$RootButtonsShowRatingPageData ${postsByRatings.page + 1} ${postsByRatings.size} ${rating.double}")
|
||||
}
|
||||
}
|
||||
}
|
||||
postsByRatings.results.chunked(rowSize).map {
|
||||
row {
|
||||
it.forEach { postId ->
|
||||
val firstMessageInfo = postsRepo.getFirstMessageInfo(postId) ?: return@forEach
|
||||
val postCreationTime = postsRepo.getPostCreationTime(postId) ?: return@forEach
|
||||
urlButton(
|
||||
postCreationTime.format(postCreationTimeFormat),
|
||||
makeLinkToMessage(
|
||||
firstMessageInfo.chatId,
|
||||
firstMessageInfo.messageId
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
row {
|
||||
dataButton("↩️", "$RootButtonsToPageData 0 16")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun BehaviourContext.includeRootNavigationButtonsHandler(
|
||||
allowedChats: Set<ChatIdentifier>,
|
||||
ratingsRepo: RatingsRepo,
|
||||
postsRepo: ReadPostsRepo
|
||||
) {
|
||||
suspend fun registerPageQueryListener(
|
||||
dataPrefix: String,
|
||||
onPageUpdate: suspend (pagination: Pagination, additionalParams: Array<String>) -> InlineKeyboardMarkup?
|
||||
) {
|
||||
onMessageDataCallbackQuery(
|
||||
initialFilter = { it.message.chat.id in allowedChats }
|
||||
) {
|
||||
val args = it.data.split(" ").takeIf { it.size >= 3 } ?: return@onMessageDataCallbackQuery
|
||||
val (prefix, pageRaw, sizeRaw) = args
|
||||
|
||||
if (prefix == dataPrefix) {
|
||||
runCatchingSafely {
|
||||
val page = pageRaw.toIntOrNull() ?: return@runCatchingSafely
|
||||
val size = sizeRaw.toIntOrNull() ?: return@runCatchingSafely
|
||||
|
||||
edit(
|
||||
it.message,
|
||||
onPageUpdate(SimplePagination(page, size), args.drop(3).toTypedArray()) ?: return@runCatchingSafely
|
||||
)
|
||||
}
|
||||
|
||||
answer(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
suspend fun registerPageQueryListener(
|
||||
dataPrefix: String,
|
||||
onPageUpdate: suspend (pagination: Pagination) -> InlineKeyboardMarkup?
|
||||
) = registerPageQueryListener(dataPrefix) { pagination, _ ->
|
||||
onPageUpdate(pagination)
|
||||
}
|
||||
registerPageQueryListener(
|
||||
RootButtonsToPageData,
|
||||
ratingsRepo::buildRootButtons
|
||||
)
|
||||
registerPageQueryListener(
|
||||
RootButtonsShowRatingPageData
|
||||
) { pagination, params ->
|
||||
params.firstOrNull() ?.toDoubleOrNull() ?.let { rating ->
|
||||
ratingsRepo.buildRatingButtons(postsRepo, Rating(rating), pagination)
|
||||
}
|
||||
}
|
||||
onMessageDataCallbackQuery(
|
||||
initialFilter = { it.message.chat.id in allowedChats }
|
||||
) {
|
||||
val (prefix, ratingRaw) = it.data.split(" ").takeIf { it.size == 2 } ?: return@onMessageDataCallbackQuery
|
||||
|
||||
if (prefix == RootButtonsShowRatingData) {
|
||||
runCatchingSafely {
|
||||
val rating = ratingRaw.toDoubleOrNull() ?: return@runCatchingSafely
|
||||
edit(it.message, ratingsRepo.buildRatingButtons(postsRepo, Rating(rating)))
|
||||
}
|
||||
|
||||
answer(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,8 @@ import dev.inmo.plaguposter.posts.panel.PanelButtonsAPI
|
||||
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
||||
import dev.inmo.plaguposter.ratings.models.Rating
|
||||
import dev.inmo.plaguposter.ratings.repo.RatingsRepo
|
||||
import dev.inmo.plaguposter.ratings.source.buttons.buildRootButtons
|
||||
import dev.inmo.plaguposter.ratings.source.buttons.includeRootNavigationButtonsHandler
|
||||
import dev.inmo.plaguposter.ratings.source.models.*
|
||||
import dev.inmo.plaguposter.ratings.source.repos.*
|
||||
import dev.inmo.plaguposter.ratings.utils.postsByRatings
|
||||
@@ -34,6 +36,7 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
|
||||
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.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
|
||||
import dev.inmo.tgbotapi.types.message.textsources.bold
|
||||
import dev.inmo.tgbotapi.types.message.textsources.regular
|
||||
@@ -98,6 +101,7 @@ object Plugin : Plugin {
|
||||
}
|
||||
|
||||
val post = postsRepo.getById(postId) ?: return false
|
||||
ratingsRepo.set(postId, Rating(0.0))
|
||||
for (content in post.content) {
|
||||
runCatchingSafely {
|
||||
val sent = send(
|
||||
@@ -137,7 +141,7 @@ object Plugin : Plugin {
|
||||
}
|
||||
}
|
||||
|
||||
postsRepo.deletedObjectsIdsFlow.subscribeSafelyWithoutExceptions(this) { postId ->
|
||||
ratingsRepo.onValueRemoved.subscribeSafelyWithoutExceptions(this) { postId ->
|
||||
detachPoll(postId)
|
||||
}
|
||||
|
||||
@@ -225,13 +229,23 @@ object Plugin : Plugin {
|
||||
+ "• " + bold("% 3.1f".format(it.first.double)) + ": " + bold(it.second.size.toString()) + "\n"
|
||||
}
|
||||
}
|
||||
val keyboard = flatInlineKeyboard {
|
||||
dataButton("Interactive mode", "ratings_interactive")
|
||||
}
|
||||
runCatchingSafely {
|
||||
edit(it, textSources)
|
||||
edit(it, textSources, replyMarkup = keyboard)
|
||||
}.onFailure { _ ->
|
||||
reply(it, textSources)
|
||||
reply(it, textSources, replyMarkup = keyboard)
|
||||
}
|
||||
}
|
||||
}
|
||||
includeRootNavigationButtonsHandler(setOf(chatConfig.sourceChatId), ratingsRepo, postsRepo)
|
||||
onMessageDataCallbackQuery("ratings_interactive", initialFilter = { it.message.chat.id == chatConfig.sourceChatId }) {
|
||||
edit(
|
||||
it.message,
|
||||
ratingsRepo.buildRootButtons()
|
||||
)
|
||||
}
|
||||
|
||||
koin.getOrNull<InlineTemplatesRepo>() ?.apply {
|
||||
addTemplate(
|
||||
|
||||
@@ -4,8 +4,11 @@ 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.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
|
||||
import org.jetbrains.exposed.sql.statements.*
|
||||
|
||||
class ExposedPollsToMessagesInfoRepo(
|
||||
@@ -16,10 +19,11 @@ class ExposedPollsToMessagesInfoRepo(
|
||||
) {
|
||||
override val keyColumn = text("poll_id")
|
||||
private val chatIdColumn = long("chat_id")
|
||||
private val threadIdColumn = long("thread_id").nullable().default(null)
|
||||
private val messageIdColumn = long("message_id")
|
||||
override val selectById: SqlExpressionBuilder.(PollIdentifier) -> Op<Boolean> = { keyColumn.eq(it) }
|
||||
override val selectByValue: SqlExpressionBuilder.(ShortMessageInfo) -> Op<Boolean> = {
|
||||
chatIdColumn.eq(it.chatId.chatId).and(
|
||||
override val selectById: ISqlExpressionBuilder.(PollIdentifier) -> Op<Boolean> = { keyColumn.eq(it) }
|
||||
override val selectByValue: ISqlExpressionBuilder.(ShortMessageInfo) -> Op<Boolean> = {
|
||||
chatIdColumn.eq(it.chatId.chatId).and(it.chatId.threadId ?.let { threadIdColumn.eq(it) } ?: threadIdColumn.isNull()).and(
|
||||
messageIdColumn.eq(it.messageId)
|
||||
)
|
||||
}
|
||||
@@ -27,7 +31,7 @@ class ExposedPollsToMessagesInfoRepo(
|
||||
get() = get(keyColumn)
|
||||
override val ResultRow.asObject: ShortMessageInfo
|
||||
get() = ShortMessageInfo(
|
||||
get(chatIdColumn).let(::ChatId),
|
||||
IdChatIdentifier(get(chatIdColumn), get(threadIdColumn)),
|
||||
get(messageIdColumn)
|
||||
)
|
||||
|
||||
@@ -37,6 +41,7 @@ class ExposedPollsToMessagesInfoRepo(
|
||||
|
||||
override fun update(k: PollIdentifier, v: ShortMessageInfo, it: UpdateBuilder<Int>) {
|
||||
it[chatIdColumn] = v.chatId.chatId
|
||||
it[threadIdColumn] = v.chatId.threadId
|
||||
it[messageIdColumn] = v.messageId
|
||||
}
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ class ExposedPollsToPostsIdsRepo(
|
||||
) : PollsToPostsIdsRepo, AbstractExposedKeyValueRepo<PollIdentifier, PostId>(database, "polls_to_posts") {
|
||||
override val keyColumn = text("poll_id")
|
||||
val postIdColumn = text("postId")
|
||||
override val selectById: SqlExpressionBuilder.(PollIdentifier) -> Op<Boolean> = { keyColumn.eq(it) }
|
||||
override val selectByValue: SqlExpressionBuilder.(PostId) -> Op<Boolean> = { postIdColumn.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: PollIdentifier
|
||||
get() = get(keyColumn)
|
||||
override val ResultRow.asObject: PostId
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package dev.inmo.plaguposter.ratings.exposed
|
||||
|
||||
import dev.inmo.micro_utils.pagination.utils.optionallyReverse
|
||||
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.plaguposter.ratings.models.Rating
|
||||
@@ -17,13 +18,17 @@ class ExposedRatingsRepo (
|
||||
) {
|
||||
override val keyColumn = text("post_id")
|
||||
val ratingsColumn = double("rating")
|
||||
override val selectById: SqlExpressionBuilder.(PostId) -> Op<Boolean> = { keyColumn.eq(it.string) }
|
||||
override val selectByValue: SqlExpressionBuilder.(Rating) -> Op<Boolean> = { ratingsColumn.eq(it.double) }
|
||||
override val selectById: ISqlExpressionBuilder.(PostId) -> Op<Boolean> = { keyColumn.eq(it.string) }
|
||||
override val selectByValue: ISqlExpressionBuilder.(Rating) -> Op<Boolean> = { ratingsColumn.eq(it.double) }
|
||||
override val ResultRow.asKey: PostId
|
||||
get() = get(keyColumn).let(::PostId)
|
||||
override val ResultRow.asObject: Rating
|
||||
get() = get(ratingsColumn).let(::Rating)
|
||||
|
||||
init {
|
||||
initTable()
|
||||
}
|
||||
|
||||
override fun update(k: PostId, v: Rating, it: UpdateBuilder<Int>) {
|
||||
it[ratingsColumn] = v.double
|
||||
}
|
||||
|
||||
@@ -15,6 +15,9 @@ dependencies {
|
||||
api project(":plaguposter.posts_registrar")
|
||||
api project(":plaguposter.triggers.command")
|
||||
api project(":plaguposter.triggers.selector_with_timer")
|
||||
api project(":plaguposter.triggers.timer")
|
||||
api project(":plaguposter.triggers.timer.disablers.autoposts")
|
||||
api project(":plaguposter.triggers.timer.disablers.ratings")
|
||||
api project(":plaguposter.ratings")
|
||||
api project(":plaguposter.ratings.source")
|
||||
api project(":plaguposter.ratings.selector")
|
||||
|
||||
@@ -7,15 +7,19 @@
|
||||
},
|
||||
"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.plagubot.plugins.inline.queries.Plugin",
|
||||
"dev.inmo.plaguposter.triggers.command.Plugin",
|
||||
"dev.inmo.plaguposter.posts.panel.Plugin"
|
||||
"dev.inmo.plaguposter.posts.panel.Plugin",
|
||||
"dev.inmo.plaguposter.common.CommonPlugin",
|
||||
"dev.inmo.plaguposter.triggers.timer.Plugin",
|
||||
"dev.inmo.plaguposter.triggers.timer.disablers.ratings.Plugin",
|
||||
"dev.inmo.plaguposter.triggers.timer.disablers.autoposts.Plugin"
|
||||
],
|
||||
"posts": {
|
||||
"chats": {
|
||||
|
||||
@@ -12,6 +12,9 @@ String[] includes = [
|
||||
":triggers:command",
|
||||
":triggers:selector_with_timer",
|
||||
":triggers:selector_with_scheduling",
|
||||
":triggers:timer",
|
||||
":triggers:timer:disablers:ratings",
|
||||
":triggers:timer:disablers:autoposts",
|
||||
":inlines",
|
||||
// ":settings",
|
||||
":runner"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.multiplatform"
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppProjectWithSerializationPresetPath"
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
package dev.inmo.plaguposter.triggers.command
|
||||
|
||||
import com.benasher44.uuid.uuid4
|
||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
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.plagubot.plugins.inline.queries.models.Format
|
||||
import dev.inmo.plagubot.plugins.inline.queries.models.OfferTemplate
|
||||
import dev.inmo.plagubot.plugins.inline.queries.repos.InlineTemplatesRepo
|
||||
@@ -16,14 +13,10 @@ import dev.inmo.plaguposter.posts.panel.PanelButtonsAPI
|
||||
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
||||
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.reply
|
||||
import dev.inmo.tgbotapi.extensions.api.send.send
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextWithFSM
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitMessageDataCallbackQuery
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitTextMessage
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.strictlyOn
|
||||
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.*
|
||||
@@ -33,9 +26,7 @@ import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard
|
||||
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.textsources.regular
|
||||
import kotlinx.coroutines.flow.filter
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.*
|
||||
@@ -78,7 +69,14 @@ object Plugin : Plugin {
|
||||
}
|
||||
}
|
||||
val postId = messageInReply ?.let {
|
||||
postsRepo.getIdByChatAndMessage(messageInReply.chat.id, messageInReply.messageId)
|
||||
postsRepo.getIdByChatAndMessage(messageInReply.chat.id, messageInReply.messageId) ?: let { _ ->
|
||||
reply(
|
||||
it,
|
||||
"Unable to find any post related to the message in reply"
|
||||
)
|
||||
|
||||
return@onCommand
|
||||
}
|
||||
} ?: selector ?.take(1) ?.firstOrNull()
|
||||
if (postId == null) {
|
||||
reply(
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
package dev.inmo.plaguposter.triggers.selector_with_timer
|
||||
|
||||
import com.soywiz.klock.DateTime
|
||||
import dev.inmo.plaguposter.posts.models.PostId
|
||||
|
||||
fun interface AutopostFilter {
|
||||
suspend fun check(postId: PostId, dateTime: DateTime): Boolean
|
||||
}
|
||||
@@ -34,9 +34,12 @@ object Plugin : Plugin {
|
||||
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||
val publisher = koin.get<PostPublisher>()
|
||||
val selector = koin.get<Selector>()
|
||||
koin.get<Config>().krontab.asFlow().subscribeSafelyWithoutExceptions(this) {
|
||||
selector.take(now = it).forEach { postId ->
|
||||
publisher.publish(postId)
|
||||
val filters = koin.getAll<AutopostFilter>().distinct()
|
||||
koin.get<Config>().krontab.asFlow().subscribeSafelyWithoutExceptions(this) { dateTime ->
|
||||
selector.take(now = dateTime).forEach { postId ->
|
||||
if (filters.all { it.check(postId, dateTime) }) {
|
||||
publisher.publish(postId)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
18
triggers/timer/build.gradle
Normal file
18
triggers/timer/build.gradle
Normal file
@@ -0,0 +1,18 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.multiplatform"
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
}
|
||||
|
||||
apply from: "$mppProjectWithSerializationPresetPath"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
commonMain {
|
||||
dependencies {
|
||||
api project(":plaguposter.common")
|
||||
api project(":plaguposter.posts")
|
||||
api project(":plaguposter.posts.panel")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
18
triggers/timer/disablers/autoposts/build.gradle
Normal file
18
triggers/timer/disablers/autoposts/build.gradle
Normal file
@@ -0,0 +1,18 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.multiplatform"
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
}
|
||||
|
||||
apply from: "$mppProjectWithSerializationPresetPath"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
commonMain {
|
||||
dependencies {
|
||||
api project(":plaguposter.common")
|
||||
api project(":plaguposter.triggers.timer")
|
||||
api project(":plaguposter.triggers.selector_with_timer")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
package dev.inmo.plaguposter.triggers.timer.disablers.autoposts
|
||||
@@ -0,0 +1,27 @@
|
||||
package dev.inmo.plaguposter.triggers.timer.disablers.autoposts
|
||||
|
||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||
import dev.inmo.micro_utils.koin.singleWithRandomQualifier
|
||||
import dev.inmo.micro_utils.koin.singleWithRandomQualifierAndBinds
|
||||
import dev.inmo.micro_utils.pagination.FirstPagePagination
|
||||
import dev.inmo.micro_utils.repos.unset
|
||||
import dev.inmo.plagubot.Plugin
|
||||
import dev.inmo.plaguposter.ratings.repo.RatingsRepo
|
||||
import dev.inmo.plaguposter.triggers.selector_with_timer.AutopostFilter
|
||||
import dev.inmo.plaguposter.triggers.timer.TimersRepo
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
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) {
|
||||
singleWithRandomQualifier<AutopostFilter> {
|
||||
val timersRepo = get<TimersRepo>()
|
||||
AutopostFilter { _, dateTime ->
|
||||
val result = timersRepo.keys(dateTime, FirstPagePagination(1))
|
||||
result.results.isEmpty()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
<manifest package="dev.inmo.plaguposter.triggers.timer.disablers.autoposts"/>
|
||||
18
triggers/timer/disablers/ratings/build.gradle
Normal file
18
triggers/timer/disablers/ratings/build.gradle
Normal file
@@ -0,0 +1,18 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.multiplatform"
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
}
|
||||
|
||||
apply from: "$mppProjectWithSerializationPresetPath"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
commonMain {
|
||||
dependencies {
|
||||
api project(":plaguposter.common")
|
||||
api project(":plaguposter.triggers.timer")
|
||||
api project(":plaguposter.ratings")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
package dev.inmo.plaguposter.triggers.timer.disablers.ratings
|
||||
@@ -0,0 +1,26 @@
|
||||
package dev.inmo.plaguposter.triggers.timer.disablers.ratings
|
||||
|
||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||
import dev.inmo.micro_utils.koin.singleWithRandomQualifier
|
||||
import dev.inmo.micro_utils.repos.unset
|
||||
import dev.inmo.plagubot.Plugin
|
||||
import dev.inmo.plaguposter.ratings.repo.RatingsRepo
|
||||
import dev.inmo.plaguposter.triggers.timer.TimersRepo
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
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) {
|
||||
singleWithRandomQualifier(createdAtStart = true) {
|
||||
val timersRepo = get<TimersRepo>()
|
||||
val ratingsRepo = get<RatingsRepo>()
|
||||
val scope = get<CoroutineScope>()
|
||||
|
||||
timersRepo.onNewValue.subscribeSafelyWithoutExceptions(scope) {
|
||||
ratingsRepo.unset(it.first)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
<manifest package="dev.inmo.plaguposter.triggers.timer.disablers.ratings"/>
|
||||
287
triggers/timer/src/commonMain/kotlin/ButtonsBuilder.kt
Normal file
287
triggers/timer/src/commonMain/kotlin/ButtonsBuilder.kt
Normal file
@@ -0,0 +1,287 @@
|
||||
package dev.inmo.plaguposter.triggers.timer
|
||||
|
||||
import com.soywiz.klock.DateFormat
|
||||
import com.soywiz.klock.DateTime
|
||||
import com.soywiz.klock.DateTimeTz
|
||||
import com.soywiz.klock.Month
|
||||
import com.soywiz.klock.Year
|
||||
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
||||
import dev.inmo.micro_utils.repos.unset
|
||||
import dev.inmo.plaguposter.common.SuccessfulSymbol
|
||||
import dev.inmo.plaguposter.common.UnsuccessfulSymbol
|
||||
import dev.inmo.plaguposter.posts.models.PostId
|
||||
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.behaviour_builder.BehaviourContext
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMessageDataCallbackQuery
|
||||
import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
|
||||
import dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard
|
||||
import dev.inmo.tgbotapi.extensions.utils.withContentOrNull
|
||||
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
|
||||
import dev.inmo.tgbotapi.utils.bold
|
||||
import dev.inmo.tgbotapi.utils.buildEntities
|
||||
import dev.inmo.tgbotapi.utils.row
|
||||
|
||||
object ButtonsBuilder {
|
||||
private const val changeTimeData = "timer_time_hint"
|
||||
private const val changeDateData = "timer_date_hint"
|
||||
private const val changeHoursDataPrefix = "timer_h"
|
||||
private const val changeMinutesDataPrefix = "timer_m"
|
||||
private const val changeDayDataPrefix = "timer_d"
|
||||
private const val changeMonthDataPrefix = "timer_M"
|
||||
private const val changeYearDataPrefix = "timer_y"
|
||||
private const val changeDateDataPrefix = "timer_s"
|
||||
private const val cancelDateData = "timer_c"
|
||||
private const val deleteDateDataPrefix = "timer_r"
|
||||
val datePrintFormat = DateFormat("HH:mm, dd.MM.yyyy, zzz")
|
||||
|
||||
fun buildTimerButtons(
|
||||
postId: PostId,
|
||||
dateTime: DateTimeTz,
|
||||
exists: Boolean
|
||||
) = inlineKeyboard {
|
||||
val unixMillis = dateTime.utc.unixMillisLong
|
||||
row {
|
||||
dataButton("Time (hh:mm):", changeTimeData)
|
||||
dataButton(dateTime.hours.toString(), "$changeHoursDataPrefix $postId $unixMillis")
|
||||
dataButton(dateTime.minutes.toString(), "$changeMinutesDataPrefix $postId $unixMillis")
|
||||
}
|
||||
row {
|
||||
dataButton("Date (dd.mm.yyyy):", changeDateData)
|
||||
dataButton("${dateTime.dayOfMonth}", "$changeDayDataPrefix $postId $unixMillis")
|
||||
dataButton("${dateTime.month1}", "$changeMonthDataPrefix $postId $unixMillis")
|
||||
dataButton("${dateTime.yearInt}", "$changeYearDataPrefix $postId $unixMillis")
|
||||
}
|
||||
|
||||
row {
|
||||
if (exists) {
|
||||
dataButton("\uD83D\uDDD1", "$deleteDateDataPrefix $postId")
|
||||
}
|
||||
dataButton(UnsuccessfulSymbol, cancelDateData)
|
||||
dataButton(SuccessfulSymbol, "$changeDateDataPrefix $postId $unixMillis")
|
||||
}
|
||||
}
|
||||
|
||||
fun buildTimerTextSources(
|
||||
currentDateTime: DateTime,
|
||||
previousTime: DateTime?
|
||||
) = buildEntities {
|
||||
previousTime ?.let {
|
||||
+ "Previous timer time: " + bold(it.local.toString(datePrintFormat)) + "\n"
|
||||
}
|
||||
+"Currently editing time: " + bold(currentDateTime.local.toString(datePrintFormat))
|
||||
}
|
||||
|
||||
suspend fun BehaviourContext.includeKeyboardHandling(
|
||||
timersRepo: TimersRepo,
|
||||
onSavePublishingTime: suspend (PostId, DateTime) -> Boolean
|
||||
) {
|
||||
fun buildKeyboard(
|
||||
prefix: String,
|
||||
postId: PostId,
|
||||
values: Iterable<Int>,
|
||||
min: DateTime = nearestAvailableTimerTime(),
|
||||
dateConverter: (Int) -> DateTimeTz
|
||||
): InlineKeyboardMarkup {
|
||||
return inlineKeyboard {
|
||||
values.chunked(6).forEach {
|
||||
row {
|
||||
it.forEach {
|
||||
dataButton(it.toString(), "$prefix $postId ${dateConverter(it).utc.unixMillisLong.coerceAtLeast(min.unixMillisLong)}")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun buildStandardDataCallbackQuery(
|
||||
name: String,
|
||||
prefix: String,
|
||||
possibleValues: (DateTimeTz) -> Iterable<Int>,
|
||||
dateTimeConverter: (Int, DateTimeTz) -> DateTimeTz
|
||||
) {
|
||||
val setPrefix = "${prefix}s"
|
||||
onMessageDataCallbackQuery(Regex("$prefix .+")) {
|
||||
val (_, rawPostId, rawDateTimeMillis) = it.data.split(" ")
|
||||
val currentMillis = rawDateTimeMillis.toLongOrNull() ?: return@onMessageDataCallbackQuery
|
||||
val currentDateTime = DateTime(currentMillis)
|
||||
val currentDateTimeLocal = DateTime(currentMillis).local
|
||||
val postId = PostId(rawPostId)
|
||||
val previousTime = timersRepo.get(postId)
|
||||
|
||||
edit (
|
||||
it.message.withContentOrNull() ?: return@onMessageDataCallbackQuery,
|
||||
replyMarkup = buildKeyboard(
|
||||
setPrefix,
|
||||
postId,
|
||||
possibleValues(currentDateTimeLocal)
|
||||
) {
|
||||
dateTimeConverter(it, currentDateTimeLocal)
|
||||
}
|
||||
) {
|
||||
+buildTimerTextSources(currentDateTime, previousTime) + "\n"
|
||||
+"You are about to edit $name"
|
||||
}
|
||||
}
|
||||
|
||||
onMessageDataCallbackQuery(Regex("$setPrefix .+")) {
|
||||
val (_, rawPostId, rawDateTimeMillis) = it.data.split(" ")
|
||||
|
||||
val currentMillis = rawDateTimeMillis.toLongOrNull() ?: return@onMessageDataCallbackQuery
|
||||
val currentDateTime = DateTime(currentMillis)
|
||||
val postId = PostId(rawPostId)
|
||||
val previousTime = timersRepo.get(postId)
|
||||
edit(
|
||||
it.message.withContentOrNull() ?: return@onMessageDataCallbackQuery,
|
||||
replyMarkup = buildTimerButtons(
|
||||
postId,
|
||||
currentDateTime.local,
|
||||
timersRepo.contains(postId)
|
||||
)
|
||||
) {
|
||||
+buildTimerTextSources(currentDateTime, previousTime)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun DateTimeTz.dateEq(other: DateTimeTz) = yearInt == other.yearInt && month0 == other.month0 && dayOfMonth == other.dayOfMonth
|
||||
|
||||
buildStandardDataCallbackQuery(
|
||||
"hour",
|
||||
changeHoursDataPrefix,
|
||||
{
|
||||
val now = nearestAvailableTimerTime().local
|
||||
|
||||
if (now.dateEq(it)) {
|
||||
now.hours .. 23
|
||||
} else {
|
||||
0 .. 23
|
||||
}
|
||||
}
|
||||
) { newValue, oldDateTime ->
|
||||
DateTimeTz.local(
|
||||
oldDateTime.local.copyDayOfMonth(hours = newValue),
|
||||
oldDateTime.offset
|
||||
)
|
||||
}
|
||||
|
||||
buildStandardDataCallbackQuery(
|
||||
"minute",
|
||||
changeMinutesDataPrefix,
|
||||
{
|
||||
val now = nearestAvailableTimerTime().local
|
||||
|
||||
if (now.dateEq(it) && now.hours >= it.hours) {
|
||||
now.minutes until 60
|
||||
} else {
|
||||
0 until 60
|
||||
}
|
||||
}
|
||||
) { newValue, oldDateTime ->
|
||||
DateTimeTz.local(
|
||||
oldDateTime.local.copyDayOfMonth(minutes = newValue),
|
||||
oldDateTime.offset
|
||||
)
|
||||
}
|
||||
|
||||
buildStandardDataCallbackQuery(
|
||||
"day",
|
||||
changeDayDataPrefix,
|
||||
{
|
||||
val now = nearestAvailableTimerTime().local
|
||||
|
||||
if (now.yearInt == it.yearInt && now.month0 == it.month0) {
|
||||
now.dayOfMonth .. it.month.days(it.year)
|
||||
} else {
|
||||
1 .. it.month.days(it.year)
|
||||
}
|
||||
}
|
||||
) { newValue, oldDateTime ->
|
||||
DateTimeTz.local(
|
||||
oldDateTime.local.copyDayOfMonth(dayOfMonth = newValue),
|
||||
oldDateTime.offset
|
||||
)
|
||||
}
|
||||
|
||||
buildStandardDataCallbackQuery(
|
||||
"month",
|
||||
changeMonthDataPrefix,
|
||||
{
|
||||
val now = nearestAvailableTimerTime().local
|
||||
|
||||
if (now.year == it.year) {
|
||||
now.month1 .. 12
|
||||
} else {
|
||||
1 .. 12
|
||||
}
|
||||
}
|
||||
) { newValue, oldDateTime ->
|
||||
DateTimeTz.local(
|
||||
oldDateTime.local.copyDayOfMonth(month = Month(newValue)),
|
||||
oldDateTime.offset
|
||||
)
|
||||
}
|
||||
|
||||
buildStandardDataCallbackQuery(
|
||||
"year",
|
||||
changeYearDataPrefix,
|
||||
{
|
||||
val now = nearestAvailableTimerTime().local
|
||||
(now.year.year .. (now.year.year + 5))
|
||||
}
|
||||
) { newValue, oldDateTime ->
|
||||
DateTimeTz.local(
|
||||
oldDateTime.local.copyDayOfMonth(year = Year(newValue)),
|
||||
oldDateTime.offset
|
||||
)
|
||||
}
|
||||
|
||||
onMessageDataCallbackQuery(changeTimeData) {
|
||||
answer(it, "Use the buttons to the right to set post publishing time (hh:mm)", showAlert = true)
|
||||
}
|
||||
|
||||
onMessageDataCallbackQuery(changeDateData) {
|
||||
answer(it, "Use the buttons to the right to set post publishing date (dd.MM.yyyy)", showAlert = true)
|
||||
}
|
||||
|
||||
onMessageDataCallbackQuery(Regex("$changeDateDataPrefix .*")) {
|
||||
val (_, rawPostId, rawDateTimeMillis) = it.data.split(" ")
|
||||
val currentMillis = rawDateTimeMillis.toLongOrNull() ?: return@onMessageDataCallbackQuery
|
||||
val currentDateTime = DateTime(currentMillis)
|
||||
val postId = PostId(rawPostId)
|
||||
|
||||
val success = runCatchingSafely {
|
||||
onSavePublishingTime(postId, currentDateTime)
|
||||
}.getOrElse { false }
|
||||
|
||||
answer(
|
||||
it,
|
||||
if (success) "Successfully set timer" else "Unable to set timer"
|
||||
)
|
||||
|
||||
it.message.delete(this)
|
||||
}
|
||||
|
||||
onMessageDataCallbackQuery(Regex("$deleteDateDataPrefix .*")) {
|
||||
val (_, rawPostId) = it.data.split(" ")
|
||||
val postId = PostId(rawPostId)
|
||||
|
||||
val success = runCatchingSafely {
|
||||
timersRepo.unset(postId)
|
||||
true
|
||||
}.getOrElse { false }
|
||||
|
||||
answer(
|
||||
it,
|
||||
if (success) "Successfully unset timer" else "Unable to unset timer"
|
||||
)
|
||||
|
||||
it.message.delete(this)
|
||||
}
|
||||
|
||||
onMessageDataCallbackQuery(cancelDateData) {
|
||||
delete(it.message)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package dev.inmo.plaguposter.triggers.timer
|
||||
|
||||
import com.soywiz.klock.DateTime
|
||||
import com.soywiz.klock.minutes
|
||||
|
||||
fun nearestAvailableTimerTime() = (DateTime.now() + 1.minutes).copyDayOfMonth(
|
||||
milliseconds = 0,
|
||||
seconds = 0
|
||||
)
|
||||
1
triggers/timer/src/commonMain/kotlin/PackageInfo.kt
Normal file
1
triggers/timer/src/commonMain/kotlin/PackageInfo.kt
Normal file
@@ -0,0 +1 @@
|
||||
package dev.inmo.plaguposter.triggers.timer
|
||||
28
triggers/timer/src/commonMain/kotlin/TimerPanelButton.kt
Normal file
28
triggers/timer/src/commonMain/kotlin/TimerPanelButton.kt
Normal file
@@ -0,0 +1,28 @@
|
||||
package dev.inmo.plaguposter.triggers.timer
|
||||
|
||||
import dev.inmo.plaguposter.common.SuccessfulSymbol
|
||||
import dev.inmo.plaguposter.common.UnsuccessfulSymbol
|
||||
import dev.inmo.plaguposter.posts.models.RegisteredPost
|
||||
import dev.inmo.plaguposter.posts.panel.PanelButtonBuilder
|
||||
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
|
||||
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.InlineKeyboardButton
|
||||
|
||||
class TimerPanelButton(
|
||||
private val timersRepo: TimersRepo
|
||||
) : PanelButtonBuilder {
|
||||
override val weight: Int
|
||||
get() = 0
|
||||
|
||||
override suspend fun buildButton(post: RegisteredPost): InlineKeyboardButton? {
|
||||
val publishingTime = timersRepo.get(post.id)
|
||||
|
||||
return CallbackDataInlineKeyboardButton(
|
||||
"⏰ ${ if (publishingTime == null) UnsuccessfulSymbol else SuccessfulSymbol }",
|
||||
"$timerSetPrefix ${post.id}"
|
||||
)
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val timerSetPrefix = "timer_set_init"
|
||||
}
|
||||
}
|
||||
57
triggers/timer/src/commonMain/kotlin/TimersHandler.kt
Normal file
57
triggers/timer/src/commonMain/kotlin/TimersHandler.kt
Normal file
@@ -0,0 +1,57 @@
|
||||
package dev.inmo.plaguposter.triggers.timer
|
||||
|
||||
import com.soywiz.klock.DateTime
|
||||
import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
|
||||
import dev.inmo.micro_utils.coroutines.plus
|
||||
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 kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.flow.flowOf
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
|
||||
class TimersHandler(
|
||||
private val timersRepo: TimersRepo,
|
||||
private val publisher: PostPublisher,
|
||||
private val scope: CoroutineScope
|
||||
) {
|
||||
private var currentPostAndJob: Pair<PostId, Job>? = null
|
||||
private val currentJobMutex = Mutex()
|
||||
|
||||
init {
|
||||
(flowOf(Unit) + timersRepo.onNewValue + timersRepo.onValueRemoved).subscribeSafelyWithoutExceptions(scope) {
|
||||
refreshPublishingJob()
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun refreshPublishingJob() {
|
||||
val minimal = timersRepo.getMinimalDateTimePost()
|
||||
|
||||
currentJobMutex.withLock {
|
||||
if (minimal ?.first == currentPostAndJob ?.first) {
|
||||
return@withLock
|
||||
}
|
||||
|
||||
currentPostAndJob ?.second ?.cancel()
|
||||
|
||||
currentPostAndJob = minimal ?.let { (postId, dateTime) ->
|
||||
postId to scope.launchSafelyWithoutExceptions {
|
||||
val now = DateTime.now()
|
||||
val span = dateTime - now
|
||||
|
||||
delay(span.millisecondsLong)
|
||||
|
||||
publisher.publish(postId)
|
||||
|
||||
timersRepo.unset(postId)
|
||||
|
||||
refreshPublishingJob()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
9
triggers/timer/src/commonMain/kotlin/TimersRepo.kt
Normal file
9
triggers/timer/src/commonMain/kotlin/TimersRepo.kt
Normal file
@@ -0,0 +1,9 @@
|
||||
package dev.inmo.plaguposter.triggers.timer
|
||||
|
||||
import com.soywiz.klock.DateTime
|
||||
import dev.inmo.micro_utils.repos.KeyValueRepo
|
||||
import dev.inmo.plaguposter.posts.models.PostId
|
||||
|
||||
interface TimersRepo : KeyValueRepo<PostId, DateTime> {
|
||||
suspend fun getMinimalDateTimePost(): Pair<PostId, DateTime>?
|
||||
}
|
||||
80
triggers/timer/src/jvmMain/kotlin/Plugin.kt
Normal file
80
triggers/timer/src/jvmMain/kotlin/Plugin.kt
Normal file
@@ -0,0 +1,80 @@
|
||||
package dev.inmo.plaguposter.triggers.timer
|
||||
|
||||
import com.soywiz.klock.DateTime
|
||||
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||
import dev.inmo.micro_utils.koin.singleWithRandomQualifierAndBinds
|
||||
import dev.inmo.micro_utils.repos.set
|
||||
import dev.inmo.plagubot.Plugin
|
||||
import dev.inmo.plaguposter.common.ChatConfig
|
||||
import dev.inmo.plaguposter.posts.models.PostId
|
||||
import dev.inmo.plaguposter.posts.panel.PanelButtonsAPI
|
||||
import dev.inmo.plaguposter.posts.repo.ReadPostsRepo
|
||||
import dev.inmo.plaguposter.triggers.timer.repo.ExposedTimersRepo
|
||||
import dev.inmo.tgbotapi.extensions.api.answers.answer
|
||||
import dev.inmo.tgbotapi.extensions.api.edit.edit
|
||||
import dev.inmo.tgbotapi.extensions.api.send.reply
|
||||
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 kotlinx.coroutines.CoroutineScope
|
||||
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) {
|
||||
single { ExposedTimersRepo(get(), get(), get()) } binds arrayOf(TimersRepo::class)
|
||||
single(createdAtStart = true) { TimersHandler(get(), get(), get()) }
|
||||
singleWithRandomQualifierAndBinds { TimerPanelButton(get()) }
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||
val timersRepo = koin.get<TimersRepo>()
|
||||
val chatsConfig = koin.get<ChatConfig>()
|
||||
val panelApi = koin.get<PanelButtonsAPI>()
|
||||
val scope = koin.get<CoroutineScope>()
|
||||
with(ButtonsBuilder) {
|
||||
includeKeyboardHandling(timersRepo) { postId, dateTime ->
|
||||
timersRepo.set(postId, dateTime)
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
timersRepo.onNewValue.subscribeSafelyWithoutExceptions(scope) {
|
||||
panelApi.forceRefresh(it.first)
|
||||
}
|
||||
|
||||
timersRepo.onValueRemoved.subscribeSafelyWithoutExceptions(scope) {
|
||||
panelApi.forceRefresh(it)
|
||||
}
|
||||
|
||||
onMessageDataCallbackQuery(
|
||||
Regex("${TimerPanelButton.timerSetPrefix} [^\\s]+"),
|
||||
initialFilter = {
|
||||
chatsConfig.check(it.message.chat.id)
|
||||
}
|
||||
) {
|
||||
val (_, postIdRaw) = it.data.split(" ")
|
||||
val postId = PostId(postIdRaw)
|
||||
val now = nearestAvailableTimerTime()
|
||||
val exists = timersRepo.get(postId)
|
||||
val textSources = ButtonsBuilder.buildTimerTextSources(now, exists)
|
||||
val buttons = ButtonsBuilder.buildTimerButtons(
|
||||
postId,
|
||||
now.local,
|
||||
exists != null
|
||||
)
|
||||
reply(
|
||||
it.message,
|
||||
textSources,
|
||||
replyMarkup = buttons
|
||||
)
|
||||
|
||||
answer(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
62
triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt
Normal file
62
triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt
Normal file
@@ -0,0 +1,62 @@
|
||||
package dev.inmo.plaguposter.triggers.timer.repo
|
||||
|
||||
import com.soywiz.klock.DateTime
|
||||
import dev.inmo.micro_utils.common.firstNotNull
|
||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||
import dev.inmo.micro_utils.pagination.paginate
|
||||
import dev.inmo.micro_utils.repos.exposed.initTable
|
||||
import dev.inmo.micro_utils.repos.exposed.keyvalue.AbstractExposedKeyValueRepo
|
||||
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.triggers.timer.TimersRepo
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import org.jetbrains.exposed.sql.Column
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import org.jetbrains.exposed.sql.ISqlExpressionBuilder
|
||||
import org.jetbrains.exposed.sql.Op
|
||||
import org.jetbrains.exposed.sql.ResultRow
|
||||
import org.jetbrains.exposed.sql.select
|
||||
import org.jetbrains.exposed.sql.statements.InsertStatement
|
||||
import org.jetbrains.exposed.sql.statements.UpdateBuilder
|
||||
import org.jetbrains.exposed.sql.transactions.transaction
|
||||
|
||||
class ExposedTimersRepo(
|
||||
database: Database,
|
||||
postsRepo: PostsRepo,
|
||||
scope: CoroutineScope
|
||||
) : TimersRepo, AbstractExposedKeyValueRepo<PostId, DateTime>(
|
||||
database,
|
||||
"timers"
|
||||
) {
|
||||
override val keyColumn = text("post_id")
|
||||
private val dateTimeColumn = long("date_time")
|
||||
override val selectById: ISqlExpressionBuilder.(PostId) -> Op<Boolean> = { keyColumn.eq(it.string) }
|
||||
override val selectByValue: ISqlExpressionBuilder.(DateTime) -> Op<Boolean> = { dateTimeColumn.eq(it.unixMillisLong) }
|
||||
override val ResultRow.asKey: PostId
|
||||
get() = PostId(get(keyColumn))
|
||||
override val ResultRow.asObject: DateTime
|
||||
get() = DateTime(get(dateTimeColumn))
|
||||
|
||||
val postsRepoListeningJob = postsRepo.deletedObjectsIdsFlow.subscribeSafelyWithoutExceptions(scope) {
|
||||
unset(it)
|
||||
}
|
||||
|
||||
init {
|
||||
initTable()
|
||||
}
|
||||
|
||||
override fun update(k: PostId, v: DateTime, it: UpdateBuilder<Int>) {
|
||||
it[dateTimeColumn] = v.unixMillisLong
|
||||
}
|
||||
|
||||
override fun insertKey(k: PostId, v: DateTime, it: InsertStatement<Number>) {
|
||||
it[keyColumn] = k.string
|
||||
}
|
||||
|
||||
override suspend fun getMinimalDateTimePost(): Pair<PostId, DateTime>? = transaction(database) {
|
||||
selectAll().orderBy(dateTimeColumn).limit(1).firstOrNull() ?.let {
|
||||
PostId(it[keyColumn]) to DateTime(it[dateTimeColumn])
|
||||
}
|
||||
}
|
||||
}
|
||||
1
triggers/timer/src/main/AndroidManifest.xml
Normal file
1
triggers/timer/src/main/AndroidManifest.xml
Normal file
@@ -0,0 +1 @@
|
||||
<manifest package="dev.inmo.plaguposter.triggers.timer"/>
|
||||
Reference in New Issue
Block a user