mirror of
https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
synced 2026-04-07 01:52:29 +00:00
Compare commits
30 Commits
0.26.2
...
renovate/p
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7d1f77a2bd | ||
| 7729ada3bb | |||
| 58c4fe90b9 | |||
| 60cbe3bb70 | |||
| 63f15e96bf | |||
| 167f302eff | |||
| 8332ed482e | |||
| 061bac146c | |||
| 00fc2a1e0b | |||
| 1e2e45c404 | |||
| 17398781a5 | |||
| f86dbcefce | |||
| e4aba03cdc | |||
| c8f8608a60 | |||
| 19fcee9f3e | |||
| 825e6474cc | |||
| ff99bdd45d | |||
| 2ae7507c01 | |||
| 7b30d95f56 | |||
| bbe9367ef3 | |||
| 6403fe6f5d | |||
| 3cad9ec337 | |||
| 78e5da9db7 | |||
| 74329a8eb2 | |||
| 953df71d9e | |||
| c25f6d522f | |||
| d569f46e48 | |||
| f2731f6e7d | |||
| f10c7412f4 | |||
| a113e6e37e |
17
build.gradle
17
build.gradle
@@ -13,6 +13,23 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
id "com.gradleup.nmcp.aggregation" version "$nmcp_version"
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||||
|
nmcpAggregation {
|
||||||
|
centralPortal {
|
||||||
|
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')
|
||||||
|
validationTimeout = Duration.ofHours(4)
|
||||||
|
publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
|
||||||
|
}
|
||||||
|
|
||||||
|
publishAllProjectsProbablyBreakingProjectIsolation()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ class DefaultAdminsCacheAPIRepoImpl(
|
|||||||
private val scope: CoroutineScope
|
private val scope: CoroutineScope
|
||||||
) : DefaultAdminsCacheAPIRepo {
|
) : DefaultAdminsCacheAPIRepo {
|
||||||
private val actor = scope.actorAsync<RepoActions<*>>(Channel.UNLIMITED) {
|
private val actor = scope.actorAsync<RepoActions<*>>(Channel.UNLIMITED) {
|
||||||
safelyWithoutExceptions(
|
runCatchingLogging (
|
||||||
{ e ->
|
{ e ->
|
||||||
it.deferred.completeExceptionally(e)
|
it.deferred.completeExceptionally(e)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import kotlinx.serialization.*
|
|||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import kotlinx.serialization.modules.SerializersModule
|
import kotlinx.serialization.modules.SerializersModule
|
||||||
import kotlinx.serialization.modules.polymorphic
|
import kotlinx.serialization.modules.polymorphic
|
||||||
import org.jetbrains.exposed.sql.Database
|
import org.jetbrains.exposed.v1.jdbc.Database
|
||||||
|
|
||||||
val telegramAdminsSerializationFormat = Json {
|
val telegramAdminsSerializationFormat = Json {
|
||||||
ignoreUnknownKeys = true
|
ignoreUnknownKeys = true
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import kotlinx.coroutines.sync.Mutex
|
|||||||
import kotlinx.coroutines.sync.withLock
|
import kotlinx.coroutines.sync.withLock
|
||||||
import kotlinx.serialization.*
|
import kotlinx.serialization.*
|
||||||
import kotlinx.serialization.json.JsonObject
|
import kotlinx.serialization.json.JsonObject
|
||||||
import org.jetbrains.exposed.sql.Database
|
import org.jetbrains.exposed.v1.jdbc.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.core.qualifier.named
|
import org.koin.core.qualifier.named
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
package dev.inmo.tgbotapi.libraries.cache.media.common
|
package dev.inmo.tgbotapi.libraries.cache.media.common
|
||||||
|
|
||||||
import dev.inmo.tgbotapi.bot.TelegramBot
|
import dev.inmo.tgbotapi.bot.TelegramBot
|
||||||
|
import dev.inmo.tgbotapi.requests.DeleteMessage
|
||||||
import dev.inmo.tgbotapi.requests.DownloadFileStream
|
import dev.inmo.tgbotapi.requests.DownloadFileStream
|
||||||
|
import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
|
||||||
import dev.inmo.tgbotapi.requests.get.GetFile
|
import dev.inmo.tgbotapi.requests.get.GetFile
|
||||||
import dev.inmo.tgbotapi.requests.send.media.*
|
import dev.inmo.tgbotapi.requests.send.media.*
|
||||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||||
import dev.inmo.tgbotapi.types.media.*
|
import dev.inmo.tgbotapi.types.media.*
|
||||||
|
import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
|
||||||
|
import dev.inmo.tgbotapi.types.message.content.DocumentContent
|
||||||
import dev.inmo.tgbotapi.types.message.content.MediaContent
|
import dev.inmo.tgbotapi.types.message.content.MediaContent
|
||||||
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
||||||
import dev.inmo.tgbotapi.utils.asInput
|
import dev.inmo.tgbotapi.utils.asInput
|
||||||
@@ -58,6 +62,30 @@ class DefaultMessageContentCache<K>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override suspend fun sendAndSave(
|
||||||
|
k: K,
|
||||||
|
filename: String,
|
||||||
|
inputAllocator: () -> Input
|
||||||
|
): DocumentContent {
|
||||||
|
val sentDocument = bot.execute(
|
||||||
|
SendDocument(
|
||||||
|
filesRefreshingChatId,
|
||||||
|
MultipartFile(filename, inputAllocator),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
save(k, sentDocument.content, filename, inputAllocator)
|
||||||
|
runCatching {
|
||||||
|
bot.execute(
|
||||||
|
DeleteMessage(
|
||||||
|
sentDocument.chat.id,
|
||||||
|
sentDocument.messageId
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return sentDocument.content
|
||||||
|
}
|
||||||
|
|
||||||
override suspend fun get(k: K): MessageContent? {
|
override suspend fun get(k: K): MessageContent? {
|
||||||
val savedSimpleContent = simpleMessageContentCache.get(k) ?: return null
|
val savedSimpleContent = simpleMessageContentCache.get(k) ?: return null
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package dev.inmo.tgbotapi.libraries.cache.media.common
|
package dev.inmo.tgbotapi.libraries.cache.media.common
|
||||||
|
|
||||||
|
import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
|
||||||
|
import dev.inmo.tgbotapi.types.message.content.DocumentContent
|
||||||
import dev.inmo.tgbotapi.types.message.content.MediaContent
|
import dev.inmo.tgbotapi.types.message.content.MediaContent
|
||||||
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
||||||
import io.ktor.utils.io.core.Input
|
import io.ktor.utils.io.core.Input
|
||||||
@@ -12,6 +14,11 @@ interface MessageContentCache<K> {
|
|||||||
filename: String,
|
filename: String,
|
||||||
inputAllocator: suspend () -> Input
|
inputAllocator: suspend () -> Input
|
||||||
)
|
)
|
||||||
|
suspend fun sendAndSave(
|
||||||
|
k: K,
|
||||||
|
filename: String,
|
||||||
|
inputAllocator: () -> Input
|
||||||
|
): DocumentContent
|
||||||
|
|
||||||
suspend fun get(k: K): MessageContent?
|
suspend fun get(k: K): MessageContent?
|
||||||
suspend fun contains(k: K): Boolean
|
suspend fun contains(k: K): Boolean
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
@file:Suppress("RemoveExplicitTypeArguments", "unused")
|
||||||
|
|
||||||
package dev.inmo.tgbotapi.libraries.cache.media.micro_utils
|
package dev.inmo.tgbotapi.libraries.cache.media.micro_utils
|
||||||
|
|
||||||
import dev.inmo.micro_utils.repos.*
|
import dev.inmo.micro_utils.repos.*
|
||||||
@@ -8,7 +10,6 @@ import dev.inmo.tgbotapi.types.MessageId
|
|||||||
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
import dev.inmo.tgbotapi.types.message.content.MessageContent
|
||||||
import kotlinx.serialization.*
|
import kotlinx.serialization.*
|
||||||
import kotlinx.serialization.builtins.PairSerializer
|
import kotlinx.serialization.builtins.PairSerializer
|
||||||
import kotlinx.serialization.builtins.serializer
|
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import kotlinx.serialization.modules.SerializersModule
|
import kotlinx.serialization.modules.SerializersModule
|
||||||
import kotlin.js.JsName
|
import kotlin.js.JsName
|
||||||
@@ -52,11 +53,12 @@ val chatIdToMessageIdentifierSerializer = PairSerializer(
|
|||||||
|
|
||||||
val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class)
|
val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class)
|
||||||
|
|
||||||
inline fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleKeyValueMessageContentCache(this)
|
fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleKeyValueMessageContentCache(this)
|
||||||
|
|
||||||
inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
||||||
serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } }
|
serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } }
|
||||||
): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
|
): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
|
||||||
|
@Suppress("OPT_IN_USAGE")
|
||||||
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
||||||
return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>(
|
return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>(
|
||||||
{ serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) },
|
{ serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) },
|
||||||
@@ -71,6 +73,7 @@ inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
|||||||
inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
||||||
serialFormatCreator: (SerializersModule) -> BinaryFormat
|
serialFormatCreator: (SerializersModule) -> BinaryFormat
|
||||||
): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
|
): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
|
||||||
|
@Suppress("OPT_IN_USAGE")
|
||||||
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
||||||
return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>(
|
return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>(
|
||||||
{ serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) },
|
{ serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) },
|
||||||
@@ -85,6 +88,7 @@ inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
|||||||
inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache(
|
inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache(
|
||||||
serialFormatCreator: (SerializersModule) -> BinaryFormat
|
serialFormatCreator: (SerializersModule) -> BinaryFormat
|
||||||
): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
|
): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
|
||||||
|
@Suppress("OPT_IN_USAGE")
|
||||||
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
||||||
return withMapper<Pair<ChatId, MessageId>, MessageContent, ByteArray, ByteArray>(
|
return withMapper<Pair<ChatId, MessageId>, MessageContent, ByteArray, ByteArray>(
|
||||||
{ serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) },
|
{ serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) },
|
||||||
|
|||||||
@@ -6,21 +6,23 @@ kotlin.incremental=true
|
|||||||
kotlin.incremental.js=true
|
kotlin.incremental.js=true
|
||||||
|
|
||||||
|
|
||||||
kotlin_version=2.1.10
|
kotlin_version=2.3.10
|
||||||
kotlin_serialisation_core_version=1.8.0
|
kotlin_serialisation_core_version=1.10.0
|
||||||
|
|
||||||
github_release_plugin_version=2.5.2
|
github_release_plugin_version=2.5.2
|
||||||
|
|
||||||
tgbotapi_version=23.1.2
|
tgbotapi_version=32.0.0
|
||||||
micro_utils_version=0.24.5
|
micro_utils_version=0.29.1
|
||||||
exposed_version=0.58.0
|
exposed_version=1.1.1
|
||||||
plagubot_version=10.3.1
|
plagubot_version=11.1.1
|
||||||
|
|
||||||
|
nmcp_version=1.4.4
|
||||||
|
|
||||||
# Dokka
|
# Dokka
|
||||||
|
|
||||||
dokka_version=2.0.0
|
dokka_version=2.1.0
|
||||||
|
|
||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.26.2
|
version=0.29.0
|
||||||
|
|||||||
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-8.12.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
Reference in New Issue
Block a user