mirror of
https://github.com/InsanusMokrassar/PlaguPoster.git
synced 2025-12-31 17:19:11 +00:00
Compare commits
91 Commits
0.0.7
...
several_so
| Author | SHA1 | Date | |
|---|---|---|---|
| 29a19df7fc | |||
| 250f88e2fe | |||
| bb433a6441 | |||
| 7a8166153f | |||
| 114add0391 | |||
| 58b1f26502 | |||
| ba3d054f0f | |||
| eef2bfce14 | |||
| fe96101631 | |||
| 7abb6efba3 | |||
| 2f0a823f7c | |||
| 730e3c50e9 | |||
| 0cc0510876 | |||
| 947bd7c2c4 | |||
| 7f54e86962 | |||
| db419165a7 | |||
| a5b0f429a0 | |||
| 9c161b6dab | |||
| f6067bb096 | |||
| 248740f246 | |||
| 3ae3cabd80 | |||
| 5fd4042fe3 | |||
| 6df4546b81 | |||
| 12635c654a | |||
| 15bd013eaa | |||
| 39b607c4e7 | |||
| 98f3e2a461 | |||
| 0d31d90efd | |||
| 0ce202a5f6 | |||
| 077f8c30a6 | |||
| 1e9559a2c9 | |||
| feef8efee1 | |||
| 54eb7515d3 | |||
| 1bb12bee0e | |||
| 467525e48d | |||
| 29e5a04135 | |||
| 6eb43055a7 | |||
| 57eebb61d5 | |||
| 87957dba30 | |||
| 20148c02f0 | |||
| e17cfa1c7c | |||
| 0a5ffee808 | |||
| 847b285ce3 | |||
| c449457d86 | |||
| 1b3a632d7b | |||
| ebfa79cf64 | |||
| e59c7b0f7e | |||
| 7a4fb05bfb | |||
| 7bc7bf6e8c | |||
| c64faf75d0 | |||
| ee80d8a3a1 | |||
| 22c94a4c43 | |||
| c6bcfc0068 | |||
| 8a648cb066 | |||
| 345a156334 | |||
| 7fb7f923f7 | |||
| 3b858a3c00 | |||
| f09e80b8bd | |||
| fea25743d5 | |||
| 86183f5f74 | |||
| bc8d0b26bd | |||
| b05844737b | |||
| d1b597d2c9 | |||
| aef864d5fd | |||
| f438ede791 | |||
| dc5833c407 | |||
| 2e7a1b83c5 | |||
| b603fa8822 | |||
| 8206131425 | |||
| 12d3d5eeea | |||
| 2c335b43ab | |||
| 2b84c224ec | |||
| 46adc04a9b | |||
| cffc6a62c2 | |||
| d6b684a17e | |||
| 5cd3a6fb35 | |||
| b453401c33 | |||
| 01b9d0b2ab | |||
| 5f65095698 | |||
| 2baaac8e6d | |||
| 8899fb299f | |||
| bc0324a34f | |||
| b9c78982b5 | |||
| c632a2ba14 | |||
| 9403b133f9 | |||
| 00803fa933 | |||
| 74f3503413 | |||
| 34e253a12e | |||
| 65dfe8abd0 | |||
| 8c42f2e879 | |||
| 2b41082a48 |
16
.github/workflows/build.yml
vendored
16
.github/workflows/build.yml
vendored
@@ -1,16 +0,0 @@
|
|||||||
name: Build
|
|
||||||
|
|
||||||
on: [push]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Set up JDK 11
|
|
||||||
uses: actions/setup-java@v1
|
|
||||||
with:
|
|
||||||
java-version: 11
|
|
||||||
- name: Build with Gradle
|
|
||||||
run: ./gradlew build
|
|
||||||
27
.github/workflows/build_and_publish.yml
vendored
Normal file
27
.github/workflows/build_and_publish.yml
vendored
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
name: Build
|
||||||
|
|
||||||
|
on: [push]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: Set up JDK 17
|
||||||
|
uses: actions/setup-java@v1
|
||||||
|
with:
|
||||||
|
java-version: 17
|
||||||
|
- name: Rewrite version
|
||||||
|
run: |
|
||||||
|
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
||||||
|
cat gradle.properties | sed -e "s/^version=\([0-9\.]*\)/version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
|
||||||
|
rm gradle.properties
|
||||||
|
mv gradle.properties.tmp gradle.properties
|
||||||
|
- name: Build
|
||||||
|
run: ./gradlew build
|
||||||
|
- name: Publish
|
||||||
|
continue-on-error: true
|
||||||
|
run: ./gradlew publishAllPublicationsToGiteaRepository
|
||||||
|
env:
|
||||||
|
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||||
31
.github/workflows/docker-publish.yml
vendored
Normal file
31
.github/workflows/docker-publish.yml
vendored
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
name: Docker
|
||||||
|
|
||||||
|
on: [push]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
publishing:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
- uses: actions/setup-java@v1
|
||||||
|
with:
|
||||||
|
java-version: 17
|
||||||
|
- name: Rewrite version
|
||||||
|
run: |
|
||||||
|
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
||||||
|
if [[ "$branch" != "master" ]]; then
|
||||||
|
cat gradle.properties | sed -e "s/^version=\([0-9\.]*\)/version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
|
||||||
|
rm gradle.properties
|
||||||
|
mv gradle.properties.tmp gradle.properties
|
||||||
|
fi
|
||||||
|
- name: Log into registry
|
||||||
|
uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKER_LOGIN }}
|
||||||
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
- name: Deploy
|
||||||
|
run: ./gradlew build && cd ./runner && ./nonsudo_deploy.sh
|
||||||
78
CHANGELOG.md
Normal file
78
CHANGELOG.md
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
# PlaguPoster
|
||||||
|
|
||||||
|
## 0.5.3
|
||||||
|
|
||||||
|
* Dependencies update
|
||||||
|
|
||||||
|
## 0.5.2
|
||||||
|
|
||||||
|
* Dependencies update
|
||||||
|
|
||||||
|
## 0.5.1
|
||||||
|
|
||||||
|
* Add opportunity to set unique
|
||||||
|
|
||||||
|
## 0.5.0
|
||||||
|
|
||||||
|
* Dependencies update
|
||||||
|
* Since this update bots will require **`JDK` 17+**
|
||||||
|
|
||||||
|
## 0.3.0
|
||||||
|
|
||||||
|
* `Versions`:
|
||||||
|
* `tgbotapi`: `9.1.0`
|
||||||
|
* `plagubot`: `7.1.0`
|
||||||
|
* `plagubot-plugins`: `0.14.0`
|
||||||
|
|
||||||
|
## 0.2.3
|
||||||
|
|
||||||
|
* Add opportunity to use several target chat ids
|
||||||
|
* Update dependencies
|
||||||
|
|
||||||
|
## 0.2.2
|
||||||
|
|
||||||
|
* `GarbageCollector`:
|
||||||
|
* Now on start will all clearing job done
|
||||||
|
|
||||||
|
## 0.2.1
|
||||||
|
|
||||||
|
* `Versions`:
|
||||||
|
* `kotlin`: `1.8.21`
|
||||||
|
* `tgbotapi`: `7.1.2`
|
||||||
|
* `plagubot`: `5.1.2`
|
||||||
|
* `microutils`: `0.18.1`
|
||||||
|
* `kslog`: `1.1.1`
|
||||||
|
* `plagubot.plugins`: `0.11.2`
|
||||||
|
* `psql`: `42.6.0`
|
||||||
|
|
||||||
|
## 0.2.0
|
||||||
|
|
||||||
|
* `Versions`:
|
||||||
|
* `tgbotapi`: `7.1.0`
|
||||||
|
* `plagubot`: `5.1.0`
|
||||||
|
* `krontab`: `1.0.0`
|
||||||
|
* `plagubot.plugins`: `0.11.0`
|
||||||
|
|
||||||
|
## 0.1.2
|
||||||
|
|
||||||
|
* `Versions`:
|
||||||
|
* `kotlin`: `1.8.20`
|
||||||
|
* `plagubot`: `5.0.2`
|
||||||
|
* `microutils`: `0.17.8`
|
||||||
|
* `kslog`: `1.1.1`
|
||||||
|
* `plagubot.plugins`: `0.10.2`
|
||||||
|
* `psql`: `42.6.0`
|
||||||
|
|
||||||
|
## 0.1.1
|
||||||
|
|
||||||
|
* Update dependencies
|
||||||
|
* `Triggers`
|
||||||
|
* `SelectorWithTimer`
|
||||||
|
* Opportunity to get schedule of posts using `publishing_autoschedule` command
|
||||||
|
|
||||||
|
## 0.0.10
|
||||||
|
|
||||||
|
## 0.0.9
|
||||||
|
|
||||||
|
* Update dependencies
|
||||||
|
|
||||||
@@ -18,9 +18,9 @@ allprojects {
|
|||||||
mavenLocal()
|
mavenLocal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
google()
|
google()
|
||||||
maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
|
maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "./extensions.gradle"
|
apply from: "./extensions.gradle"
|
||||||
// apply from: "./github_release.gradle"
|
apply from: "./github_release.gradle"
|
||||||
|
|||||||
24
changelog_parser.sh
Normal file
24
changelog_parser.sh
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
function parse() {
|
||||||
|
version="$1"
|
||||||
|
|
||||||
|
while IFS= read -r line && [ -z "`echo "$line" | grep -e "^#\+ $version"`" ]
|
||||||
|
do
|
||||||
|
: # do nothing
|
||||||
|
done
|
||||||
|
|
||||||
|
while IFS= read -r line && [ -z "`echo "$line" | grep -e "^#\+"`" ]
|
||||||
|
do
|
||||||
|
echo "$line"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
version="$1"
|
||||||
|
file="$2"
|
||||||
|
|
||||||
|
if [ -n "$file" ]; then
|
||||||
|
parse "$version" < "$file"
|
||||||
|
else
|
||||||
|
parse "$version"
|
||||||
|
fi
|
||||||
@@ -11,7 +11,9 @@ kotlin {
|
|||||||
dependencies {
|
dependencies {
|
||||||
api libs.tgbotapi
|
api libs.tgbotapi
|
||||||
api libs.microutils.repos.common
|
api libs.microutils.repos.common
|
||||||
|
api libs.microutils.repos.cache
|
||||||
api libs.kslog
|
api libs.kslog
|
||||||
|
api libs.microutils.koin
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
jvmMain {
|
jvmMain {
|
||||||
|
|||||||
@@ -1,15 +1,43 @@
|
|||||||
package dev.inmo.plaguposter.common
|
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.SerialName
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
data class ChatConfig(
|
data class ChatConfig(
|
||||||
@SerialName("targetChat")
|
@SerialName("targetChat")
|
||||||
val targetChatId: ChatId,
|
@Serializable(FullChatIdentifierSerializer::class)
|
||||||
|
val targetChatId: IdChatIdentifier? = null,
|
||||||
@SerialName("sourceChat")
|
@SerialName("sourceChat")
|
||||||
val sourceChatId: ChatId,
|
@Serializable(FullChatIdentifierSerializer::class)
|
||||||
|
val sourceChatId: IdChatIdentifier?,
|
||||||
@SerialName("cacheChat")
|
@SerialName("cacheChat")
|
||||||
val cacheChatId: ChatId
|
@Serializable(FullChatIdentifierSerializer::class)
|
||||||
)
|
val cacheChatId: IdChatIdentifier,
|
||||||
|
@SerialName("targetChats")
|
||||||
|
val targetChatIds: List<@Serializable(FullChatIdentifierSerializer::class) IdChatIdentifier> = emptyList(),
|
||||||
|
@SerialName("sourceChats")
|
||||||
|
val sourceChatIds: List<@Serializable(FullChatIdentifierSerializer::class) IdChatIdentifier> = emptyList(),
|
||||||
|
) {
|
||||||
|
val allTargetChatIds by lazy {
|
||||||
|
(listOfNotNull(targetChatId) + targetChatIds).toSet()
|
||||||
|
}
|
||||||
|
val allSourceChatIds by lazy {
|
||||||
|
(listOfNotNull(sourceChatId) + sourceChatIds).toSet()
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
require(targetChatId != null || targetChatIds.isNotEmpty()) {
|
||||||
|
"One of fields, 'targetChat' or 'targetChats' should be presented"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun check(chatId: IdChatIdentifier) = when (chatId) {
|
||||||
|
in allTargetChatIds,
|
||||||
|
in allSourceChatIds,
|
||||||
|
cacheChatId -> true
|
||||||
|
else -> false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,13 +2,14 @@ package dev.inmo.plaguposter.common
|
|||||||
|
|
||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilterExcludeMediaGroups
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilterExcludeMediaGroups
|
||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
|
||||||
|
import dev.inmo.tgbotapi.extensions.utils.contentMessageOrNull
|
||||||
import dev.inmo.tgbotapi.extensions.utils.textContentOrNull
|
import dev.inmo.tgbotapi.extensions.utils.textContentOrNull
|
||||||
|
import dev.inmo.tgbotapi.extensions.utils.withContentOrNull
|
||||||
import dev.inmo.tgbotapi.types.BotCommand
|
import dev.inmo.tgbotapi.types.BotCommand
|
||||||
import dev.inmo.tgbotapi.types.message.abstracts.*
|
import dev.inmo.tgbotapi.types.message.abstracts.*
|
||||||
|
import dev.inmo.tgbotapi.types.message.content.TextContent
|
||||||
import dev.inmo.tgbotapi.types.message.textsources.BotCommandTextSource
|
import dev.inmo.tgbotapi.types.message.textsources.BotCommandTextSource
|
||||||
|
|
||||||
val FirstSourceIsCommandsFilter = SimpleFilter<Message> {
|
val FirstSourceIsCommandsFilter = SimpleFilter<Message> {
|
||||||
it is ContentMessage<*> && it.content.textContentOrNull() ?.textSources ?.firstOrNull {
|
it.contentMessageOrNull() ?.withContentOrNull<TextContent>() ?.content ?.textSources ?.firstOrNull() is BotCommandTextSource
|
||||||
it is BotCommandTextSource
|
|
||||||
} != null
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package dev.inmo.plaguposter.common
|
package dev.inmo.plaguposter.common
|
||||||
|
|
||||||
import com.soywiz.klock.DateTime
|
import korlibs.time.DateTime
|
||||||
import kotlinx.serialization.KSerializer
|
import kotlinx.serialization.KSerializer
|
||||||
import kotlinx.serialization.Serializer
|
import kotlinx.serialization.Serializer
|
||||||
import kotlinx.serialization.builtins.serializer
|
import kotlinx.serialization.builtins.serializer
|
||||||
@@ -8,7 +8,6 @@ import kotlinx.serialization.descriptors.SerialDescriptor
|
|||||||
import kotlinx.serialization.encoding.Decoder
|
import kotlinx.serialization.encoding.Decoder
|
||||||
import kotlinx.serialization.encoding.Encoder
|
import kotlinx.serialization.encoding.Encoder
|
||||||
|
|
||||||
@Serializer(DateTime::class)
|
|
||||||
object DateTimeSerializer : KSerializer<DateTime> {
|
object DateTimeSerializer : KSerializer<DateTime> {
|
||||||
override val descriptor: SerialDescriptor = Double.serializer().descriptor
|
override val descriptor: SerialDescriptor = Double.serializer().descriptor
|
||||||
override fun deserialize(decoder: Decoder): DateTime = DateTime(decoder.decodeDouble())
|
override fun deserialize(decoder: Decoder): DateTime = DateTime(decoder.decodeDouble())
|
||||||
|
|||||||
16
common/src/commonMain/kotlin/UseCache.kt
Normal file
16
common/src/commonMain/kotlin/UseCache.kt
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
package dev.inmo.plaguposter.common
|
||||||
|
|
||||||
|
import org.koin.core.Koin
|
||||||
|
import org.koin.core.module.Module
|
||||||
|
import org.koin.core.qualifier.named
|
||||||
|
import org.koin.core.scope.Scope
|
||||||
|
|
||||||
|
val Scope.useCache: Boolean
|
||||||
|
get() = getOrNull(named("useCache")) ?: false
|
||||||
|
|
||||||
|
val Koin.useCache: Boolean
|
||||||
|
get() = getOrNull(named("useCache")) ?: false
|
||||||
|
|
||||||
|
fun Module.useCache(useCache: Boolean) {
|
||||||
|
single(named("useCache")) { useCache }
|
||||||
|
}
|
||||||
@@ -1,20 +1,33 @@
|
|||||||
package dev.inmo.plaguposter.common
|
package dev.inmo.plaguposter.common
|
||||||
|
|
||||||
import dev.inmo.kslog.common.i
|
|
||||||
import dev.inmo.kslog.common.iS
|
import dev.inmo.kslog.common.iS
|
||||||
import dev.inmo.kslog.common.logger
|
import dev.inmo.kslog.common.logger
|
||||||
import dev.inmo.plagubot.Plugin
|
import dev.inmo.plagubot.Plugin
|
||||||
import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
|
import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
|
||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
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 kotlinx.serialization.json.JsonPrimitive
|
||||||
|
import kotlinx.serialization.json.booleanOrNull
|
||||||
|
import org.jetbrains.exposed.sql.Database
|
||||||
import org.koin.core.Koin
|
import org.koin.core.Koin
|
||||||
|
import org.koin.core.module.Module
|
||||||
|
|
||||||
object CommonPlugin : Plugin {
|
object CommonPlugin : Plugin {
|
||||||
private val Log = logger
|
private val Log = logger
|
||||||
|
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||||
|
single { CoroutineScope(Dispatchers.Default + SupervisorJob()) }
|
||||||
|
val useCache = (params["useCache"] as? JsonPrimitive) ?.booleanOrNull ?: true
|
||||||
|
useCache(useCache)
|
||||||
|
}
|
||||||
|
|
||||||
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||||
val config = koin.get<ChatConfig>()
|
val config = koin.get<ChatConfig>()
|
||||||
|
|
||||||
Log.iS { "Target chat info: ${getChat(config.targetChatId)}" }
|
Log.iS { "Target chats info: ${config.allTargetChatIds.map { getChat(it) }.joinToString()}" }
|
||||||
Log.iS { "Source chat info: ${getChat(config.sourceChatId)}" }
|
Log.iS { "Source chats info: ${config.allSourceChatIds.map { getChat(it) }.joinToString()}" }
|
||||||
Log.iS { "Cache chat info: ${getChat(config.cacheChatId)}" }
|
Log.iS { "Cache chat info: ${getChat(config.cacheChatId)}" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,6 @@ allprojects {
|
|||||||
|
|
||||||
defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
|
defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
|
||||||
|
|
||||||
// publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
|
publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
31
github_release.gradle
Normal file
31
github_release.gradle
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
private String getCurrentVersionChangelog() {
|
||||||
|
OutputStream changelogDataOS = new ByteArrayOutputStream()
|
||||||
|
exec {
|
||||||
|
commandLine 'chmod', "+x", './changelog_parser.sh'
|
||||||
|
}
|
||||||
|
exec {
|
||||||
|
standardOutput = changelogDataOS
|
||||||
|
commandLine './changelog_parser.sh', "${project.version}", 'CHANGELOG.md'
|
||||||
|
}
|
||||||
|
|
||||||
|
return changelogDataOS.toString().trim()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (new File(projectDir, "secret.gradle").exists()) {
|
||||||
|
apply from: './secret.gradle'
|
||||||
|
apply plugin: "com.github.breadmoirai.github-release"
|
||||||
|
|
||||||
|
githubRelease {
|
||||||
|
token "${project.property('GITHUB_RELEASE_TOKEN')}"
|
||||||
|
|
||||||
|
owner "InsanusMokrassar"
|
||||||
|
repo "PlaguPoster"
|
||||||
|
|
||||||
|
tagName "v${project.version}"
|
||||||
|
releaseName "${project.version}"
|
||||||
|
targetCommitish "${project.version}"
|
||||||
|
|
||||||
|
body getCurrentVersionChangelog()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -10,5 +10,4 @@ android.enableJetifier=true
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.0.7
|
version=0.5.3
|
||||||
android_code_version=7
|
|
||||||
|
|||||||
@@ -1,19 +1,18 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
kotlin = "1.7.22"
|
kotlin = "1.9.22"
|
||||||
kotlin-serialization = "1.4.1"
|
kotlin-serialization = "1.6.2"
|
||||||
|
|
||||||
plagubot = "3.2.0"
|
plagubot = "8.1.1"
|
||||||
tgbotapi = "4.2.1"
|
tgbotapi = "10.0.1"
|
||||||
microutils = "0.16.0"
|
microutils = "0.20.34"
|
||||||
kslog = "0.5.4"
|
kslog = "1.3.2"
|
||||||
krontab = "0.8.4"
|
krontab = "2.2.7"
|
||||||
tgbotapi-libraries = "0.6.5"
|
plagubot-plugins = "0.18.1"
|
||||||
plagubot-plugins = "0.6.4"
|
|
||||||
|
|
||||||
dokka = "1.7.20"
|
dokka = "1.9.10"
|
||||||
|
|
||||||
psql = "42.5.0"
|
psql = "42.6.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
project.version = "$version"
|
project.version = "$version"
|
||||||
project.group = "$group"
|
project.group = "$group"
|
||||||
|
|
||||||
// apply from: "$publishGradlePath"
|
apply from: "$publishGradlePath"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm {
|
jvm {
|
||||||
compilations.main {
|
compilations.main {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "1.8"
|
jvmTarget = "17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -34,6 +34,6 @@ kotlin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
project.version = "$version"
|
project.version = "$version"
|
||||||
project.group = "$group"
|
project.group = "$group"
|
||||||
|
|
||||||
// apply from: "$publishGradlePath"
|
apply from: "$publishGradlePath"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
js (IR) {
|
js (IR) {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
project.version = "$version"
|
project.version = "$version"
|
||||||
project.group = "$group"
|
project.group = "$group"
|
||||||
|
|
||||||
// apply from: "$publishGradlePath"
|
apply from: "$publishGradlePath"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm()
|
jvm()
|
||||||
|
|||||||
24
posts/gc/build.gradle
Normal file
24
posts/gc/build.gradle
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
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 libs.microutils.koin
|
||||||
|
api libs.krontab
|
||||||
|
}
|
||||||
|
}
|
||||||
|
jvmMain {
|
||||||
|
dependencies {
|
||||||
|
api libs.plagubot.plugins.inline.queries
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1
posts/gc/src/commonMain/kotlin/PackageInfo.kt
Normal file
1
posts/gc/src/commonMain/kotlin/PackageInfo.kt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
package dev.inmo.plaguposter.posts.gc
|
||||||
194
posts/gc/src/jvmMain/kotlin/Plugin.kt
Normal file
194
posts/gc/src/jvmMain/kotlin/Plugin.kt
Normal file
@@ -0,0 +1,194 @@
|
|||||||
|
package dev.inmo.plaguposter.posts.gc
|
||||||
|
|
||||||
|
import com.benasher44.uuid.uuid4
|
||||||
|
import dev.inmo.krontab.KrontabTemplate
|
||||||
|
import dev.inmo.krontab.toKronScheduler
|
||||||
|
import dev.inmo.krontab.utils.asFlowWithDelays
|
||||||
|
import dev.inmo.kslog.common.KSLog
|
||||||
|
import dev.inmo.kslog.common.i
|
||||||
|
import dev.inmo.kslog.common.iS
|
||||||
|
import dev.inmo.micro_utils.coroutines.actor
|
||||||
|
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||||
|
import dev.inmo.micro_utils.repos.deleteById
|
||||||
|
import dev.inmo.plagubot.Plugin
|
||||||
|
import dev.inmo.plagubot.plugins.inline.queries.models.Format
|
||||||
|
import dev.inmo.plagubot.plugins.inline.queries.models.OfferTemplate
|
||||||
|
import dev.inmo.plagubot.plugins.inline.queries.repos.InlineTemplatesRepo
|
||||||
|
import dev.inmo.plaguposter.common.ChatConfig
|
||||||
|
import dev.inmo.plaguposter.posts.models.NewPost
|
||||||
|
import dev.inmo.plaguposter.posts.models.PostContentInfo
|
||||||
|
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
||||||
|
import dev.inmo.tgbotapi.extensions.api.delete
|
||||||
|
import dev.inmo.tgbotapi.extensions.api.edit.edit
|
||||||
|
import dev.inmo.tgbotapi.extensions.api.forwardMessage
|
||||||
|
import dev.inmo.tgbotapi.extensions.api.send.send
|
||||||
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||||
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitInlineMessageIdDataCallbackQuery
|
||||||
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitMessageDataCallbackQuery
|
||||||
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.oneOf
|
||||||
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.parallel
|
||||||
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
|
||||||
|
import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
|
||||||
|
import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
|
||||||
|
import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard
|
||||||
|
import dev.inmo.tgbotapi.types.MilliSeconds
|
||||||
|
import dev.inmo.tgbotapi.utils.bold
|
||||||
|
import kotlinx.coroutines.*
|
||||||
|
import kotlinx.coroutines.flow.filter
|
||||||
|
import kotlinx.coroutines.flow.first
|
||||||
|
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 krontab: KrontabTemplate? = null,
|
||||||
|
val throttlingMillis: MilliSeconds = 1000,
|
||||||
|
val doFullCheck: Boolean = false
|
||||||
|
)
|
||||||
|
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||||
|
params["messagesChecker"] ?.let { element ->
|
||||||
|
single { get<Json>().decodeFromJsonElement(Config.serializer(), element) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private val gcLogger = KSLog("GarbageCollector")
|
||||||
|
private suspend fun BehaviourContext.doRecheck(
|
||||||
|
throttlingMillis: MilliSeconds,
|
||||||
|
doFullCheck: Boolean,
|
||||||
|
postsRepo: PostsRepo,
|
||||||
|
chatsConfig: ChatConfig
|
||||||
|
) {
|
||||||
|
val posts = postsRepo.getAll()
|
||||||
|
gcLogger.i {
|
||||||
|
"Start garbage collecting of posts. Initial posts count: ${posts.size}"
|
||||||
|
}
|
||||||
|
posts.forEach { (postId, post) ->
|
||||||
|
val surelyAbsentMessages = mutableListOf<PostContentInfo>()
|
||||||
|
for (content in post.content) {
|
||||||
|
try {
|
||||||
|
forwardMessage(
|
||||||
|
toChatId = chatsConfig.cacheChatId,
|
||||||
|
fromChatId = content.chatId,
|
||||||
|
messageId = content.messageId
|
||||||
|
)
|
||||||
|
|
||||||
|
if (!doFullCheck) {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
} catch (e: Throwable) {
|
||||||
|
if (e.message ?.contains("message to forward not found") == true) {
|
||||||
|
surelyAbsentMessages.add(content)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
delay(throttlingMillis)
|
||||||
|
}
|
||||||
|
val existsPostMessages = post.content.filter {
|
||||||
|
it !in surelyAbsentMessages
|
||||||
|
}
|
||||||
|
if (existsPostMessages.isNotEmpty() && surelyAbsentMessages.isNotEmpty()) {
|
||||||
|
runCatching {
|
||||||
|
postsRepo.update(
|
||||||
|
postId,
|
||||||
|
NewPost(
|
||||||
|
content = existsPostMessages
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (existsPostMessages.isNotEmpty()) {
|
||||||
|
return@forEach
|
||||||
|
}
|
||||||
|
|
||||||
|
runCatching {
|
||||||
|
send(
|
||||||
|
chatsConfig.cacheChatId,
|
||||||
|
"Can't find any messages for post $postId. So, deleting it"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
runCatching {
|
||||||
|
postsRepo.deleteById(postId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
gcLogger.iS {
|
||||||
|
"Complete garbage collecting of posts. Result posts count: ${postsRepo.count()}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||||
|
val postsRepo = koin.get<PostsRepo>()
|
||||||
|
val chatsConfig = koin.get<ChatConfig>()
|
||||||
|
val config = koin.getOrNull<Config>() ?: Config()
|
||||||
|
|
||||||
|
val scope = koin.get<CoroutineScope>()
|
||||||
|
|
||||||
|
val recheckActor = scope.actor<Unit>(0) {
|
||||||
|
runCatching {
|
||||||
|
doRecheck(
|
||||||
|
config.throttlingMillis,
|
||||||
|
config.doFullCheck,
|
||||||
|
postsRepo,
|
||||||
|
chatsConfig
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
config.krontab ?.toKronScheduler() ?.asFlowWithDelays() ?.subscribeSafelyWithoutExceptions(koin.get()) {
|
||||||
|
recheckActor.trySend(Unit)
|
||||||
|
}
|
||||||
|
|
||||||
|
onCommand("force_garbage_collection") { message ->
|
||||||
|
launch {
|
||||||
|
val prefix = uuid4().toString()
|
||||||
|
val yesData = "${prefix}yes"
|
||||||
|
val noData = "${prefix}no"
|
||||||
|
edit(
|
||||||
|
message,
|
||||||
|
text = "Are you sure want to trigger posts garbage collecting?",
|
||||||
|
replyMarkup = flatInlineKeyboard {
|
||||||
|
dataButton("Sure", yesData)
|
||||||
|
dataButton("No", noData)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
val answer = oneOf(
|
||||||
|
parallel {
|
||||||
|
waitMessageDataCallbackQuery().filter {
|
||||||
|
it.message.sameMessage(message)
|
||||||
|
}.first()
|
||||||
|
},
|
||||||
|
parallel {
|
||||||
|
waitInlineMessageIdDataCallbackQuery().filter {
|
||||||
|
it.data == yesData || it.data == noData
|
||||||
|
}.first()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
if (answer.data == yesData) {
|
||||||
|
if (recheckActor.trySend(Unit).isSuccess) {
|
||||||
|
edit(message, "Checking of posts without exists messages triggered")
|
||||||
|
} else {
|
||||||
|
edit(message) {
|
||||||
|
+"Checking of posts without exists messages has been triggered " + bold("earlier")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
delete(message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
koin.getOrNull<InlineTemplatesRepo>() ?.addTemplate(
|
||||||
|
OfferTemplate(
|
||||||
|
"Force posts check",
|
||||||
|
listOf(
|
||||||
|
Format("/force_garbage_collection")
|
||||||
|
),
|
||||||
|
"Force check posts without exists messages"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,14 +4,15 @@ import com.benasher44.uuid.uuid4
|
|||||||
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
||||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||||
import dev.inmo.micro_utils.koin.getAllDistinct
|
import dev.inmo.micro_utils.koin.getAllDistinct
|
||||||
import dev.inmo.micro_utils.repos.deleteById
|
import dev.inmo.micro_utils.repos.*
|
||||||
import dev.inmo.micro_utils.repos.id
|
import dev.inmo.micro_utils.repos.cache.cache.FullKVCache
|
||||||
import dev.inmo.micro_utils.repos.set
|
import dev.inmo.micro_utils.repos.cache.cached
|
||||||
import dev.inmo.micro_utils.repos.unset
|
import dev.inmo.micro_utils.repos.cache.full.cached
|
||||||
import dev.inmo.micro_utils.repos.value
|
import dev.inmo.micro_utils.repos.cache.full.fullyCached
|
||||||
import dev.inmo.plagubot.Plugin
|
import dev.inmo.plagubot.Plugin
|
||||||
import dev.inmo.plaguposter.common.ChatConfig
|
import dev.inmo.plaguposter.common.ChatConfig
|
||||||
import dev.inmo.plaguposter.common.UnsuccessfulSymbol
|
import dev.inmo.plaguposter.common.UnsuccessfulSymbol
|
||||||
|
import dev.inmo.plaguposter.common.useCache
|
||||||
import dev.inmo.plaguposter.posts.models.PostId
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
import dev.inmo.plaguposter.posts.panel.repos.PostsMessages
|
import dev.inmo.plaguposter.posts.panel.repos.PostsMessages
|
||||||
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
||||||
@@ -30,6 +31,7 @@ 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.flatInlineKeyboard
|
||||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||||
import dev.inmo.tgbotapi.types.MessageIdentifier
|
import dev.inmo.tgbotapi.types.MessageIdentifier
|
||||||
|
import dev.inmo.tgbotapi.types.ReplyParameters
|
||||||
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
|
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
|
||||||
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
|
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
|
||||||
import dev.inmo.tgbotapi.types.message.ParseMode
|
import dev.inmo.tgbotapi.types.message.ParseMode
|
||||||
@@ -93,7 +95,12 @@ object Plugin : Plugin {
|
|||||||
val chatsConfig = koin.get<ChatConfig>()
|
val chatsConfig = koin.get<ChatConfig>()
|
||||||
val config = koin.getOrNull<Config>() ?: Config()
|
val config = koin.getOrNull<Config>() ?: Config()
|
||||||
val api = koin.get<PanelButtonsAPI>()
|
val api = koin.get<PanelButtonsAPI>()
|
||||||
val postsMessages = PostsMessages(koin.get(), koin.get())
|
val basePostsMessages = PostsMessages(koin.get(), koin.get())
|
||||||
|
val postsMessages = if (koin.useCache) {
|
||||||
|
basePostsMessages.fullyCached(MapKeyValueRepo(), koin.get())
|
||||||
|
} else {
|
||||||
|
basePostsMessages
|
||||||
|
}
|
||||||
|
|
||||||
postsRepo.newObjectsFlow.subscribeSafelyWithoutExceptions(this) {
|
postsRepo.newObjectsFlow.subscribeSafelyWithoutExceptions(this) {
|
||||||
val firstContent = it.content.first()
|
val firstContent = it.content.first()
|
||||||
@@ -106,7 +113,7 @@ object Plugin : Plugin {
|
|||||||
firstContent.chatId,
|
firstContent.chatId,
|
||||||
text = config.text,
|
text = config.text,
|
||||||
parseMode = config.parseMode,
|
parseMode = config.parseMode,
|
||||||
replyToMessageId = firstContent.messageId,
|
replyParameters = ReplyParameters(firstContent.chatId, firstContent.messageId),
|
||||||
replyMarkup = InlineKeyboardMarkup(buttons),
|
replyMarkup = InlineKeyboardMarkup(buttons),
|
||||||
disableNotification = true
|
disableNotification = true
|
||||||
).also { sentMessage ->
|
).also { sentMessage ->
|
||||||
@@ -140,7 +147,7 @@ object Plugin : Plugin {
|
|||||||
|
|
||||||
onMessageDataCallbackQuery (
|
onMessageDataCallbackQuery (
|
||||||
initialFilter = {
|
initialFilter = {
|
||||||
it.data.startsWith(PanelButtonsAPI.openGlobalMenuDataPrefix) && it.message.chat.id == chatsConfig.sourceChatId
|
it.data.startsWith(PanelButtonsAPI.openGlobalMenuDataPrefix) && it.message.chat.id in chatsConfig.allSourceChatIds
|
||||||
}
|
}
|
||||||
) {
|
) {
|
||||||
val postId = it.data.removePrefix(PanelButtonsAPI.openGlobalMenuDataPrefix).let(::PostId)
|
val postId = it.data.removePrefix(PanelButtonsAPI.openGlobalMenuDataPrefix).let(::PostId)
|
||||||
@@ -149,7 +156,7 @@ object Plugin : Plugin {
|
|||||||
}
|
}
|
||||||
onMessageDataCallbackQuery(
|
onMessageDataCallbackQuery(
|
||||||
initialFilter = {
|
initialFilter = {
|
||||||
it.data.startsWith("delete ") && it.message.chat.id == chatsConfig.sourceChatId
|
it.data.startsWith("delete ") && it.message.chat.id in chatsConfig.allSourceChatIds
|
||||||
}
|
}
|
||||||
) { query ->
|
) { query ->
|
||||||
val postId = query.data.removePrefix("delete ").let(::PostId)
|
val postId = query.data.removePrefix("delete ").let(::PostId)
|
||||||
@@ -176,7 +183,7 @@ object Plugin : Plugin {
|
|||||||
}
|
}
|
||||||
onMessageDataCallbackQuery(
|
onMessageDataCallbackQuery(
|
||||||
initialFilter = {
|
initialFilter = {
|
||||||
it.data.startsWith("refresh ") && it.message.chat.id == chatsConfig.sourceChatId
|
it.data.startsWith("refresh ") && it.message.chat.id in chatsConfig.allSourceChatIds
|
||||||
}
|
}
|
||||||
) { query ->
|
) { query ->
|
||||||
val postId = query.data.removePrefix("refresh ").let(::PostId)
|
val postId = query.data.removePrefix("refresh ").let(::PostId)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package dev.inmo.plaguposter.posts.models
|
package dev.inmo.plaguposter.posts.models
|
||||||
|
|
||||||
import com.soywiz.klock.DateTime
|
import korlibs.time.DateTime
|
||||||
import dev.inmo.plaguposter.common.DateTimeSerializer
|
import dev.inmo.plaguposter.common.DateTimeSerializer
|
||||||
import dev.inmo.tgbotapi.types.ChatId
|
import dev.inmo.tgbotapi.types.ChatId
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|||||||
@@ -7,4 +7,6 @@ import kotlin.jvm.JvmInline
|
|||||||
@JvmInline
|
@JvmInline
|
||||||
value class PostId(
|
value class PostId(
|
||||||
val string: String
|
val string: String
|
||||||
)
|
) {
|
||||||
|
override fun toString(): String = string
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package dev.inmo.plaguposter.posts.repo
|
package dev.inmo.plaguposter.posts.repo
|
||||||
|
|
||||||
import com.soywiz.klock.DateTime
|
import korlibs.time.DateTime
|
||||||
import dev.inmo.micro_utils.repos.ReadCRUDRepo
|
import dev.inmo.micro_utils.repos.ReadCRUDRepo
|
||||||
import dev.inmo.plaguposter.posts.models.*
|
import dev.inmo.plaguposter.posts.models.*
|
||||||
import dev.inmo.tgbotapi.types.ChatId
|
import dev.inmo.tgbotapi.types.ChatId
|
||||||
|
|||||||
@@ -11,20 +11,19 @@ import dev.inmo.tgbotapi.extensions.api.send.copyMessage
|
|||||||
import dev.inmo.tgbotapi.extensions.api.send.send
|
import dev.inmo.tgbotapi.extensions.api.send.send
|
||||||
import dev.inmo.tgbotapi.extensions.utils.*
|
import dev.inmo.tgbotapi.extensions.utils.*
|
||||||
import dev.inmo.tgbotapi.types.*
|
import dev.inmo.tgbotapi.types.*
|
||||||
import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
|
|
||||||
import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
|
import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
|
||||||
|
|
||||||
class PostPublisher(
|
class PostPublisher(
|
||||||
private val bot: TelegramBot,
|
private val bot: TelegramBot,
|
||||||
private val postsRepo: PostsRepo,
|
private val postsRepo: PostsRepo,
|
||||||
private val cachingChatId: ChatId,
|
private val cachingChatId: IdChatIdentifier,
|
||||||
private val targetChatId: ChatId,
|
private val targetChatIds: List<IdChatIdentifier>,
|
||||||
private val deleteAfterPosting: Boolean = true
|
private val deleteAfterPosting: Boolean = true
|
||||||
) {
|
) {
|
||||||
suspend fun publish(postId: PostId) {
|
suspend fun publish(postId: PostId): Boolean {
|
||||||
val messagesInfo = postsRepo.getById(postId) ?: let {
|
val messagesInfo = postsRepo.getById(postId) ?: let {
|
||||||
logger.w { "Unable to get post with id $postId for publishing" }
|
logger.w { "Unable to get post with id $postId for publishing" }
|
||||||
return
|
return false
|
||||||
}
|
}
|
||||||
val sortedMessagesContents = messagesInfo.content.groupBy { it.group }.flatMap { (group, list) ->
|
val sortedMessagesContents = messagesInfo.content.groupBy { it.group }.flatMap { (group, list) ->
|
||||||
if (group == null) {
|
if (group == null) {
|
||||||
@@ -35,20 +34,26 @@ class PostPublisher(
|
|||||||
listOf(list.first().order to list)
|
listOf(list.first().order to list)
|
||||||
}
|
}
|
||||||
}.sortedBy { it.first }
|
}.sortedBy { it.first }
|
||||||
|
var haveSentMessages = false
|
||||||
|
|
||||||
sortedMessagesContents.forEach { (_, contents) ->
|
sortedMessagesContents.forEach { (_, contents) ->
|
||||||
contents.singleOrNull() ?.also {
|
contents.singleOrNull() ?.also {
|
||||||
runCatching {
|
targetChatIds.forEach { targetChatId ->
|
||||||
bot.copyMessage(targetChatId, it.chatId, it.messageId)
|
|
||||||
}.onFailure { _ ->
|
|
||||||
runCatching {
|
runCatching {
|
||||||
bot.forwardMessage(
|
bot.copyMessage(targetChatId, it.chatId, it.messageId)
|
||||||
it.chatId,
|
}.onFailure { _ ->
|
||||||
targetChatId,
|
runCatching {
|
||||||
it.messageId
|
bot.forwardMessage(
|
||||||
)
|
fromChatId = it.chatId,
|
||||||
|
toChatId = cachingChatId,
|
||||||
|
messageId = it.messageId
|
||||||
|
)
|
||||||
|
}.onSuccess {
|
||||||
|
bot.copyMessage(targetChatId, it)
|
||||||
|
haveSentMessages = true
|
||||||
|
}
|
||||||
}.onSuccess {
|
}.onSuccess {
|
||||||
bot.copyMessage(targetChatId, it)
|
haveSentMessages = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return@forEach
|
return@forEach
|
||||||
@@ -57,17 +62,26 @@ class PostPublisher(
|
|||||||
it.order to (bot.forwardMessage(toChatId = cachingChatId, fromChatId = it.chatId, messageId = it.messageId).contentMessageOrNull() ?: return@mapNotNull null)
|
it.order to (bot.forwardMessage(toChatId = cachingChatId, fromChatId = it.chatId, messageId = it.messageId).contentMessageOrNull() ?: return@mapNotNull null)
|
||||||
}.sortedBy { it.first }.mapNotNull { (_, forwardedMessage) ->
|
}.sortedBy { it.first }.mapNotNull { (_, forwardedMessage) ->
|
||||||
forwardedMessage.withContentOrNull<MediaGroupPartContent>() ?: null.also { _ ->
|
forwardedMessage.withContentOrNull<MediaGroupPartContent>() ?: null.also { _ ->
|
||||||
bot.copyMessage(targetChatId, forwardedMessage)
|
targetChatIds.forEach { targetChatId ->
|
||||||
|
bot.copyMessage(targetChatId, forwardedMessage)
|
||||||
|
haveSentMessages = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
resultContents.singleOrNull() ?.also {
|
resultContents.singleOrNull() ?.also {
|
||||||
bot.copyMessage(targetChatId, it)
|
targetChatIds.forEach { targetChatId ->
|
||||||
|
bot.copyMessage(targetChatId, it)
|
||||||
|
haveSentMessages = true
|
||||||
|
}
|
||||||
return@forEach
|
return@forEach
|
||||||
} ?: resultContents.chunked(mediaCountInMediaGroup.last).forEach {
|
} ?: resultContents.chunked(mediaCountInMediaGroup.last).forEach {
|
||||||
bot.send(
|
targetChatIds.forEach { targetChatId ->
|
||||||
targetChatId,
|
bot.send(
|
||||||
it.map { it.content.toMediaGroupMemberTelegramMedia() }
|
targetChatId,
|
||||||
)
|
it.map { it.content.toMediaGroupMemberTelegramMedia() }
|
||||||
|
)
|
||||||
|
haveSentMessages = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,5 +89,6 @@ class PostPublisher(
|
|||||||
postsRepo.deleteById(postId)
|
postsRepo.deleteById(postId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return haveSentMessages
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import dev.inmo.kslog.common.logger
|
|||||||
import dev.inmo.kslog.common.w
|
import dev.inmo.kslog.common.w
|
||||||
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
||||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||||
|
import dev.inmo.micro_utils.koin.singleWithBinds
|
||||||
import dev.inmo.micro_utils.repos.deleteById
|
import dev.inmo.micro_utils.repos.deleteById
|
||||||
import dev.inmo.plagubot.Plugin
|
import dev.inmo.plagubot.Plugin
|
||||||
import dev.inmo.plaguposter.common.SuccessfulSymbol
|
import dev.inmo.plaguposter.common.SuccessfulSymbol
|
||||||
@@ -13,6 +14,8 @@ import dev.inmo.plaguposter.common.ChatConfig
|
|||||||
import dev.inmo.plagubot.plugins.inline.queries.models.Format
|
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.models.OfferTemplate
|
||||||
import dev.inmo.plagubot.plugins.inline.queries.repos.InlineTemplatesRepo
|
import dev.inmo.plagubot.plugins.inline.queries.repos.InlineTemplatesRepo
|
||||||
|
import dev.inmo.plaguposter.common.useCache
|
||||||
|
import dev.inmo.plaguposter.posts.cached.CachedPostsRepo
|
||||||
import dev.inmo.plaguposter.posts.repo.*
|
import dev.inmo.plaguposter.posts.repo.*
|
||||||
import dev.inmo.plaguposter.posts.sending.PostPublisher
|
import dev.inmo.plaguposter.posts.sending.PostPublisher
|
||||||
import dev.inmo.tgbotapi.extensions.api.delete
|
import dev.inmo.tgbotapi.extensions.api.delete
|
||||||
@@ -26,7 +29,6 @@ import kotlinx.serialization.json.*
|
|||||||
import org.jetbrains.exposed.sql.Database
|
import org.jetbrains.exposed.sql.Database
|
||||||
import org.koin.core.Koin
|
import org.koin.core.Koin
|
||||||
import org.koin.core.module.Module
|
import org.koin.core.module.Module
|
||||||
import org.koin.dsl.binds
|
|
||||||
|
|
||||||
object Plugin : Plugin {
|
object Plugin : Plugin {
|
||||||
@Serializable
|
@Serializable
|
||||||
@@ -44,14 +46,19 @@ object Plugin : Plugin {
|
|||||||
}
|
}
|
||||||
single { get<Json>().decodeFromJsonElement(Config.serializer(), configJson) }
|
single { get<Json>().decodeFromJsonElement(Config.serializer(), configJson) }
|
||||||
single { get<Config>().chats }
|
single { get<Config>().chats }
|
||||||
single { ExposedPostsRepo(database) } binds arrayOf(
|
single { ExposedPostsRepo(database) }
|
||||||
PostsRepo::class,
|
singleWithBinds<PostsRepo> {
|
||||||
ReadPostsRepo::class,
|
val base = get<ExposedPostsRepo>()
|
||||||
WritePostsRepo::class,
|
|
||||||
)
|
if (useCache) {
|
||||||
|
CachedPostsRepo(base, get())
|
||||||
|
} else {
|
||||||
|
base
|
||||||
|
}
|
||||||
|
}
|
||||||
single {
|
single {
|
||||||
val config = get<Config>()
|
val config = get<Config>()
|
||||||
PostPublisher(get(), get(), config.chats.cacheChatId, config.chats.targetChatId, config.deleteAfterPublishing)
|
PostPublisher(get(), get(), config.chats.cacheChatId, config.chats.allTargetChatIds.toList(), config.deleteAfterPublishing)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
54
posts/src/jvmMain/kotlin/cached/CachedPostsRepo.kt
Normal file
54
posts/src/jvmMain/kotlin/cached/CachedPostsRepo.kt
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
package dev.inmo.plaguposter.posts.cached
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.coroutines.SmartRWLocker
|
||||||
|
import korlibs.time.DateTime
|
||||||
|
import dev.inmo.micro_utils.pagination.FirstPagePagination
|
||||||
|
import dev.inmo.micro_utils.pagination.firstPageWithOneElementPagination
|
||||||
|
import dev.inmo.micro_utils.pagination.utils.doForAllWithNextPaging
|
||||||
|
import dev.inmo.micro_utils.repos.CRUDRepo
|
||||||
|
import dev.inmo.micro_utils.repos.KeyValueRepo
|
||||||
|
import dev.inmo.micro_utils.repos.MapKeyValueRepo
|
||||||
|
import dev.inmo.micro_utils.repos.cache.cache.FullKVCache
|
||||||
|
import dev.inmo.micro_utils.repos.cache.full.FullCRUDCacheRepo
|
||||||
|
import dev.inmo.plaguposter.posts.models.NewPost
|
||||||
|
import dev.inmo.plaguposter.posts.models.PostContentInfo
|
||||||
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
|
import dev.inmo.plaguposter.posts.models.RegisteredPost
|
||||||
|
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
||||||
|
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||||
|
import dev.inmo.tgbotapi.types.MessageIdentifier
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
|
||||||
|
class CachedPostsRepo(
|
||||||
|
private val parentRepo: PostsRepo,
|
||||||
|
private val scope: CoroutineScope,
|
||||||
|
private val kvCache: KeyValueRepo<PostId, RegisteredPost> = MapKeyValueRepo()
|
||||||
|
) : PostsRepo, CRUDRepo<RegisteredPost, PostId, NewPost> by FullCRUDCacheRepo(
|
||||||
|
parentRepo,
|
||||||
|
kvCache,
|
||||||
|
scope,
|
||||||
|
skipStartInvalidate = false,
|
||||||
|
locker = SmartRWLocker(),
|
||||||
|
{ it.id }
|
||||||
|
) {
|
||||||
|
override val removedPostsFlow: Flow<RegisteredPost> by parentRepo::removedPostsFlow
|
||||||
|
|
||||||
|
override suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageIdentifier): PostId? {
|
||||||
|
doForAllWithNextPaging(firstPageWithOneElementPagination) {
|
||||||
|
kvCache.values(it).also {
|
||||||
|
it.results.forEach {
|
||||||
|
return it.takeIf {
|
||||||
|
it.content.any { it.chatId == chatId && it.messageId == messageId }
|
||||||
|
} ?.id ?: return@forEach
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun getPostCreationTime(postId: PostId): DateTime? = getById(postId) ?.created
|
||||||
|
|
||||||
|
override suspend fun getFirstMessageInfo(postId: PostId): PostContentInfo? = getById(postId) ?.content ?.firstOrNull()
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package dev.inmo.plaguposter.posts.exposed
|
package dev.inmo.plaguposter.posts.exposed
|
||||||
|
|
||||||
import com.benasher44.uuid.uuid4
|
import com.benasher44.uuid.uuid4
|
||||||
import com.soywiz.klock.DateTime
|
import korlibs.time.DateTime
|
||||||
import dev.inmo.micro_utils.repos.KeyValuesRepo
|
import dev.inmo.micro_utils.repos.KeyValuesRepo
|
||||||
import dev.inmo.micro_utils.repos.UpdatedValuePair
|
import dev.inmo.micro_utils.repos.UpdatedValuePair
|
||||||
import dev.inmo.micro_utils.repos.exposed.AbstractExposedCRUDRepo
|
import dev.inmo.micro_utils.repos.exposed.AbstractExposedCRUDRepo
|
||||||
@@ -26,6 +26,7 @@ class ExposedPostsRepo(
|
|||||||
) {
|
) {
|
||||||
val idColumn = text("id")
|
val idColumn = text("id")
|
||||||
val createdColumn = double("datetime").default(0.0)
|
val createdColumn = double("datetime").default(0.0)
|
||||||
|
val latestUpdateColumn = double("latest_update").default(0.0)
|
||||||
|
|
||||||
private val contentRepo by lazy {
|
private val contentRepo by lazy {
|
||||||
ExposedContentInfoRepo(
|
ExposedContentInfoRepo(
|
||||||
@@ -81,7 +82,9 @@ class ExposedPostsRepo(
|
|||||||
return id
|
return id
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun update(id: PostId?, value: NewPost, it: UpdateBuilder<Int>) {}
|
override fun update(id: PostId?, value: NewPost, it: UpdateBuilder<Int>) {
|
||||||
|
it[latestUpdateColumn] = DateTime.now().unixMillis
|
||||||
|
}
|
||||||
|
|
||||||
private fun updateContent(post: RegisteredPost) {
|
private fun updateContent(post: RegisteredPost) {
|
||||||
transaction(database) {
|
transaction(database) {
|
||||||
|
|||||||
@@ -18,85 +18,95 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextWithFSM
|
|||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.*
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.*
|
||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.strictlyOn
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.strictlyOn
|
||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
|
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.sameChat
|
||||||
import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
|
import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
|
||||||
import dev.inmo.tgbotapi.extensions.utils.formatting.buildEntities
|
|
||||||
import dev.inmo.tgbotapi.extensions.utils.textContentOrNull
|
import dev.inmo.tgbotapi.extensions.utils.textContentOrNull
|
||||||
import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
|
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 dev.inmo.tgbotapi.utils.regular
|
||||||
|
import kotlinx.coroutines.async
|
||||||
import kotlinx.coroutines.flow.*
|
import kotlinx.coroutines.flow.*
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
import org.koin.core.Koin
|
import org.koin.core.Koin
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
object Plugin : Plugin {
|
object Plugin : Plugin {
|
||||||
|
@Serializable
|
||||||
|
data class Config(
|
||||||
|
val useInlineFinishingOpportunity: Boolean = true
|
||||||
|
)
|
||||||
|
|
||||||
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
||||||
val config = koin.get<ChatConfig>()
|
val config = koin.get<ChatConfig>()
|
||||||
val postsRepo = koin.get<PostsRepo>()
|
val postsRepo = koin.get<PostsRepo>()
|
||||||
|
|
||||||
strictlyOn {state: RegistrationState.InProcess ->
|
strictlyOn { state: RegistrationState.InProcess ->
|
||||||
val buttonUuid = "finish"
|
val buttonUuid = "finish"
|
||||||
|
|
||||||
val messageToDelete = send(
|
val suggestionMessageDeferred = async {
|
||||||
state.context,
|
send(
|
||||||
dev.inmo.tgbotapi.utils.buildEntities {
|
state.context,
|
||||||
if (state.messages.isNotEmpty()) {
|
dev.inmo.tgbotapi.utils.buildEntities {
|
||||||
regular("Your message(s) has been registered. You may send new ones or push \"Finish\" to finalize your post")
|
if (state.messages.isNotEmpty()) {
|
||||||
|
regular("Your message(s) has been registered. You may send new ones or push \"Finish\" to finalize your post")
|
||||||
|
} else {
|
||||||
|
regular("Ok, send me your messages for new post")
|
||||||
|
}
|
||||||
|
},
|
||||||
|
replyMarkup = if (state.messages.isNotEmpty()) {
|
||||||
|
flatInlineKeyboard {
|
||||||
|
dataButton(
|
||||||
|
"Finish",
|
||||||
|
buttonUuid
|
||||||
|
)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
regular("Ok, send me your messages for new post")
|
null
|
||||||
}
|
}
|
||||||
},
|
)
|
||||||
replyMarkup = if (state.messages.isNotEmpty()) {
|
}
|
||||||
flatInlineKeyboard {
|
|
||||||
dataButton(
|
|
||||||
"Finish",
|
|
||||||
buttonUuid
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
val newMessagesInfo = firstOf {
|
firstOf {
|
||||||
add {
|
add {
|
||||||
listOf(
|
val receivedMessage = waitAnyContentMessage().filter {
|
||||||
waitContentMessage().filter {
|
it.sameChat(state.context)
|
||||||
it.chat.id == state.context && it.content.textContentOrNull() ?.text != "/finish_post"
|
}.first()
|
||||||
}.take(1).first()
|
|
||||||
)
|
when {
|
||||||
|
receivedMessage.content.textContentOrNull() ?.text == "/finish_post" -> {
|
||||||
|
val messageToDelete = suggestionMessageDeferred.await()
|
||||||
|
edit(messageToDelete, "Ok, finishing your request")
|
||||||
|
RegistrationState.Finish(
|
||||||
|
state.context,
|
||||||
|
state.messages
|
||||||
|
)
|
||||||
|
}
|
||||||
|
else -> {
|
||||||
|
RegistrationState.InProcess(
|
||||||
|
state.context,
|
||||||
|
state.messages + PostContentInfo.fromMessage(receivedMessage)
|
||||||
|
).also {
|
||||||
|
runCatchingSafely {
|
||||||
|
suggestionMessageDeferred.cancel()
|
||||||
|
}
|
||||||
|
runCatchingSafely {
|
||||||
|
delete(suggestionMessageDeferred.await())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
add {
|
add {
|
||||||
|
val messageToDelete = suggestionMessageDeferred.await()
|
||||||
val finishPressed = waitMessageDataCallbackQuery().filter {
|
val finishPressed = waitMessageDataCallbackQuery().filter {
|
||||||
it.message.sameMessage(messageToDelete) && it.data == buttonUuid
|
it.message.sameMessage(messageToDelete) && it.data == buttonUuid
|
||||||
}.first()
|
}.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(
|
|
||||||
state.context,
|
|
||||||
state.messages
|
|
||||||
)
|
|
||||||
}.flatMap {
|
|
||||||
PostContentInfo.fromMessage(it)
|
|
||||||
}
|
|
||||||
|
|
||||||
RegistrationState.InProcess(
|
edit(messageToDelete, "Ok, finishing your request")
|
||||||
state.context,
|
RegistrationState.Finish(
|
||||||
state.messages + newMessagesInfo
|
state.context,
|
||||||
).also {
|
state.messages
|
||||||
delete(messageToDelete)
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,12 +119,12 @@ object Plugin : Plugin {
|
|||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
onCommand("start_post", initialFilter = { it.chat.id == config.sourceChatId }) {
|
onCommand("start_post", initialFilter = { config.allSourceChatIds.any { chatId -> it.sameChat(chatId) } }) {
|
||||||
startChain(RegistrationState.InProcess(it.chat.id, emptyList()))
|
startChain(RegistrationState.InProcess(it.chat.id, emptyList()))
|
||||||
}
|
}
|
||||||
|
|
||||||
onContentMessage(
|
onContentMessage(
|
||||||
initialFilter = { it.chat.id == config.sourceChatId && !FirstSourceIsCommandsFilter(it) }
|
initialFilter = { config.allSourceChatIds.any { chatId -> it.sameChat(chatId) } && !FirstSourceIsCommandsFilter(it) }
|
||||||
) {
|
) {
|
||||||
startChain(RegistrationState.Finish(it.chat.id, PostContentInfo.fromMessage(it)))
|
startChain(RegistrationState.Finish(it.chat.id, PostContentInfo.fromMessage(it)))
|
||||||
}
|
}
|
||||||
|
|||||||
105
publish.gradle
Normal file
105
publish.gradle
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
|
task javadocsJar(type: Jar) {
|
||||||
|
archiveClassifier = 'javadoc'
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications.all {
|
||||||
|
artifact javadocsJar
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = "${project.name}"
|
||||||
|
name = "${project.name}"
|
||||||
|
url = "https://github.com/InsanusMokrassar/PlaguPoster"
|
||||||
|
|
||||||
|
scm {
|
||||||
|
developerConnection = "scm:git:[fetch=]https://github.com/InsanusMokrassar/PlaguPoster.git[push=]https://github.com/InsanusMokrassar/PlaguPoster.git"
|
||||||
|
url = "https://github.com/InsanusMokrassar/PlaguPoster.git"
|
||||||
|
}
|
||||||
|
|
||||||
|
developers {
|
||||||
|
|
||||||
|
developer {
|
||||||
|
id = "InsanusMokrassar"
|
||||||
|
name = "Aleksei Ovsiannikov"
|
||||||
|
email = "ovsyannikov.alexey95@gmail.com"
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
repositories {
|
||||||
|
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
||||||
|
maven {
|
||||||
|
name = "Gitea"
|
||||||
|
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
||||||
|
|
||||||
|
credentials(HttpHeaderCredentials) {
|
||||||
|
name = "Authorization"
|
||||||
|
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
||||||
|
}
|
||||||
|
|
||||||
|
authentication {
|
||||||
|
header(HttpHeaderAuthentication)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||||
|
maven {
|
||||||
|
name = "sonatype"
|
||||||
|
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
||||||
|
|
||||||
|
credentials {
|
||||||
|
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||||
|
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (project.hasProperty("signing.gnupg.keyName")) {
|
||||||
|
apply plugin: 'signing'
|
||||||
|
|
||||||
|
signing {
|
||||||
|
useGpgCmd()
|
||||||
|
|
||||||
|
sign publishing.publications
|
||||||
|
}
|
||||||
|
|
||||||
|
task signAll {
|
||||||
|
tasks.withType(Sign).forEach {
|
||||||
|
dependsOn(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Workaround to make android sign operations depend on signing tasks
|
||||||
|
project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
|
||||||
|
def signingTasks = project.getTasks().withType(Sign.class)
|
||||||
|
mustRunAfter(signingTasks)
|
||||||
|
}
|
||||||
|
// Workaround to make test tasks use sign
|
||||||
|
project.getTasks().withType(Sign.class).configureEach { signTask ->
|
||||||
|
def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
|
||||||
|
def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
|
||||||
|
// These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
|
||||||
|
|
||||||
|
// Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
|
||||||
|
def debugTestTask = tasks.findByName("linkDebugTest$pubName")
|
||||||
|
if (debugTestTask != null) {
|
||||||
|
signTask.mustRunAfter(debugTestTask)
|
||||||
|
}
|
||||||
|
// Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
|
||||||
|
def testTask = tasks.findByName("compileTestKotlin$pubName")
|
||||||
|
if (testTask != null) {
|
||||||
|
signTask.mustRunAfter(testTask)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1
publish.kpsb
Normal file
1
publish.kpsb
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"licenses":[],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/PlaguPoster","vcsUrl":"https://github.com/InsanusMokrassar/PlaguPoster.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
|
||||||
@@ -1,18 +1,19 @@
|
|||||||
package dev.inmo.plaguposter.ratings.gc
|
package dev.inmo.plaguposter.ratings.gc
|
||||||
|
|
||||||
import com.soywiz.klock.milliseconds
|
import korlibs.time.DateTime
|
||||||
import com.soywiz.klock.seconds
|
import korlibs.time.seconds
|
||||||
import dev.inmo.krontab.KrontabTemplate
|
import dev.inmo.krontab.KrontabTemplate
|
||||||
import dev.inmo.krontab.toSchedule
|
import dev.inmo.krontab.toSchedule
|
||||||
import dev.inmo.krontab.utils.asFlow
|
import dev.inmo.krontab.utils.asFlowWithDelays
|
||||||
|
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
||||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||||
import dev.inmo.micro_utils.repos.*
|
import dev.inmo.micro_utils.repos.*
|
||||||
import dev.inmo.plagubot.Plugin
|
import dev.inmo.plagubot.Plugin
|
||||||
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
||||||
import dev.inmo.plaguposter.ratings.models.Rating
|
import dev.inmo.plaguposter.ratings.models.Rating
|
||||||
import dev.inmo.plaguposter.ratings.repo.RatingsRepo
|
import dev.inmo.plaguposter.ratings.repo.RatingsRepo
|
||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||||
import dev.inmo.tgbotapi.types.MilliSeconds
|
|
||||||
import dev.inmo.tgbotapi.types.Seconds
|
import dev.inmo.tgbotapi.types.Seconds
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
import kotlinx.serialization.json.*
|
import kotlinx.serialization.json.*
|
||||||
@@ -43,21 +44,35 @@ object Plugin : Plugin {
|
|||||||
val config = koin.get<Config>()
|
val config = koin.get<Config>()
|
||||||
|
|
||||||
config.immediateDrop ?.let { toDrop ->
|
config.immediateDrop ?.let { toDrop ->
|
||||||
ratingsRepo.onNewValue.subscribeSafelyWithoutExceptions(this) {
|
suspend fun checkAndOptionallyDrop(postId: PostId, rating: Rating) {
|
||||||
if (it.value <= toDrop) {
|
if (rating <= toDrop) {
|
||||||
postsRepo.deleteById(it.id)
|
postsRepo.deleteById(postId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ratingsRepo.getAll().forEach {
|
||||||
|
runCatchingSafely {
|
||||||
|
checkAndOptionallyDrop(it.key, it.value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ratingsRepo.onNewValue.subscribeSafelyWithoutExceptions(this) {
|
||||||
|
checkAndOptionallyDrop(it.first, it.second)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
config.autoclear ?.let { autoclear ->
|
config.autoclear ?.let { autoclear ->
|
||||||
autoclear.autoClearKrontab.toSchedule().asFlow().subscribeSafelyWithoutExceptions(scope) {
|
suspend fun doAutoClear() {
|
||||||
val dropCreatedBefore = it - (autoclear.skipPostAge ?: 0).seconds
|
val dropCreatedBefore = DateTime.now() - (autoclear.skipPostAge ?: 0).seconds
|
||||||
ratingsRepo.getPostsWithRatingLessEq(autoclear.rating).keys.forEach {
|
ratingsRepo.getPostsWithRatingLessEq(autoclear.rating).keys.forEach {
|
||||||
if ((postsRepo.getPostCreationTime(it) ?: return@forEach) < dropCreatedBefore) {
|
if ((postsRepo.getPostCreationTime(it) ?: return@forEach) < dropCreatedBefore) {
|
||||||
postsRepo.deleteById(it)
|
postsRepo.deleteById(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
runCatchingSafely {
|
||||||
|
doAutoClear()
|
||||||
|
}
|
||||||
|
autoclear.autoClearKrontab.toSchedule().asFlowWithDelays().subscribeSafelyWithoutExceptions(scope) {
|
||||||
|
doAutoClear()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package dev.inmo.plaguposter.ratings.selector
|
package dev.inmo.plaguposter.ratings.selector
|
||||||
|
|
||||||
import com.soywiz.klock.DateTime
|
import dev.inmo.micro_utils.repos.KeyValueRepo
|
||||||
|
import korlibs.time.DateTime
|
||||||
import dev.inmo.plaguposter.posts.models.PostId
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
||||||
import dev.inmo.plaguposter.ratings.repo.RatingsRepo
|
import dev.inmo.plaguposter.ratings.repo.RatingsRepo
|
||||||
@@ -9,13 +10,14 @@ import dev.inmo.plaguposter.ratings.selector.models.SelectorConfig
|
|||||||
class DefaultSelector (
|
class DefaultSelector (
|
||||||
private val config: SelectorConfig,
|
private val config: SelectorConfig,
|
||||||
private val ratingsRepo: RatingsRepo,
|
private val ratingsRepo: RatingsRepo,
|
||||||
private val postsRepo: PostsRepo
|
private val postsRepo: PostsRepo,
|
||||||
|
private val latestChosenRepo: KeyValueRepo<PostId, DateTime>
|
||||||
) : Selector {
|
) : Selector {
|
||||||
override suspend fun take(n: Int, now: DateTime): List<PostId> {
|
override suspend fun take(n: Int, now: DateTime, exclude: List<PostId>): List<PostId> {
|
||||||
val result = mutableListOf<PostId>()
|
val result = mutableListOf<PostId>()
|
||||||
|
|
||||||
do {
|
do {
|
||||||
val selected = config.active(now.time) ?.rating ?.select(ratingsRepo, postsRepo, result, now) ?: break
|
val selected = config.active(now.time) ?.rating ?.select(ratingsRepo, postsRepo, result + exclude, now, latestChosenRepo) ?: break
|
||||||
result.add(selected)
|
result.add(selected)
|
||||||
} while (result.size < n)
|
} while (result.size < n)
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,13 @@
|
|||||||
package dev.inmo.plaguposter.ratings.selector
|
package dev.inmo.plaguposter.ratings.selector
|
||||||
|
|
||||||
import com.soywiz.klock.DateTime
|
import korlibs.time.DateTime
|
||||||
import dev.inmo.plaguposter.posts.models.PostId
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
|
|
||||||
interface Selector {
|
interface Selector {
|
||||||
suspend fun take(n: Int = 1, now: DateTime = DateTime.now()): List<PostId>
|
suspend fun take(n: Int = 1, now: DateTime = DateTime.now(), exclude: List<PostId> = emptyList()): List<PostId>
|
||||||
|
suspend fun takeOneOrNull(now: DateTime = DateTime.now(), exclude: List<PostId> = emptyList()): PostId? = take(
|
||||||
|
n = 1,
|
||||||
|
now = now,
|
||||||
|
exclude = exclude
|
||||||
|
).firstOrNull()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
package dev.inmo.plaguposter.ratings.selector.models
|
package dev.inmo.plaguposter.ratings.selector.models
|
||||||
|
|
||||||
import com.soywiz.klock.DateTime
|
import korlibs.time.DateTime
|
||||||
import com.soywiz.klock.seconds
|
import korlibs.time.seconds
|
||||||
import dev.inmo.micro_utils.pagination.FirstPagePagination
|
|
||||||
import dev.inmo.micro_utils.pagination.Pagination
|
|
||||||
import dev.inmo.micro_utils.pagination.utils.getAllByWithNextPaging
|
import dev.inmo.micro_utils.pagination.utils.getAllByWithNextPaging
|
||||||
import dev.inmo.micro_utils.repos.pagination.getAll
|
import dev.inmo.micro_utils.repos.KeyValueRepo
|
||||||
import dev.inmo.plaguposter.common.DateTimeSerializer
|
import dev.inmo.micro_utils.repos.unset
|
||||||
import dev.inmo.plaguposter.posts.models.PostId
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
||||||
import dev.inmo.plaguposter.ratings.models.Rating
|
import dev.inmo.plaguposter.ratings.models.Rating
|
||||||
@@ -25,17 +23,23 @@ data class RatingConfig(
|
|||||||
val max: Rating? = null,
|
val max: Rating? = null,
|
||||||
val prefer: Prefer = Prefer.Random,
|
val prefer: Prefer = Prefer.Random,
|
||||||
val otherwise: RatingConfig? = null,
|
val otherwise: RatingConfig? = null,
|
||||||
val postAge: Seconds? = null
|
val postAge: Seconds? = null,
|
||||||
|
val uniqueCount: Int? = null
|
||||||
) {
|
) {
|
||||||
suspend fun select(
|
suspend fun select(
|
||||||
ratingsRepo: RatingsRepo,
|
ratingsRepo: RatingsRepo,
|
||||||
postsRepo: PostsRepo,
|
postsRepo: PostsRepo,
|
||||||
exclude: List<PostId>,
|
exclude: List<PostId>,
|
||||||
now: DateTime
|
now: DateTime,
|
||||||
|
latestChosenRepo: KeyValueRepo<PostId, DateTime>
|
||||||
): PostId? {
|
): PostId? {
|
||||||
var reversed: Boolean = false
|
var reversed: Boolean = false
|
||||||
var count: Int? = null
|
var count: Int? = null
|
||||||
val allowedCreationTime = now - (postAge ?: 0).seconds
|
val allowedCreationTime = now - (postAge ?: 0).seconds
|
||||||
|
val excludedByRepo = uniqueCount ?.let {
|
||||||
|
latestChosenRepo.getAll().toList().sortedBy { it.second }.takeLast(uniqueCount).map { it.first }
|
||||||
|
} ?: emptyList()
|
||||||
|
val resultExcluded = exclude + excludedByRepo
|
||||||
|
|
||||||
when (prefer) {
|
when (prefer) {
|
||||||
Prefer.Max -> {
|
Prefer.Max -> {
|
||||||
@@ -59,40 +63,53 @@ data class RatingConfig(
|
|||||||
ratingsRepo.getAllByWithNextPaging { keys(it) }
|
ratingsRepo.getAllByWithNextPaging { keys(it) }
|
||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
ratingsRepo.getPostsWithRatingLessEq(max, exclude = exclude).keys
|
ratingsRepo.getPostsWithRatingLessEq(max, exclude = resultExcluded).keys
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
when (max) {
|
when (max) {
|
||||||
null -> {
|
null -> {
|
||||||
ratingsRepo.getPostsWithRatingGreaterEq(min, exclude = exclude).keys
|
ratingsRepo.getPostsWithRatingGreaterEq(min, exclude = resultExcluded).keys
|
||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
ratingsRepo.getPosts(min .. max, reversed, count, exclude = exclude).keys
|
ratingsRepo.getPosts(min .. max, reversed, count, exclude = resultExcluded).keys
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}.filter {
|
}.filter {
|
||||||
it !in exclude && (postsRepo.getPostCreationTime(it) ?.let { it < allowedCreationTime } ?: true)
|
it !in resultExcluded && (postsRepo.getPostCreationTime(it) ?.let { it < allowedCreationTime } ?: true)
|
||||||
}
|
}
|
||||||
|
|
||||||
return when (prefer) {
|
val resultPosts: PostId = when (prefer) {
|
||||||
Prefer.Max,
|
Prefer.Max,
|
||||||
Prefer.Min -> posts.firstOrNull()
|
Prefer.Min -> posts.firstOrNull()
|
||||||
Prefer.Random -> posts.randomOrNull()
|
Prefer.Random -> posts.randomOrNull()
|
||||||
} ?: otherwise ?.select(ratingsRepo, postsRepo, exclude, now)
|
} ?: otherwise ?.select(ratingsRepo, postsRepo, resultExcluded, now, latestChosenRepo) ?: return null
|
||||||
|
|
||||||
|
val postsToKeep = uniqueCount ?.let {
|
||||||
|
(excludedByRepo + resultPosts).takeLast(it)
|
||||||
|
} ?: return resultPosts
|
||||||
|
|
||||||
|
val postsToRemoveFromKeep = excludedByRepo.filter { it !in postsToKeep }
|
||||||
|
latestChosenRepo.unset(postsToRemoveFromKeep)
|
||||||
|
val postsToAdd = postsToKeep.filter { it !in excludedByRepo }
|
||||||
|
latestChosenRepo.set(
|
||||||
|
postsToAdd.associateWith { DateTime.now() }
|
||||||
|
)
|
||||||
|
|
||||||
|
return resultPosts
|
||||||
}
|
}
|
||||||
|
|
||||||
@Serializable(Prefer.Serializer::class)
|
@Serializable(Prefer.Serializer::class)
|
||||||
sealed interface Prefer {
|
sealed interface Prefer {
|
||||||
val type: String
|
val type: String
|
||||||
@Serializable(Serializer::class)
|
@Serializable(Serializer::class)
|
||||||
object Max : Prefer { override val type: String = "max" }
|
data object Max : Prefer { override val type: String = "max" }
|
||||||
@Serializable(Serializer::class)
|
@Serializable(Serializer::class)
|
||||||
object Min : Prefer { override val type: String = "min" }
|
data object Min : Prefer { override val type: String = "min" }
|
||||||
@Serializable(Serializer::class)
|
@Serializable(Serializer::class)
|
||||||
object Random : Prefer { override val type: String = "random" }
|
data object Random : Prefer { override val type: String = "random" }
|
||||||
|
|
||||||
object Serializer : KSerializer<Prefer> {
|
object Serializer : KSerializer<Prefer> {
|
||||||
override val descriptor: SerialDescriptor = String.serializer().descriptor
|
override val descriptor: SerialDescriptor = String.serializer().descriptor
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package dev.inmo.plaguposter.ratings.selector.models
|
package dev.inmo.plaguposter.ratings.selector.models
|
||||||
|
|
||||||
import com.soywiz.klock.DateTime
|
import korlibs.time.DateTime
|
||||||
import com.soywiz.klock.Time
|
import korlibs.time.Time
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package dev.inmo.plaguposter.ratings.selector.models
|
package dev.inmo.plaguposter.ratings.selector.models
|
||||||
|
|
||||||
import com.soywiz.klock.*
|
import korlibs.time.*
|
||||||
import kotlinx.serialization.*
|
import kotlinx.serialization.*
|
||||||
import kotlinx.serialization.builtins.serializer
|
import kotlinx.serialization.builtins.serializer
|
||||||
import kotlinx.serialization.descriptors.SerialDescriptor
|
import kotlinx.serialization.descriptors.SerialDescriptor
|
||||||
|
|||||||
@@ -1,14 +1,33 @@
|
|||||||
package dev.inmo.plaguposter.ratings.selector
|
package dev.inmo.plaguposter.ratings.selector
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.repos.KeyValueRepo
|
||||||
|
import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
|
||||||
|
import dev.inmo.micro_utils.repos.mappers.withMapper
|
||||||
import dev.inmo.plagubot.Plugin
|
import dev.inmo.plagubot.Plugin
|
||||||
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
import dev.inmo.plaguposter.ratings.selector.models.SelectorConfig
|
import dev.inmo.plaguposter.ratings.selector.models.SelectorConfig
|
||||||
|
import korlibs.time.DateTime
|
||||||
import kotlinx.serialization.json.*
|
import kotlinx.serialization.json.*
|
||||||
import org.jetbrains.exposed.sql.Database
|
import org.jetbrains.exposed.sql.Database
|
||||||
import org.koin.core.module.Module
|
import org.koin.core.module.Module
|
||||||
|
import org.koin.core.qualifier.qualifier
|
||||||
|
|
||||||
object Plugin : Plugin {
|
object Plugin : Plugin {
|
||||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||||
single { get<Json>().decodeFromJsonElement(SelectorConfig.serializer(), params["selector"] ?: return@single null) }
|
single { get<Json>().decodeFromJsonElement(SelectorConfig.serializer(), params["selector"] ?: return@single null) }
|
||||||
single<Selector> { DefaultSelector(get(), get(), get()) }
|
single<KeyValueRepo<PostId, DateTime>>(qualifier("latestChosenRepo")) {
|
||||||
|
ExposedKeyValueRepo(
|
||||||
|
get(),
|
||||||
|
{ text("post_id") },
|
||||||
|
{ double("date_time") },
|
||||||
|
"LatestChosenRepo"
|
||||||
|
).withMapper(
|
||||||
|
{ string },
|
||||||
|
{ unixMillis },
|
||||||
|
{ PostId(this) },
|
||||||
|
{ DateTime(this) }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
single<Selector> { DefaultSelector(get(), get(), get(), get(qualifier("latestChosenRepo"))) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
package dev.inmo.plaguposter.ratings.source.buttons
|
package dev.inmo.plaguposter.ratings.source.buttons
|
||||||
|
|
||||||
import com.soywiz.klock.DateFormat
|
import korlibs.time.DateFormat
|
||||||
|
import dev.inmo.kslog.common.TagLogger
|
||||||
|
import dev.inmo.kslog.common.d
|
||||||
|
import dev.inmo.kslog.common.i
|
||||||
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
||||||
import dev.inmo.micro_utils.pagination.FirstPagePagination
|
import dev.inmo.micro_utils.pagination.FirstPagePagination
|
||||||
import dev.inmo.micro_utils.pagination.Pagination
|
import dev.inmo.micro_utils.pagination.Pagination
|
||||||
@@ -63,6 +66,7 @@ suspend fun RatingsRepo.buildRatingButtons(
|
|||||||
postCreationTimeFormat: DateFormat = defaultPostCreationTimeFormat
|
postCreationTimeFormat: DateFormat = defaultPostCreationTimeFormat
|
||||||
): InlineKeyboardMarkup {
|
): InlineKeyboardMarkup {
|
||||||
val postsByRatings = getPosts(rating .. rating, true).keys.paginate(pagination)
|
val postsByRatings = getPosts(rating .. rating, true).keys.paginate(pagination)
|
||||||
|
TagLogger("RatingsButtonsBuilder").i { postsByRatings.results }
|
||||||
return inlineKeyboard {
|
return inlineKeyboard {
|
||||||
if (postsByRatings.pagesNumber > 1) {
|
if (postsByRatings.pagesNumber > 1) {
|
||||||
row {
|
row {
|
||||||
@@ -75,7 +79,7 @@ suspend fun RatingsRepo.buildRatingButtons(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
postsByRatings.results.chunked(rowSize).map {
|
postsByRatings.results.chunked(rowSize).forEach {
|
||||||
row {
|
row {
|
||||||
it.forEach { postId ->
|
it.forEach { postId ->
|
||||||
val firstMessageInfo = postsRepo.getFirstMessageInfo(postId) ?: return@forEach
|
val firstMessageInfo = postsRepo.getFirstMessageInfo(postId) ?: return@forEach
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package dev.inmo.plaguposter.ratings.source.repos
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.repos.KeyValueRepo
|
||||||
|
import dev.inmo.micro_utils.repos.cache.cache.FullKVCache
|
||||||
|
import dev.inmo.micro_utils.repos.cache.full.fullyCached
|
||||||
|
import dev.inmo.plaguposter.common.ShortMessageInfo
|
||||||
|
import dev.inmo.tgbotapi.types.PollIdentifier
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
|
||||||
|
class CachedPollsToMessagesInfoRepo(
|
||||||
|
private val repo: PollsToMessagesInfoRepo,
|
||||||
|
private val scope: CoroutineScope,
|
||||||
|
private val kvCache: FullKVCache<PollIdentifier, ShortMessageInfo> = FullKVCache()
|
||||||
|
) : PollsToMessagesInfoRepo, KeyValueRepo<PollIdentifier, ShortMessageInfo> by repo.fullyCached(kvCache, scope)
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package dev.inmo.plaguposter.ratings.source.repos
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.repos.KeyValueRepo
|
||||||
|
import dev.inmo.micro_utils.repos.cache.cache.FullKVCache
|
||||||
|
import dev.inmo.micro_utils.repos.cache.full.fullyCached
|
||||||
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
|
import dev.inmo.tgbotapi.types.PollIdentifier
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
|
||||||
|
class CachedPollsToPostsIdsRepo(
|
||||||
|
private val repo: PollsToPostsIdsRepo,
|
||||||
|
private val scope: CoroutineScope,
|
||||||
|
private val kvCache: FullKVCache<PollIdentifier, PostId> = FullKVCache()
|
||||||
|
) : PollsToPostsIdsRepo, KeyValueRepo<PollIdentifier, PostId> by repo.fullyCached(kvCache, scope)
|
||||||
@@ -37,6 +37,7 @@ 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.dataButton
|
||||||
import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard
|
import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard
|
||||||
import dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard
|
import dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard
|
||||||
|
import dev.inmo.tgbotapi.types.ReplyParameters
|
||||||
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
|
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
|
||||||
import dev.inmo.tgbotapi.types.message.textsources.bold
|
import dev.inmo.tgbotapi.types.message.textsources.bold
|
||||||
import dev.inmo.tgbotapi.types.message.textsources.regular
|
import dev.inmo.tgbotapi.types.message.textsources.regular
|
||||||
@@ -67,8 +68,29 @@ object Plugin : Plugin {
|
|||||||
get<Json>().decodeFromJsonElement(Config.serializer(), params["ratingsPolls"] ?: error("Unable to load config for rating polls in $params"))
|
get<Json>().decodeFromJsonElement(Config.serializer(), params["ratingsPolls"] ?: error("Unable to load config for rating polls in $params"))
|
||||||
}
|
}
|
||||||
single<RatingsVariants>(ratingVariantsQualifier) { get<Config>().variants }
|
single<RatingsVariants>(ratingVariantsQualifier) { get<Config>().variants }
|
||||||
single<PollsToPostsIdsRepo> { ExposedPollsToPostsIdsRepo(database) }
|
|
||||||
single<PollsToMessagesInfoRepo> { ExposedPollsToMessagesInfoRepo(database) }
|
single { ExposedPollsToPostsIdsRepo(database) }
|
||||||
|
single<PollsToPostsIdsRepo> {
|
||||||
|
val base = get<ExposedPollsToPostsIdsRepo>()
|
||||||
|
|
||||||
|
if (useCache) {
|
||||||
|
CachedPollsToPostsIdsRepo(base, get())
|
||||||
|
} else {
|
||||||
|
base
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
single { ExposedPollsToMessagesInfoRepo(database) }
|
||||||
|
single<PollsToMessagesInfoRepo> {
|
||||||
|
val base = get<ExposedPollsToMessagesInfoRepo>()
|
||||||
|
|
||||||
|
if (useCache) {
|
||||||
|
CachedPollsToMessagesInfoRepo(base, get())
|
||||||
|
} else {
|
||||||
|
base
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
single<VariantTransformer> {
|
single<VariantTransformer> {
|
||||||
val ratingsSettings = get<RatingsVariants>(ratingVariantsQualifier)
|
val ratingsSettings = get<RatingsVariants>(ratingVariantsQualifier)
|
||||||
VariantTransformer {
|
VariantTransformer {
|
||||||
@@ -101,13 +123,14 @@ object Plugin : Plugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val post = postsRepo.getById(postId) ?: return false
|
val post = postsRepo.getById(postId) ?: return false
|
||||||
|
ratingsRepo.set(postId, Rating(0.0))
|
||||||
for (content in post.content) {
|
for (content in post.content) {
|
||||||
runCatchingSafely {
|
runCatchingSafely {
|
||||||
val sent = send(
|
val sent = send(
|
||||||
content.chatId,
|
content.chatId,
|
||||||
config.ratingOfferText,
|
config.ratingOfferText,
|
||||||
config.variants.keys.toList(),
|
config.variants.keys.toList(),
|
||||||
replyToMessageId = content.messageId
|
replyParameters = ReplyParameters(content.chatId, content.messageId)
|
||||||
)
|
)
|
||||||
pollsToPostsIdsRepo.set(sent.content.poll.id, postId)
|
pollsToPostsIdsRepo.set(sent.content.poll.id, postId)
|
||||||
pollsToMessageInfoRepo.set(sent.content.poll.id, sent.short())
|
pollsToMessageInfoRepo.set(sent.content.poll.id, sent.short())
|
||||||
@@ -140,7 +163,7 @@ object Plugin : Plugin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
postsRepo.deletedObjectsIdsFlow.subscribeSafelyWithoutExceptions(this) { postId ->
|
ratingsRepo.onValueRemoved.subscribeSafelyWithoutExceptions(this) { postId ->
|
||||||
detachPoll(postId)
|
detachPoll(postId)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -220,7 +243,7 @@ object Plugin : Plugin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
onCommand("ratings", requireOnlyCommandInMessage = true) {
|
onCommand("ratings", requireOnlyCommandInMessage = true) {
|
||||||
if (it.chat.id == chatConfig.sourceChatId) {
|
if (it.chat.id in chatConfig.allSourceChatIds) {
|
||||||
val ratings = ratingsRepo.postsByRatings().toList().sortedByDescending { it.first }
|
val ratings = ratingsRepo.postsByRatings().toList().sortedByDescending { it.first }
|
||||||
val textSources = buildEntities {
|
val textSources = buildEntities {
|
||||||
+ "Ratings amount: " + bold("${ratings.sumOf { it.second.size }}") + "\n\n"
|
+ "Ratings amount: " + bold("${ratings.sumOf { it.second.size }}") + "\n\n"
|
||||||
@@ -238,8 +261,8 @@ object Plugin : Plugin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
includeRootNavigationButtonsHandler(setOf(chatConfig.sourceChatId), ratingsRepo, postsRepo)
|
includeRootNavigationButtonsHandler(chatConfig.allSourceChatIds, ratingsRepo, postsRepo)
|
||||||
onMessageDataCallbackQuery("ratings_interactive", initialFilter = { it.message.chat.id == chatConfig.sourceChatId }) {
|
onMessageDataCallbackQuery("ratings_interactive", initialFilter = { it.message.chat.id in chatConfig.allSourceChatIds }) {
|
||||||
edit(
|
edit(
|
||||||
it.message,
|
it.message,
|
||||||
ratingsRepo.buildRootButtons()
|
ratingsRepo.buildRootButtons()
|
||||||
|
|||||||
61
ratings/src/commonMain/kotlin/repo/CachedRatingsRepo.kt
Normal file
61
ratings/src/commonMain/kotlin/repo/CachedRatingsRepo.kt
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
package dev.inmo.plaguposter.ratings.repo
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.pagination.utils.doForAllWithNextPaging
|
||||||
|
import dev.inmo.micro_utils.repos.KeyValueRepo
|
||||||
|
import dev.inmo.micro_utils.repos.cache.cache.FullKVCache
|
||||||
|
import dev.inmo.micro_utils.repos.cache.full.FullKeyValueCacheRepo
|
||||||
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
|
import dev.inmo.plaguposter.ratings.models.Rating
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
|
||||||
|
class CachedRatingsRepo(
|
||||||
|
private val base: RatingsRepo,
|
||||||
|
private val scope: CoroutineScope,
|
||||||
|
private val kvCache: FullKVCache<PostId, Rating> = FullKVCache()
|
||||||
|
) : RatingsRepo, KeyValueRepo<PostId, Rating> by FullKeyValueCacheRepo(base, kvCache, scope) {
|
||||||
|
override suspend fun getPosts(
|
||||||
|
range: ClosedRange<Rating>,
|
||||||
|
reversed: Boolean,
|
||||||
|
count: Int?,
|
||||||
|
exclude: List<PostId>
|
||||||
|
): Map<PostId, Rating> {
|
||||||
|
val result = mutableMapOf<PostId, Rating>()
|
||||||
|
|
||||||
|
doForAllWithNextPaging {
|
||||||
|
kvCache.keys(it).also {
|
||||||
|
it.results.forEach {
|
||||||
|
val rating = get(it) ?: return@forEach
|
||||||
|
if (it !in exclude && rating in range) {
|
||||||
|
result[it] = rating
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result.toMap()
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun getPostsWithRatingGreaterEq(
|
||||||
|
then: Rating,
|
||||||
|
reversed: Boolean,
|
||||||
|
count: Int?,
|
||||||
|
exclude: List<PostId>
|
||||||
|
): Map<PostId, Rating> = getPosts(
|
||||||
|
then .. Rating(Double.MAX_VALUE),
|
||||||
|
reversed,
|
||||||
|
count,
|
||||||
|
exclude
|
||||||
|
)
|
||||||
|
|
||||||
|
override suspend fun getPostsWithRatingLessEq(
|
||||||
|
then: Rating,
|
||||||
|
reversed: Boolean,
|
||||||
|
count: Int?,
|
||||||
|
exclude: List<PostId>
|
||||||
|
): Map<PostId, Rating> = getPosts(
|
||||||
|
Rating(Double.MIN_VALUE) .. then,
|
||||||
|
reversed,
|
||||||
|
count,
|
||||||
|
exclude
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
package dev.inmo.plaguposter.ratings
|
package dev.inmo.plaguposter.ratings
|
||||||
|
|
||||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||||
|
import dev.inmo.micro_utils.koin.singleWithBinds
|
||||||
import dev.inmo.micro_utils.repos.unset
|
import dev.inmo.micro_utils.repos.unset
|
||||||
import dev.inmo.plagubot.Plugin
|
import dev.inmo.plagubot.Plugin
|
||||||
|
import dev.inmo.plaguposter.common.useCache
|
||||||
import dev.inmo.plaguposter.posts.exposed.ExposedPostsRepo
|
import dev.inmo.plaguposter.posts.exposed.ExposedPostsRepo
|
||||||
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
import dev.inmo.plaguposter.posts.repo.PostsRepo
|
||||||
import dev.inmo.plaguposter.ratings.exposed.ExposedRatingsRepo
|
import dev.inmo.plaguposter.ratings.exposed.ExposedRatingsRepo
|
||||||
@@ -16,11 +18,16 @@ import org.koin.dsl.binds
|
|||||||
|
|
||||||
object Plugin : Plugin {
|
object Plugin : Plugin {
|
||||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||||
single { ExposedRatingsRepo(database) } binds arrayOf(
|
single { ExposedRatingsRepo(database) }
|
||||||
RatingsRepo::class,
|
singleWithBinds<RatingsRepo> {
|
||||||
ReadRatingsRepo::class,
|
val base = get<ExposedRatingsRepo>()
|
||||||
WriteRatingsRepo::class,
|
|
||||||
)
|
if (useCache) {
|
||||||
|
CachedRatingsRepo(base, get())
|
||||||
|
} else {
|
||||||
|
base
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package dev.inmo.plaguposter.ratings.exposed
|
package dev.inmo.plaguposter.ratings.exposed
|
||||||
|
|
||||||
import dev.inmo.micro_utils.pagination.utils.optionallyReverse
|
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.micro_utils.repos.exposed.keyvalue.AbstractExposedKeyValueRepo
|
||||||
import dev.inmo.plaguposter.posts.models.PostId
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
import dev.inmo.plaguposter.ratings.models.Rating
|
import dev.inmo.plaguposter.ratings.models.Rating
|
||||||
@@ -24,6 +25,10 @@ class ExposedRatingsRepo (
|
|||||||
override val ResultRow.asObject: Rating
|
override val ResultRow.asObject: Rating
|
||||||
get() = get(ratingsColumn).let(::Rating)
|
get() = get(ratingsColumn).let(::Rating)
|
||||||
|
|
||||||
|
init {
|
||||||
|
initTable()
|
||||||
|
}
|
||||||
|
|
||||||
override fun update(k: PostId, v: Rating, it: UpdateBuilder<Int>) {
|
override fun update(k: PostId, v: Rating, it: UpdateBuilder<Int>) {
|
||||||
it[ratingsColumn] = v.double
|
it[ratingsColumn] = v.double
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM adoptopenjdk/openjdk11
|
FROM bellsoft/liberica-openjdk-alpine:19
|
||||||
|
|
||||||
USER 1000
|
USER 1000
|
||||||
|
|
||||||
|
|||||||
@@ -15,10 +15,14 @@ dependencies {
|
|||||||
api project(":plaguposter.posts_registrar")
|
api project(":plaguposter.posts_registrar")
|
||||||
api project(":plaguposter.triggers.command")
|
api project(":plaguposter.triggers.command")
|
||||||
api project(":plaguposter.triggers.selector_with_timer")
|
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")
|
||||||
api project(":plaguposter.ratings.source")
|
api project(":plaguposter.ratings.source")
|
||||||
api project(":plaguposter.ratings.selector")
|
api project(":plaguposter.ratings.selector")
|
||||||
api project(":plaguposter.ratings.gc")
|
api project(":plaguposter.ratings.gc")
|
||||||
|
api project(":plaguposter.posts.gc")
|
||||||
api project(":plaguposter.inlines")
|
api project(":plaguposter.inlines")
|
||||||
|
|
||||||
api libs.psql
|
api libs.psql
|
||||||
@@ -29,6 +33,6 @@ application {
|
|||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,72 +0,0 @@
|
|||||||
{
|
|
||||||
"database": {
|
|
||||||
"url": "jdbc:postgresql://127.0.0.1:8091/test",
|
|
||||||
"username": "test",
|
|
||||||
"password": "test",
|
|
||||||
"driver": "org.postgresql.Driver"
|
|
||||||
},
|
|
||||||
"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.triggers.command.Plugin",
|
|
||||||
"dev.inmo.plaguposter.posts.panel.Plugin"
|
|
||||||
],
|
|
||||||
"posts": {
|
|
||||||
"chats": {
|
|
||||||
"targetChat": 12345678,
|
|
||||||
"cacheChat": 12345678,
|
|
||||||
"sourceChat": 12345678
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ratingsPolls": {
|
|
||||||
"variants": {
|
|
||||||
"Круть": 2,
|
|
||||||
"Ок": 1,
|
|
||||||
"Не ок": -1,
|
|
||||||
"Совсем не ок": -2,
|
|
||||||
"Посмотреть результаты": 0
|
|
||||||
},
|
|
||||||
"autoAttach": true,
|
|
||||||
"ratingOfferText": "What do you think about it?"
|
|
||||||
},
|
|
||||||
"selector": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"time": {
|
|
||||||
"from": "00:00",
|
|
||||||
"to": "23:59"
|
|
||||||
},
|
|
||||||
"rating": {
|
|
||||||
"prefer": "max"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"time": {
|
|
||||||
"from": "23:59",
|
|
||||||
"to": "00:00"
|
|
||||||
},
|
|
||||||
"rating": {
|
|
||||||
"prefer": "max"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"timer_trigger": {
|
|
||||||
"krontab": "0 30 2/4 * *"
|
|
||||||
},
|
|
||||||
"panel": {
|
|
||||||
"textPrefix": "Post management:",
|
|
||||||
"buttonsPerRow": 2,
|
|
||||||
"parseMode": "MarkdownV2",
|
|
||||||
"deleteButtonText": "Delete"
|
|
||||||
},
|
|
||||||
"publish_command": {
|
|
||||||
"panelButtonText": "Publish"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -14,8 +14,8 @@ function assert_success() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
app=plaguposter
|
app=plaguposter
|
||||||
version="`grep ../gradle.properties -e "^version=" | grep -e "[0-9.]*" -o`"
|
version="`grep ../gradle.properties -e "^version=" | sed -e "s/version=\(.*\)/\1/"`"
|
||||||
server=docker.io/insanusmokrassar
|
server=insanusmokrassar
|
||||||
|
|
||||||
assert_success ../gradlew build
|
assert_success ../gradlew build
|
||||||
assert_success sudo docker build -t $app:"$version" .
|
assert_success sudo docker build -t $app:"$version" .
|
||||||
|
|||||||
25
runner/nonsudo_deploy.sh
Executable file
25
runner/nonsudo_deploy.sh
Executable file
@@ -0,0 +1,25 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
function send_notification() {
|
||||||
|
echo "$1"
|
||||||
|
}
|
||||||
|
|
||||||
|
function assert_success() {
|
||||||
|
"${@}"
|
||||||
|
local status=${?}
|
||||||
|
if [ ${status} -ne 0 ]; then
|
||||||
|
send_notification "### Error ${status} at: ${BASH_LINENO[*]} ###"
|
||||||
|
exit ${status}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
app=plaguposter
|
||||||
|
version="`grep ../gradle.properties -e "^version=" | sed -e "s/version=\(.*\)/\1/"`"
|
||||||
|
server=insanusmokrassar
|
||||||
|
|
||||||
|
assert_success ../gradlew build
|
||||||
|
assert_success docker build -t $app:"$version" .
|
||||||
|
assert_success docker tag $app:"$version" $server/$app:$version
|
||||||
|
assert_success docker tag $app:"$version" $server/$app:latest
|
||||||
|
assert_success docker push $server/$app:$version
|
||||||
|
assert_success docker push $server/$app:latest
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
DATA_PATH=.
|
|
||||||
|
|
||||||
PG_USER=test_user
|
|
||||||
PG_PASSWORD=test_password
|
|
||||||
PG_DB=test_db
|
|
||||||
@@ -1,131 +1,85 @@
|
|||||||
{
|
{
|
||||||
"database": {
|
"database": {
|
||||||
"url": "jdbc:postgresql://postgres/test_db",
|
"url": "jdbc:postgresql://postgres:5432/test",
|
||||||
"username": "test_user",
|
"username": "test",
|
||||||
"password": "test_password",
|
"password": "test",
|
||||||
"driver": "org.postgresql.Driver"
|
"driver": "org.postgresql.Driver"
|
||||||
},
|
},
|
||||||
"botToken": "1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi",
|
"botToken": "1234567890:ABCDEFGHIJKLMNOP_qrstuvwxyz12345678",
|
||||||
"plugins": [
|
"plugins": [
|
||||||
"dev.inmo.plaguposter.posts.Plugin",
|
"dev.inmo.plaguposter.posts.Plugin",
|
||||||
"dev.inmo.plaguposter.posts.registrar.Plugin",
|
"dev.inmo.plaguposter.posts.registrar.Plugin",
|
||||||
"dev.inmo.plaguposter.ratings.Plugin",
|
"dev.inmo.plaguposter.ratings.Plugin",
|
||||||
"dev.inmo.plaguposter.ratings.source.Plugin",
|
"dev.inmo.plaguposter.ratings.source.Plugin",
|
||||||
"dev.inmo.plaguposter.ratings.selector.Plugin",
|
"dev.inmo.plaguposter.ratings.selector.Plugin",
|
||||||
"dev.inmo.plaguposter.triggers.selector_with_timer.Plugin",
|
|
||||||
"dev.inmo.plaguposter.ratings.gc.Plugin",
|
"dev.inmo.plaguposter.ratings.gc.Plugin",
|
||||||
|
"dev.inmo.plaguposter.triggers.selector_with_timer.Plugin",
|
||||||
"dev.inmo.plagubot.plugins.inline.queries.Plugin",
|
"dev.inmo.plagubot.plugins.inline.queries.Plugin",
|
||||||
"dev.inmo.plaguposter.triggers.command.Plugin"
|
"dev.inmo.plaguposter.triggers.command.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",
|
||||||
|
"dev.inmo.plaguposter.posts.gc.Plugin"
|
||||||
],
|
],
|
||||||
"posts": {
|
"posts": {
|
||||||
"chats": {
|
"chats": {
|
||||||
"targetChat": -1001234567890,
|
"targetChat": 12345678,
|
||||||
"cacheChat": -1001234567890,
|
"cacheChat": 12345678,
|
||||||
"sourceChat": -1001234567890
|
"sourceChat": 12345678,
|
||||||
},
|
"targetChats": [12345678],
|
||||||
"autoRemoveMessages": true
|
"_note": "You must set targetChat or targetChats with at least one object"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"ratingsPolls": {
|
"ratingsPolls": {
|
||||||
"variants": {
|
"variants": {
|
||||||
"Круть": 2,
|
"Cool": 2,
|
||||||
"Ок": 1,
|
"Ok": 1,
|
||||||
"Не ок": -1,
|
"Not ok": -1,
|
||||||
"Совсем не ок": -2,
|
"Inappropriate": -2,
|
||||||
"Посмотреть результаты": 0
|
"Results": 0
|
||||||
},
|
},
|
||||||
"autoAttach": true,
|
"autoAttach": true,
|
||||||
"ratingOfferText": "How do you like it?"
|
"ratingOfferText": "What do you think about it?"
|
||||||
},
|
},
|
||||||
"selector": {
|
"selector": {
|
||||||
"items": [
|
"items": [
|
||||||
{
|
{
|
||||||
"time": {
|
"time": {
|
||||||
"from": "23:00",
|
"from": "00:00",
|
||||||
"to": "23:59"
|
"to": "23:59"
|
||||||
},
|
},
|
||||||
"rating": {
|
"rating": {
|
||||||
"min": -1.0,
|
|
||||||
"max": 2.0,
|
|
||||||
"prefer": "max",
|
"prefer": "max",
|
||||||
"otherwise": {
|
"uniqueCount": 1
|
||||||
"rating": {
|
|
||||||
"min": 2.0,
|
|
||||||
"prefer": "min",
|
|
||||||
"postAge": 86400
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"postAge": 86400
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"time": {
|
"time": {
|
||||||
"from": "00:00",
|
"from": "23:59",
|
||||||
"to": "06:59"
|
"to": "00:00"
|
||||||
},
|
|
||||||
"rating": {
|
|
||||||
"min": -1.0,
|
|
||||||
"max": 2.0,
|
|
||||||
"prefer": "max",
|
|
||||||
"otherwise": {
|
|
||||||
"rating": {
|
|
||||||
"min": 2.0,
|
|
||||||
"prefer": "min",
|
|
||||||
"postAge": 86400
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"postAge": 86400
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"time": {
|
|
||||||
"from": "07:00",
|
|
||||||
"to": "12:00"
|
|
||||||
},
|
|
||||||
"rating": {
|
|
||||||
"min": 1.0,
|
|
||||||
"prefer": "min",
|
|
||||||
"otherwise": {
|
|
||||||
"rating": {
|
|
||||||
"max": 1.0,
|
|
||||||
"prefer": "max",
|
|
||||||
"postAge": 86400
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"postAge": 86400
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"time": {
|
|
||||||
"from": "12:00",
|
|
||||||
"to": "16:00"
|
|
||||||
},
|
|
||||||
"rating": {
|
|
||||||
"min": 2.0,
|
|
||||||
"prefer": "min",
|
|
||||||
"otherwise": {
|
|
||||||
"rating": {
|
|
||||||
"max": 2.0,
|
|
||||||
"prefer": "max",
|
|
||||||
"postAge": 86400
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"postAge": 86400
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"time": {
|
|
||||||
"from": "16:00",
|
|
||||||
"to": "23:00"
|
|
||||||
},
|
},
|
||||||
"rating": {
|
"rating": {
|
||||||
"prefer": "max",
|
"prefer": "max",
|
||||||
"postAge": 86400
|
"uniqueCount": 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"timer_trigger": {
|
"timer_trigger": {
|
||||||
"krontab": "0 30 */5 * *"
|
"krontab": "0 30 2/4 * *",
|
||||||
|
"retryOnPostFailureTimes": 0,
|
||||||
|
"_note": "retryOnPostFailureTimes will retry to publish one or several posts if posting has been failed"
|
||||||
|
},
|
||||||
|
"panel": {
|
||||||
|
"textPrefix": "Post management:",
|
||||||
|
"buttonsPerRow": 2,
|
||||||
|
"parseMode": "MarkdownV2",
|
||||||
|
"deleteButtonText": "Delete"
|
||||||
|
},
|
||||||
|
"publish_command": {
|
||||||
|
"panelButtonText": "Publish"
|
||||||
},
|
},
|
||||||
"gc": {
|
"gc": {
|
||||||
"autoclear": {
|
"autoclear": {
|
||||||
@@ -133,6 +87,11 @@
|
|||||||
"autoClearKrontab": "0 0 0 * *",
|
"autoClearKrontab": "0 0 0 * *",
|
||||||
"skipPostAge": 86400
|
"skipPostAge": 86400
|
||||||
},
|
},
|
||||||
"immediateDrop": -2
|
"immediateDrop": -6
|
||||||
|
},
|
||||||
|
"messagesChecker": {
|
||||||
|
"krontab": "0 0 0 * *",
|
||||||
|
"throttlingMillis": 1000,
|
||||||
|
"doFullCheck": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,22 +2,24 @@ version: "3.4"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
plaguposter_postgres:
|
plaguposter_postgres:
|
||||||
image: postgres
|
image: postgres:15.4-bullseye
|
||||||
container_name: "plaguposter_postgres"
|
container_name: "plaguposter_postgres"
|
||||||
restart: "unless-stopped"
|
restart: "unless-stopped"
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: "${PG_USER}"
|
POSTGRES_USER: "test"
|
||||||
POSTGRES_PASSWORD: "${PG_PASSWORD}"
|
POSTGRES_PASSWORD: "test"
|
||||||
POSTGRES_DB: "${PG_DB}"
|
POSTGRES_DB: "test"
|
||||||
volumes:
|
volumes:
|
||||||
- "${DATA_PATH}/db/:/var/lib/postgresql/"
|
- "./db/:/var/lib/postgresql/data"
|
||||||
|
- "/etc/timezone:/etc/timezone:ro"
|
||||||
plaguposter:
|
plaguposter:
|
||||||
image: insanusmokrassar/plaguposter
|
image: insanusmokrassar/plaguposter:latest
|
||||||
container_name: "plaguposter"
|
container_name: "plaguposter"
|
||||||
restart: "unless-stopped"
|
restart: "unless-stopped"
|
||||||
volumes:
|
volumes:
|
||||||
- "${DATA_PATH}/config.json:/config.json"
|
- "./config.json:/config.json"
|
||||||
links:
|
- "/etc/timezone:/etc/timezone:ro"
|
||||||
- "plaguposter_postgres:postgres"
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- "plaguposter_postgres"
|
- "plaguposter_postgres"
|
||||||
|
links:
|
||||||
|
- "plaguposter_postgres:postgres"
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ String[] includes = [
|
|||||||
":common",
|
":common",
|
||||||
":posts",
|
":posts",
|
||||||
":posts:panel",
|
":posts:panel",
|
||||||
|
":posts:gc",
|
||||||
":posts_registrar",
|
":posts_registrar",
|
||||||
":ratings",
|
":ratings",
|
||||||
":ratings:source",
|
":ratings:source",
|
||||||
@@ -11,7 +12,9 @@ String[] includes = [
|
|||||||
":ratings:gc",
|
":ratings:gc",
|
||||||
":triggers:command",
|
":triggers:command",
|
||||||
":triggers:selector_with_timer",
|
":triggers:selector_with_timer",
|
||||||
":triggers:selector_with_scheduling",
|
":triggers:timer",
|
||||||
|
":triggers:timer:disablers:ratings",
|
||||||
|
":triggers:timer:disablers:autoposts",
|
||||||
":inlines",
|
":inlines",
|
||||||
// ":settings",
|
// ":settings",
|
||||||
":runner"
|
":runner"
|
||||||
@@ -27,5 +30,3 @@ includes.each { originalName ->
|
|||||||
project.name = projectName
|
project.name = projectName
|
||||||
project.projectDir = new File(projectDirectory)
|
project.projectDir = new File(projectDirectory)
|
||||||
}
|
}
|
||||||
|
|
||||||
enableFeaturePreview("VERSION_CATALOGS")
|
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ object Plugin : Plugin {
|
|||||||
|
|
||||||
return@onCommand
|
return@onCommand
|
||||||
}
|
}
|
||||||
} ?: selector ?.take(1) ?.firstOrNull()
|
} ?: selector ?.takeOneOrNull()
|
||||||
if (postId == null) {
|
if (postId == null) {
|
||||||
reply(
|
reply(
|
||||||
it,
|
it,
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
package dev.inmo.plaguposter.triggers.selector_with_scheduling
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package dev.inmo.plaguposter.triggers.selector_with_scheduling
|
|
||||||
|
|
||||||
import dev.inmo.plagubot.Plugin
|
|
||||||
import kotlinx.serialization.json.*
|
|
||||||
import org.jetbrains.exposed.sql.Database
|
|
||||||
import org.koin.core.module.Module
|
|
||||||
|
|
||||||
object Plugin : Plugin {
|
|
||||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
<manifest package="dev.inmo.plaguposter.triggers.selector_with_scheduling"/>
|
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package dev.inmo.plaguposter.triggers.selector_with_timer
|
||||||
|
|
||||||
|
import korlibs.time.DateTime
|
||||||
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
|
|
||||||
|
fun interface AutopostFilter {
|
||||||
|
suspend fun check(postId: PostId, dateTime: DateTime): Boolean
|
||||||
|
}
|
||||||
@@ -1,14 +1,43 @@
|
|||||||
package dev.inmo.plaguposter.triggers.selector_with_timer
|
package dev.inmo.plaguposter.triggers.selector_with_timer
|
||||||
|
|
||||||
|
import korlibs.time.DateFormat
|
||||||
import dev.inmo.krontab.KrontabTemplate
|
import dev.inmo.krontab.KrontabTemplate
|
||||||
import dev.inmo.krontab.toSchedule
|
import dev.inmo.krontab.toSchedule
|
||||||
import dev.inmo.krontab.utils.asFlow
|
import dev.inmo.krontab.utils.asFlowWithDelays
|
||||||
|
import dev.inmo.krontab.utils.asFlowWithoutDelays
|
||||||
|
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
||||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
|
||||||
|
import dev.inmo.micro_utils.koin.singleWithRandomQualifier
|
||||||
|
import dev.inmo.micro_utils.pagination.FirstPagePagination
|
||||||
|
import dev.inmo.micro_utils.pagination.Pagination
|
||||||
|
import dev.inmo.micro_utils.pagination.firstIndex
|
||||||
|
import dev.inmo.micro_utils.pagination.lastIndexExclusive
|
||||||
import dev.inmo.plagubot.Plugin
|
import dev.inmo.plagubot.Plugin
|
||||||
|
import dev.inmo.plagubot.plugins.inline.queries.models.Format
|
||||||
|
import dev.inmo.plagubot.plugins.inline.queries.models.OfferTemplate
|
||||||
|
import dev.inmo.plagubot.plugins.inline.queries.repos.InlineTemplatesRepo
|
||||||
|
import dev.inmo.plaguposter.common.ChatConfig
|
||||||
|
import dev.inmo.plaguposter.posts.models.PostId
|
||||||
|
import dev.inmo.plaguposter.posts.repo.ReadPostsRepo
|
||||||
import dev.inmo.plaguposter.posts.sending.PostPublisher
|
import dev.inmo.plaguposter.posts.sending.PostPublisher
|
||||||
import dev.inmo.plaguposter.ratings.selector.Selector
|
import dev.inmo.plaguposter.ratings.selector.Selector
|
||||||
|
import dev.inmo.tgbotapi.extensions.api.answers.answer
|
||||||
|
import dev.inmo.tgbotapi.extensions.api.edit.edit
|
||||||
|
import dev.inmo.tgbotapi.extensions.api.send.send
|
||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||||
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
|
||||||
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMessageDataCallbackQuery
|
||||||
|
import dev.inmo.tgbotapi.extensions.utils.extensions.sameChat
|
||||||
|
import dev.inmo.tgbotapi.extensions.utils.formatting.makeLinkToMessage
|
||||||
|
import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
|
||||||
|
import dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard
|
||||||
|
import dev.inmo.tgbotapi.extensions.utils.types.buttons.urlButton
|
||||||
|
import dev.inmo.tgbotapi.types.BotCommand
|
||||||
|
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
|
||||||
|
import dev.inmo.tgbotapi.utils.row
|
||||||
import kotlinx.coroutines.FlowPreview
|
import kotlinx.coroutines.FlowPreview
|
||||||
|
import kotlinx.coroutines.flow.collectIndexed
|
||||||
|
import kotlinx.coroutines.flow.take
|
||||||
import kotlinx.serialization.*
|
import kotlinx.serialization.*
|
||||||
import kotlinx.serialization.json.*
|
import kotlinx.serialization.json.*
|
||||||
import org.jetbrains.exposed.sql.Database
|
import org.jetbrains.exposed.sql.Database
|
||||||
@@ -16,15 +45,22 @@ import org.koin.core.Koin
|
|||||||
import org.koin.core.module.Module
|
import org.koin.core.module.Module
|
||||||
|
|
||||||
object Plugin : Plugin {
|
object Plugin : Plugin {
|
||||||
@Serializable
|
private const val pageCallbackDataQueryPrefix = "publishing_autoschedule page"
|
||||||
|
private const val pageCallbackDataQuerySize = 5
|
||||||
|
@Serializable
|
||||||
internal data class Config(
|
internal data class Config(
|
||||||
@SerialName("krontab")
|
@SerialName("krontab")
|
||||||
val krontabTemplate: KrontabTemplate
|
val krontabTemplate: KrontabTemplate,
|
||||||
|
val dateTimeFormat: String = "HH:mm:ss, dd.MM.yyyy",
|
||||||
|
val retryOnPostFailureTimes: Int = 0
|
||||||
) {
|
) {
|
||||||
@Transient
|
@Transient
|
||||||
val krontab by lazy {
|
val krontab by lazy {
|
||||||
krontabTemplate.toSchedule()
|
krontabTemplate.toSchedule()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transient
|
||||||
|
val format: DateFormat = DateFormat(dateTimeFormat)
|
||||||
}
|
}
|
||||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||||
single { get<Json>().decodeFromJsonElement(Config.serializer(), params["timer_trigger"] ?: return@single null) }
|
single { get<Json>().decodeFromJsonElement(Config.serializer(), params["timer_trigger"] ?: return@single null) }
|
||||||
@@ -34,9 +70,117 @@ object Plugin : Plugin {
|
|||||||
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||||
val publisher = koin.get<PostPublisher>()
|
val publisher = koin.get<PostPublisher>()
|
||||||
val selector = koin.get<Selector>()
|
val selector = koin.get<Selector>()
|
||||||
koin.get<Config>().krontab.asFlow().subscribeSafelyWithoutExceptions(this) {
|
val filters = koin.getAll<AutopostFilter>().distinct()
|
||||||
selector.take(now = it).forEach { postId ->
|
val chatConfig = koin.get<ChatConfig>()
|
||||||
publisher.publish(postId)
|
val postsRepo = koin.get<ReadPostsRepo>()
|
||||||
|
|
||||||
|
koin.getOrNull<InlineTemplatesRepo>() ?.apply {
|
||||||
|
addTemplate(
|
||||||
|
OfferTemplate(
|
||||||
|
"Autoschedule buttons",
|
||||||
|
listOf(
|
||||||
|
Format(
|
||||||
|
"/autoschedule_panel"
|
||||||
|
)
|
||||||
|
),
|
||||||
|
"Show autoscheduling publishing info"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
val krontab = koin.get<Config>().krontab
|
||||||
|
val retryOnPostFailureTimes = koin.get<Config>().retryOnPostFailureTimes
|
||||||
|
val dateTimeFormat = koin.get<Config>().format
|
||||||
|
krontab.asFlowWithDelays().subscribeSafelyWithoutExceptions(this) { dateTime ->
|
||||||
|
var leftRetries = retryOnPostFailureTimes
|
||||||
|
do {
|
||||||
|
val success = runCatching {
|
||||||
|
selector.takeOneOrNull(now = dateTime) ?.let { postId ->
|
||||||
|
if (filters.all { it.check(postId, dateTime) }) {
|
||||||
|
publisher.publish(postId)
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
} ?: false
|
||||||
|
}.getOrElse {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
if (success) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
leftRetries--;
|
||||||
|
} while (leftRetries > 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun buildPage(pagination: Pagination = FirstPagePagination(size = pageCallbackDataQuerySize)): InlineKeyboardMarkup {
|
||||||
|
return inlineKeyboard {
|
||||||
|
row {
|
||||||
|
if (pagination.page > 1) {
|
||||||
|
dataButton("⬅️", "${pageCallbackDataQueryPrefix}0")
|
||||||
|
}
|
||||||
|
if (pagination.page > 0) {
|
||||||
|
dataButton("◀️", "${pageCallbackDataQueryPrefix}${pagination.page - 1}")
|
||||||
|
}
|
||||||
|
|
||||||
|
dataButton("\uD83D\uDD04 ${pagination.page}", "${pageCallbackDataQueryPrefix}${pagination.page}")
|
||||||
|
dataButton("▶️", "${pageCallbackDataQueryPrefix}${pagination.page + 1}")
|
||||||
|
}
|
||||||
|
|
||||||
|
val selected = mutableListOf<PostId>()
|
||||||
|
krontab.asFlowWithoutDelays().take(pagination.lastIndexExclusive).collectIndexed { i, dateTime ->
|
||||||
|
val postId = selector.takeOneOrNull(now = dateTime, exclude = selected) ?.also { postId ->
|
||||||
|
if (filters.all { it.check(postId, dateTime) }) {
|
||||||
|
selected.add(postId)
|
||||||
|
} else {
|
||||||
|
return@collectIndexed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val post = postsRepo.getFirstMessageInfo(postId ?: return@collectIndexed)
|
||||||
|
if (i < pagination.firstIndex || post == null) {
|
||||||
|
return@collectIndexed
|
||||||
|
}
|
||||||
|
|
||||||
|
row {
|
||||||
|
urlButton(
|
||||||
|
dateTime.local.format(dateTimeFormat),
|
||||||
|
makeLinkToMessage(post.chatId, post.messageId)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onCommand("autoschedule_panel", initialFilter = { chatConfig.allSourceChatIds.any { chatId -> it.sameChat(chatId) } }) {
|
||||||
|
val keyboard = buildPage()
|
||||||
|
|
||||||
|
runCatchingSafely {
|
||||||
|
edit(it, replyMarkup = keyboard) {
|
||||||
|
+"Your schedule:"
|
||||||
|
}
|
||||||
|
}.onFailure { _ ->
|
||||||
|
send(it.chat, replyMarkup = keyboard) {
|
||||||
|
+"Your schedule:"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMessageDataCallbackQuery(
|
||||||
|
Regex("^$pageCallbackDataQueryPrefix\\d+"),
|
||||||
|
initialFilter = { chatConfig.allSourceChatIds.any { sourceChatId -> it.message.sameChat(sourceChatId) } }
|
||||||
|
) {
|
||||||
|
val page = it.data.removePrefix(pageCallbackDataQueryPrefix).toIntOrNull() ?: let { _ ->
|
||||||
|
answer(it)
|
||||||
|
return@onMessageDataCallbackQuery
|
||||||
|
}
|
||||||
|
|
||||||
|
runCatchingSafely {
|
||||||
|
edit(
|
||||||
|
it.message,
|
||||||
|
replyMarkup = buildPage(Pagination(page, size = pageCallbackDataQuerySize))
|
||||||
|
)
|
||||||
|
}.onFailure { _ ->
|
||||||
|
answer(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ kotlin {
|
|||||||
commonMain {
|
commonMain {
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(":plaguposter.common")
|
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 korlibs.time.DateFormat
|
||||||
|
import korlibs.time.DateTime
|
||||||
|
import korlibs.time.DateTimeTz
|
||||||
|
import korlibs.time.Month
|
||||||
|
import korlibs.time.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 korlibs.time.DateTime
|
||||||
|
import korlibs.time.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"
|
||||||
|
}
|
||||||
|
}
|
||||||
58
triggers/timer/src/commonMain/kotlin/TimersHandler.kt
Normal file
58
triggers/timer/src/commonMain/kotlin/TimersHandler.kt
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
package dev.inmo.plaguposter.triggers.timer
|
||||||
|
|
||||||
|
import korlibs.time.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 korlibs.time.millisecondsLong
|
||||||
|
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 korlibs.time.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 korlibs.time.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 korlibs.time.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