InsanusMokrassar
/
PlaguPoster
mirror of https://github.com/InsanusMokrassar/PlaguPoster.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from InsanusMokrassar/0.2.3 

0.2.3
This commit is contained in:
InsanusMokrassar 2023-08-13 00:04:27 +06:00 committed by GitHub
parent 57eebb61d5 54eb7515d3
commit feef8efee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 90 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
# PlaguPoster
## 0.2.3
* Add opportunity to use several target chat ids
* Update dependencies
## 0.2.2
* `GarbageCollector`:

17
common/src/commonMain/kotlin/ChatConfig.kt
View File

@ -1,6 +1,5 @@
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
@ -10,14 +9,26 @@ import kotlinx.serialization.Serializable
data class ChatConfig(
@SerialName("targetChat")
@Serializable(FullChatIdentifierSerializer::class)
val targetChatId: IdChatIdentifier,
val targetChatId: IdChatIdentifier? = null,
@SerialName("sourceChat")
@Serializable(FullChatIdentifierSerializer::class)
val sourceChatId: IdChatIdentifier,
@SerialName("cacheChat")
@Serializable(FullChatIdentifierSerializer::class)
val cacheChatId: IdChatIdentifier
val cacheChatId: IdChatIdentifier,
@SerialName("targetChats")
val targetChatIds: List<@Serializable(FullChatIdentifierSerializer::class) IdChatIdentifier> = emptyList(),
) {
val allTargetChatIds by lazy {
listOfNotNull(targetChatId) + targetChatIds
}
init {
require(targetChatId != null || targetChatIds.isNotEmpty()) {
"One of fields, 'targetChat' or 'targetChats' should be presented"
}
}
fun check(chatId: IdChatIdentifier) = when (chatId) {
targetChatId,
sourceChatId,

2
common/src/commonMain/kotlin/DateTimeSerializer.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.common
import com.soywiz.klock.DateTime
import korlibs.time.DateTime
import kotlinx.serialization.KSerializer
import kotlinx.serialization.Serializer
import kotlinx.serialization.builtins.serializer

3
common/src/jvmMain/kotlin/CommonPlugin.kt
View File

@ -1,6 +1,5 @@
package dev.inmo.plaguposter.common
import dev.inmo.kslog.common.i
import dev.inmo.kslog.common.iS
import dev.inmo.kslog.common.logger
import dev.inmo.plagubot.Plugin
@ -27,7 +26,7 @@ object CommonPlugin : Plugin {
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
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 { "Cache chat info: ${getChat(config.cacheChatId)}" }
}

2
gradle.properties
View File

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

18
gradle/libs.versions.toml
View File

@ -1,16 +1,16 @@
[versions]
kotlin = "1.8.21"
kotlin-serialization = "1.5.0"
kotlin = "1.8.22"
kotlin-serialization = "1.5.1"
plagubot = "5.1.2"
tgbotapi = "7.1.2"
microutils = "0.18.1"
kslog = "1.1.1"
krontab = "1.0.0"
plagubot-plugins = "0.11.2"
plagubot = "7.0.0"
tgbotapi = "9.0.0"
microutils = "0.19.9"
kslog = "1.1.2"
krontab = "2.1.2"
plagubot-plugins = "0.13.0"
dokka = "1.8.10"
dokka = "1.8.20"
psql = "42.6.0"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

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

2
posts/src/commonMain/kotlin/models/Post.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.posts.models
import com.soywiz.klock.DateTime
import korlibs.time.DateTime
import dev.inmo.plaguposter.common.DateTimeSerializer
import dev.inmo.tgbotapi.types.ChatId
import kotlinx.serialization.Serializable

2
posts/src/commonMain/kotlin/repo/ReadPostsRepo.kt
View File

@ -1,6 +1,6 @@
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.plaguposter.posts.models.*
import dev.inmo.tgbotapi.types.ChatId

42
posts/src/commonMain/kotlin/sending/PostPublisher.kt
View File

@ -18,7 +18,7 @@ class PostPublisher(
private val bot: TelegramBot,
private val postsRepo: PostsRepo,
private val cachingChatId: IdChatIdentifier,
private val targetChatId: IdChatIdentifier,
private val targetChatIds: List<IdChatIdentifier>,
private val deleteAfterPosting: Boolean = true
) {
suspend fun publish(postId: PostId) {
@ -38,17 +38,19 @@ class PostPublisher(
sortedMessagesContents.forEach { (_, contents) ->
contents.singleOrNull() ?.also {
runCatching {
bot.copyMessage(targetChatId, it.chatId, it.messageId)
}.onFailure { _ ->
targetChatIds.forEach { targetChatId ->
runCatching {
bot.forwardMessage(
it.chatId,
targetChatId,
it.messageId
)
}.onSuccess {
bot.copyMessage(targetChatId, it)
bot.copyMessage(targetChatId, it.chatId, it.messageId)
}.onFailure { _ ->
runCatching {
bot.forwardMessage(
it.chatId,
targetChatId,
it.messageId
)
}.onSuccess {
bot.copyMessage(targetChatId, it)
}
}
}
return@forEach
@ -57,17 +59,23 @@ class PostPublisher(
it.order to (bot.forwardMessage(toChatId = cachingChatId, fromChatId = it.chatId, messageId = it.messageId).contentMessageOrNull() ?: return@mapNotNull null)
}.sortedBy { it.first }.mapNotNull { (_, forwardedMessage) ->
forwardedMessage.withContentOrNull<MediaGroupPartContent>() ?: null.also { _ ->
bot.copyMessage(targetChatId, forwardedMessage)
targetChatIds.forEach { targetChatId ->
bot.copyMessage(targetChatId, forwardedMessage)
}
}
}
resultContents.singleOrNull() ?.also {
bot.copyMessage(targetChatId, it)
targetChatIds.forEach { targetChatId ->
bot.copyMessage(targetChatId, it)
}
return@forEach
} ?: resultContents.chunked(mediaCountInMediaGroup.last).forEach {
bot.send(
targetChatId,
it.map { it.content.toMediaGroupMemberTelegramMedia() }
)
targetChatIds.forEach { targetChatId ->
bot.send(
targetChatId,
it.map { it.content.toMediaGroupMemberTelegramMedia() }
)
}
}
}

3
posts/src/jvmMain/kotlin/Plugin.kt
View File

@ -29,7 +29,6 @@ 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 {
@Serializable
@ -59,7 +58,7 @@ object Plugin : Plugin {
}
single {
val config = get<Config>()
PostPublisher(get(), get(), config.chats.cacheChatId, config.chats.targetChatId, config.deleteAfterPublishing)
PostPublisher(get(), get(), config.chats.cacheChatId, config.chats.allTargetChatIds, config.deleteAfterPublishing)
}
}

3
posts/src/jvmMain/kotlin/cached/CachedPostsRepo.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.posts.cached
import com.soywiz.klock.DateTime
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
@ -25,6 +25,7 @@ class CachedPostsRepo(
parentRepo,
kvCache,
scope,
skipStartInvalidate = false,
{ it.id }
) {
override val removedPostsFlow: Flow<RegisteredPost> by parentRepo::removedPostsFlow

2
posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.plaguposter.posts.exposed
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.UpdatedValuePair
import dev.inmo.micro_utils.repos.exposed.AbstractExposedCRUDRepo

4
ratings/gc/src/jvmMain/kotlin/Plugin.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.plaguposter.ratings.gc
import com.soywiz.klock.DateTime
import com.soywiz.klock.seconds
import korlibs.time.DateTime
import korlibs.time.seconds
import dev.inmo.krontab.KrontabTemplate
import dev.inmo.krontab.toSchedule
import dev.inmo.krontab.utils.asFlowWithDelays

2
ratings/selector/src/commonMain/kotlin/DefaultSelector.kt
View File

@ -1,6 +1,6 @@
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.repo.PostsRepo
import dev.inmo.plaguposter.ratings.repo.RatingsRepo

2
ratings/selector/src/commonMain/kotlin/Selector.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.ratings.selector
import com.soywiz.klock.DateTime
import korlibs.time.DateTime
import dev.inmo.plaguposter.posts.models.PostId
interface Selector {

4
ratings/selector/src/commonMain/kotlin/models/RatingConfig.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.plaguposter.ratings.selector.models
import com.soywiz.klock.DateTime
import com.soywiz.klock.seconds
import korlibs.time.DateTime
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

4
ratings/selector/src/commonMain/kotlin/models/SelectorConfig.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.plaguposter.ratings.selector.models
import com.soywiz.klock.DateTime
import com.soywiz.klock.Time
import korlibs.time.DateTime
import korlibs.time.Time
import kotlinx.serialization.Serializable
@Serializable

2
ratings/selector/src/commonMain/kotlin/models/TimeConfig.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.ratings.selector.models
import com.soywiz.klock.*
import korlibs.time.*
import kotlinx.serialization.*
import kotlinx.serialization.builtins.serializer
import kotlinx.serialization.descriptors.SerialDescriptor

2
ratings/source/src/commonMain/kotlin/buttons/RootButtons.kt
View File

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

5
ratings/source/src/commonMain/kotlin/repos/CachedPollsToMessagesInfoRepo.kt
View File

@ -1,9 +1,8 @@
package dev.inmo.plaguposter.ratings.source.repos
import dev.inmo.micro_utils.repos.KeyValueRepo
import dev.inmo.micro_utils.repos.cache.KeyValueCacheRepo
import dev.inmo.micro_utils.repos.cache.cache.FullKVCache
import dev.inmo.micro_utils.repos.cache.full.cached
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
@ -12,4 +11,4 @@ class CachedPollsToMessagesInfoRepo(
private val repo: PollsToMessagesInfoRepo,
private val scope: CoroutineScope,
private val kvCache: FullKVCache<PollIdentifier, ShortMessageInfo> = FullKVCache()
) : PollsToMessagesInfoRepo, KeyValueRepo<PollIdentifier, ShortMessageInfo> by repo.cached(kvCache, scope)
) : PollsToMessagesInfoRepo, KeyValueRepo<PollIdentifier, ShortMessageInfo> by repo.fullyCached(kvCache, scope)

5
ratings/source/src/commonMain/kotlin/repos/CachedPollsToPostsIdsRepo.kt
View File

@ -2,8 +2,7 @@ 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.cached
import dev.inmo.plaguposter.common.ShortMessageInfo
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
@ -12,4 +11,4 @@ class CachedPollsToPostsIdsRepo(
private val repo: PollsToPostsIdsRepo,
private val scope: CoroutineScope,
private val kvCache: FullKVCache<PollIdentifier, PostId> = FullKVCache()
) : PollsToPostsIdsRepo, KeyValueRepo<PollIdentifier, PostId> by repo.cached(kvCache, scope)
) : PollsToPostsIdsRepo, KeyValueRepo<PollIdentifier, PostId> by repo.fullyCached(kvCache, scope)

2
triggers/selector_with_timer/src/commonMain/kotlin/AutopostFilter.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.triggers.selector_with_timer
import com.soywiz.klock.DateTime
import korlibs.time.DateTime
import dev.inmo.plaguposter.posts.models.PostId
fun interface AutopostFilter {

2
triggers/selector_with_timer/src/jvmMain/kotlin/Plugin.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.triggers.selector_with_timer
import com.soywiz.klock.DateFormat
import korlibs.time.DateFormat
import dev.inmo.krontab.KrontabTemplate
import dev.inmo.krontab.toSchedule
import dev.inmo.krontab.utils.asFlowWithDelays

10
triggers/timer/src/commonMain/kotlin/ButtonsBuilder.kt
View File

@ -1,10 +1,10 @@
package dev.inmo.plaguposter.triggers.timer
import com.soywiz.klock.DateFormat
import com.soywiz.klock.DateTime
import com.soywiz.klock.DateTimeTz
import com.soywiz.klock.Month
import com.soywiz.klock.Year
import 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

4
triggers/timer/src/commonMain/kotlin/NearestAvailablePublishingTime.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.plaguposter.triggers.timer
import com.soywiz.klock.DateTime
import com.soywiz.klock.minutes
import korlibs.time.DateTime
import korlibs.time.minutes
fun nearestAvailableTimerTime() = (DateTime.now() + 1.minutes).copyDayOfMonth(
milliseconds = 0,

2
triggers/timer/src/commonMain/kotlin/TimersHandler.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.triggers.timer
import com.soywiz.klock.DateTime
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

2
triggers/timer/src/commonMain/kotlin/TimersRepo.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.triggers.timer
import com.soywiz.klock.DateTime
import korlibs.time.DateTime
import dev.inmo.micro_utils.repos.KeyValueRepo
import dev.inmo.plaguposter.posts.models.PostId

2
triggers/timer/src/jvmMain/kotlin/Plugin.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.triggers.timer
import com.soywiz.klock.DateTime
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

2
triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.plaguposter.triggers.timer.repo
import com.soywiz.klock.DateTime
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