mirror of
https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
synced 2025-10-26 17:50:20 +00:00
Compare commits
153 Commits
0.6.4
...
renovate/g
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
03871c28d7 | ||
| 061bac146c | |||
| 00fc2a1e0b | |||
| 1e2e45c404 | |||
| 17398781a5 | |||
| f86dbcefce | |||
| e4aba03cdc | |||
| c8f8608a60 | |||
| 19fcee9f3e | |||
| 825e6474cc | |||
| ff99bdd45d | |||
| 2ae7507c01 | |||
| 7b30d95f56 | |||
| bbe9367ef3 | |||
| 6403fe6f5d | |||
| 3cad9ec337 | |||
| 78e5da9db7 | |||
| 74329a8eb2 | |||
| 953df71d9e | |||
| c25f6d522f | |||
| d569f46e48 | |||
| f2731f6e7d | |||
| f10c7412f4 | |||
| a113e6e37e | |||
| 7c6005bea3 | |||
| 3f6067b34e | |||
| af72bba116 | |||
| 84f04fb1f0 | |||
| 5524fc9fa0 | |||
| d0eebc0ace | |||
| 891dab1f4b | |||
| 9f6895a530 | |||
| 49084169d2 | |||
|
|
684172cc08 | ||
| 1457cfc748 | |||
| 6784a3c49a | |||
| 8ef89a32c7 | |||
| d16de6428a | |||
| 49475a457d | |||
| b8312873b0 | |||
| 3ede07c2a6 | |||
| a0e17a664c | |||
| fc3bf19453 | |||
| 8d1c57700e | |||
| 00c0f0fd6f | |||
| 551eb293ab | |||
| f1b58a889f | |||
| 36a0f9b65b | |||
| 86abe49bc1 | |||
| 5b62bfa7d3 | |||
| d94d847715 | |||
| 91013b914d | |||
| cec4c610f3 | |||
| b9003388b1 | |||
| 6d161c2d78 | |||
| dc63639fee | |||
| 66934c823d | |||
| 90870c225c | |||
| 106d01775c | |||
| cea2f7dc6e | |||
| 7d461edc9b | |||
| c52c6cb633 | |||
| 6db1755ee7 | |||
| ccf60c95ca | |||
| 4057d5167f | |||
| f19664da58 | |||
| 646a551b15 | |||
| a08974e76d | |||
| 30e62041c0 | |||
| be8fe43e76 | |||
| 42f3a064ad | |||
| 34f9d8c0ab | |||
| 6e4fc54a23 | |||
| 674ee28991 | |||
| 4950fd4ed0 | |||
| e3f5ae0b24 | |||
| 3bf2d858eb | |||
| b51bc97551 | |||
| c0680932ab | |||
| 849edadab0 | |||
| f02933a9d0 | |||
| f018b723cb | |||
| 65d8fd6be1 | |||
| d44c13bea5 | |||
| 50c1e33b52 | |||
| 41b9001e1f | |||
| 2c44a4e580 | |||
| ffa9525c70 | |||
| 4f2df31e5e | |||
| 18f9318b63 | |||
| c97a48dcd4 | |||
| caaba32f9a | |||
| 2734fc0adc | |||
| 9c2e271d57 | |||
| 3edb5b1b11 | |||
| 82d859272f | |||
| 64952fb054 | |||
| bd4e3d2380 | |||
| d77e08631c | |||
| 90e063a47a | |||
| a988117037 | |||
| 50d8511db5 | |||
| cf5b02057d | |||
| 64305c9393 | |||
| b4107cff26 | |||
| 23d68c9aa5 | |||
| 735e23cadb | |||
| 59b32f9b9a | |||
| b8601d4c90 | |||
| 240ee3de6f | |||
| 300ff6514b | |||
| ce85622876 | |||
| bd9e6045a3 | |||
| e8a41d97e8 | |||
| e2e329a757 | |||
| c69dd61eb9 | |||
| cf13bfadde | |||
| 6e33649e6c | |||
| 40dd4b166f | |||
| 95adaef36f | |||
| 8386690090 | |||
| 0f02910766 | |||
| 46b694c72b | |||
| 1bf9a1570f | |||
| f24825bcbc | |||
| 5b560118c0 | |||
| c27b5647d7 | |||
| 6a5cd2f469 | |||
| 69c819162d | |||
| 7a603c21b8 | |||
| bfebd1de50 | |||
| cbbe283305 | |||
| a2dab361cf | |||
| ac89551ac4 | |||
| 0b0d1e4ea5 | |||
| 9b056656e3 | |||
| 9023cc5acc | |||
| 617b8091db | |||
| 88a89ff1e7 | |||
| c211002ac1 | |||
| 50f592f52c | |||
| efeb15b971 | |||
| d33ca67c7c | |||
| f59ff6dd3c | |||
| 8f643a7d5b | |||
| 980badd275 | |||
| a2e65f7b24 | |||
| f86cef7118 | |||
| 2278572cb2 | |||
| 3ce3b03f02 | |||
| 48b5f88359 | |||
| 0bb7257ec3 | |||
| 2b503786ca |
5
.github/workflows/commit-publish.yml
vendored
5
.github/workflows/commit-publish.yml
vendored
@@ -7,10 +7,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-java@v1
|
- uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
java-version: 11
|
java-version: 17
|
||||||
- name: Fix android 32.0.0 dx
|
|
||||||
continue-on-error: true
|
|
||||||
run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib && mv d8.jar dx.jar
|
|
||||||
- name: Update version
|
- name: Update version
|
||||||
run: |
|
run: |
|
||||||
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,4 +1,5 @@
|
|||||||
.idea
|
.idea
|
||||||
|
.kotlin
|
||||||
out/*
|
out/*
|
||||||
*.iml
|
*.iml
|
||||||
target
|
target
|
||||||
|
|||||||
19
build.gradle
19
build.gradle
@@ -13,12 +13,29 @@ 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()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
google()
|
google()
|
||||||
maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
|
maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
package dev.inmo.tgbotapi.libraries.cache.admins
|
package dev.inmo.tgbotapi.libraries.cache.admins
|
||||||
|
|
||||||
import com.soywiz.klock.minutes
|
import korlibs.time.minutes
|
||||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||||
import dev.inmo.tgbotapi.types.Seconds
|
import dev.inmo.tgbotapi.types.Seconds
|
||||||
|
import korlibs.time.seconds
|
||||||
import kotlinx.coroutines.flow.SharedFlow
|
import kotlinx.coroutines.flow.SharedFlow
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package dev.inmo.tgbotapi.libraries.cache.admins
|
package dev.inmo.tgbotapi.libraries.cache.admins
|
||||||
|
|
||||||
import com.soywiz.klock.DateTime
|
import korlibs.time.DateTime
|
||||||
import dev.inmo.tgbotapi.bot.TelegramBot
|
import dev.inmo.tgbotapi.bot.TelegramBot
|
||||||
import dev.inmo.tgbotapi.extensions.api.bot.getMe
|
import dev.inmo.tgbotapi.extensions.api.bot.getMe
|
||||||
import dev.inmo.tgbotapi.extensions.api.chat.members.getChatMember
|
import dev.inmo.tgbotapi.extensions.api.chat.members.getChatMember
|
||||||
@@ -8,6 +8,7 @@ import dev.inmo.tgbotapi.types.*
|
|||||||
import dev.inmo.tgbotapi.types.chat.ExtendedBot
|
import dev.inmo.tgbotapi.types.chat.ExtendedBot
|
||||||
import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
|
import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
|
||||||
import dev.inmo.tgbotapi.types.message.abstracts.*
|
import dev.inmo.tgbotapi.types.message.abstracts.*
|
||||||
|
import korlibs.time.seconds
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
interface DefaultAdminsCacheAPIRepo {
|
interface DefaultAdminsCacheAPIRepo {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package dev.inmo.tgbotapi.libraries.cache.admins.micro_utils
|
package dev.inmo.tgbotapi.libraries.cache.admins.micro_utils
|
||||||
|
|
||||||
import com.soywiz.klock.DateTime
|
import korlibs.time.DateTime
|
||||||
import dev.inmo.micro_utils.coroutines.*
|
import dev.inmo.micro_utils.coroutines.*
|
||||||
import dev.inmo.micro_utils.repos.*
|
import dev.inmo.micro_utils.repos.*
|
||||||
import dev.inmo.tgbotapi.libraries.cache.admins.DefaultAdminsCacheAPIRepo
|
import dev.inmo.tgbotapi.libraries.cache.admins.DefaultAdminsCacheAPIRepo
|
||||||
|
|||||||
@@ -38,8 +38,8 @@ fun TelegramBot.createAdminsCacheAPI(
|
|||||||
{ long("chatId") },
|
{ long("chatId") },
|
||||||
{ text("member") },
|
{ text("member") },
|
||||||
"AdminsTable"
|
"AdminsTable"
|
||||||
).withMapper<IdChatIdentifier, AdministratorChatMember, Identifier, String>(
|
).withMapper<IdChatIdentifier, AdministratorChatMember, Long, String>(
|
||||||
keyFromToTo = { chatId },
|
keyFromToTo = { chatId.long },
|
||||||
valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdministratorChatMember.serializer(), this) },
|
valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdministratorChatMember.serializer(), this) },
|
||||||
keyToToFrom = { toChatId() },
|
keyToToFrom = { toChatId() },
|
||||||
valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdministratorChatMember.serializer(), this) }
|
valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdministratorChatMember.serializer(), this) }
|
||||||
@@ -49,8 +49,8 @@ fun TelegramBot.createAdminsCacheAPI(
|
|||||||
{ long("chatId") },
|
{ long("chatId") },
|
||||||
{ long("datetime") },
|
{ long("datetime") },
|
||||||
"AdminsUpdatesTimesTable"
|
"AdminsUpdatesTimesTable"
|
||||||
).withMapper<IdChatIdentifier, Long, Identifier, Long>(
|
).withMapper<IdChatIdentifier, Long, Long, Long>(
|
||||||
keyFromToTo = { chatId },
|
keyFromToTo = { chatId.long },
|
||||||
valueFromToTo = { this },
|
valueFromToTo = { this },
|
||||||
keyToToFrom = { toChatId() },
|
keyToToFrom = { toChatId() },
|
||||||
valueToToFrom = { this }
|
valueToToFrom = { this }
|
||||||
@@ -63,8 +63,8 @@ fun TelegramBot.createAdminsCacheAPI(
|
|||||||
{ long("chatId") },
|
{ long("chatId") },
|
||||||
{ text("settings") },
|
{ text("settings") },
|
||||||
"DynamicAdminsCacheSettingsAPI"
|
"DynamicAdminsCacheSettingsAPI"
|
||||||
).withMapper<IdChatIdentifier, AdminsCacheSettings, Identifier, String>(
|
).withMapper<IdChatIdentifier, AdminsCacheSettings, Long, String>(
|
||||||
keyFromToTo = { chatId },
|
keyFromToTo = { chatId.long },
|
||||||
valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdminsCacheSettings.serializer() , this) },
|
valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdminsCacheSettings.serializer() , this) },
|
||||||
keyToToFrom = { toChatId() },
|
keyToToFrom = { toChatId() },
|
||||||
valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdminsCacheSettings.serializer() , this) }
|
valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdminsCacheSettings.serializer() , this) }
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
|
|||||||
import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedKeyValuesRepo
|
import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedKeyValuesRepo
|
||||||
import dev.inmo.micro_utils.repos.mappers.withMapper
|
import dev.inmo.micro_utils.repos.mappers.withMapper
|
||||||
import dev.inmo.plagubot.Plugin
|
import dev.inmo.plagubot.Plugin
|
||||||
|
import dev.inmo.plagubot.database
|
||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||||
import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepoImpl
|
import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepoImpl
|
||||||
import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DynamicAdminsCacheSettingsAPI
|
import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DynamicAdminsCacheSettingsAPI
|
||||||
@@ -44,7 +45,7 @@ class AdminsPlugin : Plugin {
|
|||||||
return flow.filterNotNull().first()
|
return flow.filterNotNull().first()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
override fun Module.setupDI(config: JsonObject) {
|
||||||
single { this@AdminsPlugin }
|
single { this@AdminsPlugin }
|
||||||
val scopeQualifier = named("admins plugin scope")
|
val scopeQualifier = named("admins plugin scope")
|
||||||
single(scopeQualifier) { CoroutineScope(Dispatchers.IO + SupervisorJob()) }
|
single(scopeQualifier) { CoroutineScope(Dispatchers.IO + SupervisorJob()) }
|
||||||
@@ -55,8 +56,8 @@ class AdminsPlugin : Plugin {
|
|||||||
{ long("chatId") },
|
{ long("chatId") },
|
||||||
{ text("member") },
|
{ text("member") },
|
||||||
"AdminsTable"
|
"AdminsTable"
|
||||||
).withMapper<IdChatIdentifier, AdministratorChatMember, Identifier, String>(
|
).withMapper<IdChatIdentifier, AdministratorChatMember, Long, String>(
|
||||||
keyFromToTo = { chatId },
|
keyFromToTo = { chatId.long },
|
||||||
valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
|
valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
|
||||||
keyToToFrom = { toChatId() },
|
keyToToFrom = { toChatId() },
|
||||||
valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
|
valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
|
||||||
@@ -66,8 +67,8 @@ class AdminsPlugin : Plugin {
|
|||||||
{ long("chatId") },
|
{ long("chatId") },
|
||||||
{ long("datetime") },
|
{ long("datetime") },
|
||||||
"AdminsUpdatesTimesTable"
|
"AdminsUpdatesTimesTable"
|
||||||
).withMapper<IdChatIdentifier, Long, Identifier, Long>(
|
).withMapper<IdChatIdentifier, Long, Long, Long>(
|
||||||
keyFromToTo = { chatId },
|
keyFromToTo = { chatId.long },
|
||||||
valueFromToTo = { this },
|
valueFromToTo = { this },
|
||||||
keyToToFrom = { toChatId() },
|
keyToToFrom = { toChatId() },
|
||||||
valueToToFrom = { this }
|
valueToToFrom = { this }
|
||||||
@@ -82,8 +83,8 @@ class AdminsPlugin : Plugin {
|
|||||||
{ long("chatId") },
|
{ long("chatId") },
|
||||||
{ text("settings") },
|
{ text("settings") },
|
||||||
"DynamicAdminsCacheSettingsAPI"
|
"DynamicAdminsCacheSettingsAPI"
|
||||||
).withMapper<IdChatIdentifier, AdminsCacheSettings, Identifier, String>(
|
).withMapper<IdChatIdentifier, AdminsCacheSettings, Long, String>(
|
||||||
keyFromToTo = { chatId },
|
keyFromToTo = { chatId.long },
|
||||||
valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
|
valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
|
||||||
keyToToFrom = { toChatId() },
|
keyToToFrom = { toChatId() },
|
||||||
valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
|
valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
|
||||||
|
|||||||
@@ -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,7 +1,7 @@
|
|||||||
package dev.inmo.tgbotapi.libraries.cache.media.common
|
package dev.inmo.tgbotapi.libraries.cache.media.common
|
||||||
|
|
||||||
import com.soywiz.klock.DateTime
|
import korlibs.time.DateTime
|
||||||
import com.soywiz.klock.milliseconds
|
import korlibs.time.milliseconds
|
||||||
import dev.inmo.tgbotapi.bot.TelegramBot
|
import dev.inmo.tgbotapi.bot.TelegramBot
|
||||||
import dev.inmo.tgbotapi.requests.DeleteMessage
|
import dev.inmo.tgbotapi.requests.DeleteMessage
|
||||||
import dev.inmo.tgbotapi.requests.abstracts.FileId
|
import dev.inmo.tgbotapi.requests.abstracts.FileId
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ package dev.inmo.tgbotapi.libraries.cache.media.common
|
|||||||
import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
|
import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
|
||||||
import io.ktor.utils.io.core.Input
|
import io.ktor.utils.io.core.Input
|
||||||
import io.ktor.utils.io.core.copyTo
|
import io.ktor.utils.io.core.copyTo
|
||||||
import io.ktor.utils.io.streams.asInput
|
import io.ktor.utils.io.streams.*
|
||||||
import io.ktor.utils.io.streams.asOutput
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
class InFilesMessagesFilesCache<K>(
|
class InFilesMessagesFilesCache<K>(
|
||||||
@@ -39,8 +38,8 @@ class InFilesMessagesFilesCache<K>(
|
|||||||
val file = File(folderFile, fullFileName).apply {
|
val file = File(folderFile, fullFileName).apply {
|
||||||
delete()
|
delete()
|
||||||
}
|
}
|
||||||
inputAllocator().use { input ->
|
inputAllocator().inputStream().use { input ->
|
||||||
file.outputStream().asOutput().use { output ->
|
file.outputStream().use { output ->
|
||||||
input.copyTo(output)
|
input.copyTo(output)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import dev.inmo.micro_utils.repos.*
|
|||||||
import dev.inmo.micro_utils.repos.mappers.withMapper
|
import dev.inmo.micro_utils.repos.mappers.withMapper
|
||||||
import dev.inmo.tgbotapi.libraries.cache.media.common.MessagesSimpleCache
|
import dev.inmo.tgbotapi.libraries.cache.media.common.MessagesSimpleCache
|
||||||
import dev.inmo.tgbotapi.types.ChatId
|
import dev.inmo.tgbotapi.types.ChatId
|
||||||
import dev.inmo.tgbotapi.types.MessageIdentifier
|
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
|
||||||
@@ -47,7 +47,7 @@ class SimpleKeyValueMessageContentCache<K>(
|
|||||||
|
|
||||||
val chatIdToMessageIdentifierSerializer = PairSerializer(
|
val chatIdToMessageIdentifierSerializer = PairSerializer(
|
||||||
ChatId.serializer(),
|
ChatId.serializer(),
|
||||||
MessageIdentifier.serializer()
|
MessageId.serializer()
|
||||||
)
|
)
|
||||||
|
|
||||||
val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class)
|
val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class)
|
||||||
@@ -56,9 +56,9 @@ inline fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleK
|
|||||||
|
|
||||||
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, MessageIdentifier>, MessageContent> {
|
): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
|
||||||
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
||||||
return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, String, String>(
|
return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>(
|
||||||
{ serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) },
|
{ serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) },
|
||||||
{ serialFormat.encodeToString(messageContentSerializer, this) },
|
{ serialFormat.encodeToString(messageContentSerializer, this) },
|
||||||
{ serialFormat.decodeFromString(chatIdToMessageIdentifierSerializer, this) },
|
{ serialFormat.decodeFromString(chatIdToMessageIdentifierSerializer, this) },
|
||||||
@@ -70,9 +70,9 @@ inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
|||||||
@JsName("stringsKeyValueAsHexMessageContentCache")
|
@JsName("stringsKeyValueAsHexMessageContentCache")
|
||||||
inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
||||||
serialFormatCreator: (SerializersModule) -> BinaryFormat
|
serialFormatCreator: (SerializersModule) -> BinaryFormat
|
||||||
): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
|
): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
|
||||||
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
||||||
return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, String, String>(
|
return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>(
|
||||||
{ serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) },
|
{ serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) },
|
||||||
{ serialFormat.encodeToHexString(messageContentSerializer, this) },
|
{ serialFormat.encodeToHexString(messageContentSerializer, this) },
|
||||||
{ serialFormat.decodeFromHexString(chatIdToMessageIdentifierSerializer, this) },
|
{ serialFormat.decodeFromHexString(chatIdToMessageIdentifierSerializer, this) },
|
||||||
@@ -84,9 +84,9 @@ inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
|||||||
@JsName("bytesKeyValueAsMessageContentCache")
|
@JsName("bytesKeyValueAsMessageContentCache")
|
||||||
inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache(
|
inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache(
|
||||||
serialFormatCreator: (SerializersModule) -> BinaryFormat
|
serialFormatCreator: (SerializersModule) -> BinaryFormat
|
||||||
): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
|
): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
|
||||||
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
||||||
return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, ByteArray, ByteArray>(
|
return withMapper<Pair<ChatId, MessageId>, MessageContent, ByteArray, ByteArray>(
|
||||||
{ serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) },
|
{ serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) },
|
||||||
{ serialFormat.encodeToByteArray(messageContentSerializer, this) },
|
{ serialFormat.encodeToByteArray(messageContentSerializer, this) },
|
||||||
{ serialFormat.decodeFromByteArray(chatIdToMessageIdentifierSerializer, this) },
|
{ serialFormat.decodeFromByteArray(chatIdToMessageIdentifierSerializer, this) },
|
||||||
|
|||||||
@@ -4,25 +4,25 @@ org.gradle.parallel=true
|
|||||||
kotlin.js.generate.externals=true
|
kotlin.js.generate.externals=true
|
||||||
kotlin.incremental=true
|
kotlin.incremental=true
|
||||||
kotlin.incremental.js=true
|
kotlin.incremental.js=true
|
||||||
android.useAndroidX=true
|
|
||||||
android.enableJetifier=true
|
|
||||||
|
|
||||||
|
|
||||||
kotlin_version=1.7.21
|
kotlin_version=2.2.20
|
||||||
kotlin_serialisation_core_version=1.4.1
|
kotlin_serialisation_core_version=1.9.0
|
||||||
|
|
||||||
github_release_plugin_version=2.4.1
|
github_release_plugin_version=2.5.2
|
||||||
|
|
||||||
tgbotapi_version=4.1.3
|
tgbotapi_version=30.0.0
|
||||||
micro_utils_version=0.14.4
|
micro_utils_version=0.26.6
|
||||||
exposed_version=0.41.1
|
exposed_version=0.61.0
|
||||||
plagubot_version=3.1.3
|
plagubot_version=10.9.0
|
||||||
|
|
||||||
|
nmcp_version=1.2.0
|
||||||
|
|
||||||
# Dokka
|
# Dokka
|
||||||
|
|
||||||
dokka_version=1.7.20
|
dokka_version=2.1.0
|
||||||
|
|
||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.6.4
|
version=0.27.0
|
||||||
|
|||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
295
gradlew
vendored
295
gradlew
vendored
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright 2015 the original author or authors.
|
# Copyright © 2015 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -15,81 +15,114 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
##
|
#
|
||||||
## Gradle start up script for UN*X
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
##
|
#
|
||||||
|
# Important for running:
|
||||||
|
#
|
||||||
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||||
|
# noncompliant, but you have some other compliant shell such as ksh or
|
||||||
|
# bash, then to run this script, type that shell name before the whole
|
||||||
|
# command line, like:
|
||||||
|
#
|
||||||
|
# ksh Gradle
|
||||||
|
#
|
||||||
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
|
# requires all of these POSIX shell features:
|
||||||
|
# * functions;
|
||||||
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
|
#
|
||||||
|
# Important for patching:
|
||||||
|
#
|
||||||
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||||
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||||
|
#
|
||||||
|
# The "traditional" practice of packing multiple parameters into a
|
||||||
|
# space-separated string is a well documented source of bugs and security
|
||||||
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||||
|
# options in "$@", and eventually passing that to Java.
|
||||||
|
#
|
||||||
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||||
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||||
|
# see the in-line comments for details.
|
||||||
|
#
|
||||||
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||||
|
# Darwin, MinGW, and NonStop.
|
||||||
|
#
|
||||||
|
# (3) This script is generated from the Groovy template
|
||||||
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
|
# within the Gradle project.
|
||||||
|
#
|
||||||
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
# Resolve links: $0 may be a link
|
||||||
PRG="$0"
|
app_path=$0
|
||||||
# Need this for relative symlinks.
|
|
||||||
while [ -h "$PRG" ] ; do
|
# Need this for daisy-chained symlinks.
|
||||||
ls=`ls -ld "$PRG"`
|
while
|
||||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
if expr "$link" : '/.*' > /dev/null; then
|
[ -h "$app_path" ]
|
||||||
PRG="$link"
|
do
|
||||||
else
|
ls=$( ls -ld "$app_path" )
|
||||||
PRG=`dirname "$PRG"`"/$link"
|
link=${ls#*' -> '}
|
||||||
fi
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
done
|
done
|
||||||
SAVED="`pwd`"
|
|
||||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
|
||||||
APP_HOME="`pwd -P`"
|
|
||||||
cd "$SAVED" >/dev/null
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
# This is normally unused
|
||||||
APP_BASE_NAME=`basename "$0"`
|
# shellcheck disable=SC2034
|
||||||
|
APP_BASE_NAME=${0##*/}
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD="maximum"
|
MAX_FD=maximum
|
||||||
|
|
||||||
warn () {
|
warn () {
|
||||||
echo "$*"
|
echo "$*"
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
die () {
|
die () {
|
||||||
echo
|
echo
|
||||||
echo "$*"
|
echo "$*"
|
||||||
echo
|
echo
|
||||||
exit 1
|
exit 1
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
# OS specific support (must be 'true' or 'false').
|
||||||
cygwin=false
|
cygwin=false
|
||||||
msys=false
|
msys=false
|
||||||
darwin=false
|
darwin=false
|
||||||
nonstop=false
|
nonstop=false
|
||||||
case "`uname`" in
|
case "$( uname )" in #(
|
||||||
CYGWIN* )
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
cygwin=true
|
Darwin* ) darwin=true ;; #(
|
||||||
;;
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
Darwin* )
|
NONSTOP* ) nonstop=true ;;
|
||||||
darwin=true
|
|
||||||
;;
|
|
||||||
MINGW* )
|
|
||||||
msys=true
|
|
||||||
;;
|
|
||||||
NONSTOP* )
|
|
||||||
nonstop=true
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
else
|
else
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
@@ -98,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD="java"
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
MAX_FD_LIMIT=`ulimit -H -n`
|
case $MAX_FD in #(
|
||||||
if [ $? -eq 0 ] ; then
|
max*)
|
||||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
MAX_FD="$MAX_FD_LIMIT"
|
# shellcheck disable=SC2039,SC3045
|
||||||
fi
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
ulimit -n $MAX_FD
|
warn "Could not query maximum file descriptor limit"
|
||||||
if [ $? -ne 0 ] ; then
|
esac
|
||||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
case $MAX_FD in #(
|
||||||
fi
|
'' | soft) :;; #(
|
||||||
else
|
*)
|
||||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
fi
|
# shellcheck disable=SC2039,SC3045
|
||||||
fi
|
ulimit -n "$MAX_FD" ||
|
||||||
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
# For Darwin, add options to specify how the application appears in the dock
|
|
||||||
if $darwin; then
|
|
||||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
|
||||||
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
|
||||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
|
||||||
SEP=""
|
|
||||||
for dir in $ROOTDIRSRAW ; do
|
|
||||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
|
||||||
SEP="|"
|
|
||||||
done
|
|
||||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
|
||||||
# Add a user-defined pattern to the cygpath arguments
|
|
||||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
|
||||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
|
||||||
fi
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
i=0
|
|
||||||
for arg in "$@" ; do
|
|
||||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
|
||||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
|
||||||
|
|
||||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
|
||||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
|
||||||
else
|
|
||||||
eval `echo args$i`="\"$arg\""
|
|
||||||
fi
|
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
|
||||||
case $i in
|
|
||||||
0) set -- ;;
|
|
||||||
1) set -- "$args0" ;;
|
|
||||||
2) set -- "$args0" "$args1" ;;
|
|
||||||
3) set -- "$args0" "$args1" "$args2" ;;
|
|
||||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
|
||||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
|
||||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
|
||||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
|
||||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
|
||||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Escape application args
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
save () {
|
# * args from the command line
|
||||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
# * the main class name
|
||||||
echo " "
|
# * -classpath
|
||||||
}
|
# * -D...appname settings
|
||||||
APP_ARGS=`save "$@"`
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
|
||||||
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
|
# Collect all arguments for the java command:
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
|
# and any embedded shellness will be escaped.
|
||||||
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# Stop when "xargs" is not available.
|
||||||
|
if ! command -v xargs >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "xargs is not available"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use "xargs" to parse quoted args.
|
||||||
|
#
|
||||||
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
#
|
||||||
|
# In Bash we could simply go:
|
||||||
|
#
|
||||||
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||||
|
# set -- "${ARGS[@]}" "$@"
|
||||||
|
#
|
||||||
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||||
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||||
|
# character that might be a shell metacharacter, then use eval to reverse
|
||||||
|
# that process (while maintaining the separation between arguments), and wrap
|
||||||
|
# the whole thing up as a single "set" statement.
|
||||||
|
#
|
||||||
|
# This will of course break if any of these variables contains a newline or
|
||||||
|
# an unmatched quote.
|
||||||
|
#
|
||||||
|
|
||||||
|
eval "set -- $(
|
||||||
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||||
|
xargs -n1 |
|
||||||
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||||
|
tr '\n' ' '
|
||||||
|
)" '"$@"'
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
exec "$JAVACMD" "$@"
|
||||||
|
|||||||
182
gradlew.bat
vendored
182
gradlew.bat
vendored
@@ -1,89 +1,93 @@
|
|||||||
@rem
|
@rem
|
||||||
@rem Copyright 2015 the original author or authors.
|
@rem Copyright 2015 the original author or authors.
|
||||||
@rem
|
@rem
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
@rem you may not use this file except in compliance with the License.
|
@rem you may not use this file except in compliance with the License.
|
||||||
@rem You may obtain a copy of the License at
|
@rem You may obtain a copy of the License at
|
||||||
@rem
|
@rem
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||||
@rem
|
@rem
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
@rem Unless required by applicable law or agreed to in writing, software
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
@if "%DEBUG%" == "" @echo off
|
@rem
|
||||||
@rem ##########################################################################
|
|
||||||
@rem
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem Gradle startup script for Windows
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem ##########################################################################
|
@rem Gradle startup script for Windows
|
||||||
|
@rem
|
||||||
@rem Set local scope for the variables with windows NT shell
|
@rem ##########################################################################
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
|
||||||
|
@rem Set local scope for the variables with windows NT shell
|
||||||
set DIRNAME=%~dp0
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
|
||||||
set APP_BASE_NAME=%~n0
|
set DIRNAME=%~dp0
|
||||||
set APP_HOME=%DIRNAME%
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
set APP_BASE_NAME=%~n0
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||||
|
|
||||||
@rem Find java.exe
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
@rem Find java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
|
||||||
|
set JAVA_EXE=java.exe
|
||||||
echo.
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo. 1>&2
|
||||||
echo location of your Java installation.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
|
echo. 1>&2
|
||||||
goto fail
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
|
echo location of your Java installation. 1>&2
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
goto fail
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
if exist "%JAVA_EXE%" goto execute
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
if exist "%JAVA_EXE%" goto execute
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo. 1>&2
|
||||||
echo location of your Java installation.
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
|
echo. 1>&2
|
||||||
goto fail
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
|
echo location of your Java installation. 1>&2
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
goto fail
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
:execute
|
||||||
|
@rem Setup the command line
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
|
||||||
|
@rem Execute Gradle
|
||||||
:end
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
@rem End local scope for the variables with windows NT shell
|
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
:end
|
||||||
|
@rem End local scope for the variables with windows NT shell
|
||||||
:fail
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
:fail
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
exit /b 1
|
rem the _cmd.exe /c_ return code!
|
||||||
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
:mainEnd
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
:omega
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ kotlin {
|
|||||||
jvm {
|
jvm {
|
||||||
compilations.main {
|
compilations.main {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "1.8"
|
jvmTarget = "17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -37,13 +37,12 @@ kotlin {
|
|||||||
jsTest {
|
jsTest {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation kotlin('test-js')
|
implementation kotlin('test-js')
|
||||||
implementation kotlin('test-junit')
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
task javadocsJar(type: Jar) {
|
task javadocsJar(type: Jar) {
|
||||||
classifier = 'javadoc'
|
archiveClassifier = 'javadoc'
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
@@ -50,18 +50,14 @@ publishing {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
|
||||||
maven {
|
maven {
|
||||||
name = "Gitea"
|
name = "InmoNexus"
|
||||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
|
||||||
|
|
||||||
credentials(HttpHeaderCredentials) {
|
credentials {
|
||||||
name = "Authorization"
|
username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
|
||||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
|
||||||
}
|
|
||||||
|
|
||||||
authentication {
|
|
||||||
header(HttpHeaderAuthentication)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -96,4 +92,27 @@ if (project.hasProperty("signing.gnupg.keyName")) {
|
|||||||
dependsOn(it)
|
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 +1 @@
|
|||||||
{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries","vcsUrl":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"},{"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"}}}
|
{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries","vcsUrl":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
|
||||||
6
renovate.json
Normal file
6
renovate.json
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
|
"extends": [
|
||||||
|
"config:recommended"
|
||||||
|
]
|
||||||
|
}
|
||||||
17
resender/build.gradle
Normal file
17
resender/build.gradle
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
plugins {
|
||||||
|
id "org.jetbrains.kotlin.multiplatform"
|
||||||
|
id "org.jetbrains.kotlin.plugin.serialization"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: "$mppJavaWithJsProjectPath"
|
||||||
|
|
||||||
|
kotlin {
|
||||||
|
sourceSets {
|
||||||
|
commonMain {
|
||||||
|
dependencies {
|
||||||
|
api "dev.inmo:tgbotapi.core:$tgbotapi_version"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
36
resender/src/commonMain/kotlin/MessageMetaInfo.kt
Normal file
36
resender/src/commonMain/kotlin/MessageMetaInfo.kt
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
package dev.inmo.tgbotapi.libraries.resender
|
||||||
|
|
||||||
|
import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
|
||||||
|
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||||
|
import dev.inmo.tgbotapi.types.MediaGroupId
|
||||||
|
import dev.inmo.tgbotapi.types.MessageId
|
||||||
|
import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
|
||||||
|
import dev.inmo.tgbotapi.types.message.abstracts.Message
|
||||||
|
import dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage
|
||||||
|
import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class MessageMetaInfo(
|
||||||
|
@Serializable(FullChatIdentifierSerializer::class)
|
||||||
|
val chatId: IdChatIdentifier,
|
||||||
|
val messageId: MessageId,
|
||||||
|
val group: MediaGroupId? = null
|
||||||
|
) {
|
||||||
|
val metaInfo: Message.MetaInfo
|
||||||
|
get() = Message.MetaInfo(chatId, messageId)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Message.asMessageMetaInfos(): List<MessageMetaInfo> {
|
||||||
|
return if (this is ContentMessage<*>) {
|
||||||
|
(content as? MediaGroupContent<*>) ?.group ?.map {
|
||||||
|
MessageMetaInfo(it.sourceMessage.chat.id, it.sourceMessage.messageId, it.sourceMessage.mediaGroupId)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
} ?: listOf(MessageMetaInfo(chat.id, messageId, (this as? PossiblyMediaGroupMessage<*>) ?.mediaGroupId))
|
||||||
|
}
|
||||||
|
|
||||||
|
operator fun MessageMetaInfo.Companion.invoke(
|
||||||
|
message: Message
|
||||||
|
) = MessageMetaInfo(message.chat.id, message.messageId, (message as? PossiblyMediaGroupMessage<*>) ?.mediaGroupId)
|
||||||
160
resender/src/commonMain/kotlin/MessagesResender.kt
Normal file
160
resender/src/commonMain/kotlin/MessagesResender.kt
Normal file
@@ -0,0 +1,160 @@
|
|||||||
|
package dev.inmo.tgbotapi.libraries.resender
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.common.applyDiff
|
||||||
|
import dev.inmo.tgbotapi.bot.TelegramBot
|
||||||
|
import dev.inmo.tgbotapi.requests.ForwardMessage
|
||||||
|
import dev.inmo.tgbotapi.requests.ForwardMessages
|
||||||
|
import dev.inmo.tgbotapi.requests.send.CopyMessage
|
||||||
|
import dev.inmo.tgbotapi.requests.send.CopyMessages
|
||||||
|
import dev.inmo.tgbotapi.requests.send.media.SendMediaGroup
|
||||||
|
import dev.inmo.tgbotapi.types.ChatIdentifier
|
||||||
|
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||||
|
import dev.inmo.tgbotapi.types.mediaCountInMediaGroup
|
||||||
|
import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
|
||||||
|
import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
|
||||||
|
|
||||||
|
class MessagesResender(
|
||||||
|
private val bot: TelegramBot,
|
||||||
|
private val cacheChatId: ChatIdentifier
|
||||||
|
) {
|
||||||
|
suspend fun resend(
|
||||||
|
targetChatId: IdChatIdentifier,
|
||||||
|
messagesInfo: List<MessageMetaInfo>,
|
||||||
|
onBetweenMessages: suspend (sent: List<MessageMetaInfo>, toBeSent: List<MessageMetaInfo>) -> Unit
|
||||||
|
): List<Pair<MessageMetaInfo, MessageMetaInfo>> {
|
||||||
|
val messagesWithOrders = messagesInfo.mapIndexed { i, messageInfo -> messageInfo to i }.toMap()
|
||||||
|
val ordersWithMessagesGroups = messagesInfo.groupBy { it.group }.flatMap { (group, list) ->
|
||||||
|
if (group == null) {
|
||||||
|
list.map {
|
||||||
|
messagesWithOrders.getValue(it) to listOf(it)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
listOf(messagesWithOrders.getValue(list.first()) to list)
|
||||||
|
}
|
||||||
|
}.sortedBy { it.first }
|
||||||
|
|
||||||
|
val sent = mutableListOf<MessageMetaInfo>()
|
||||||
|
val leftToSend = ordersWithMessagesGroups.map { it.second }.toMutableList()
|
||||||
|
|
||||||
|
return ordersWithMessagesGroups.flatMap { (_, contents) ->
|
||||||
|
val sourceMessagesToSentMessages = mutableListOf<Pair<MessageMetaInfo, MessageMetaInfo>>()
|
||||||
|
|
||||||
|
onBetweenMessages(sent.toList(), leftToSend.flatten())
|
||||||
|
|
||||||
|
when {
|
||||||
|
contents.size == 1 -> {
|
||||||
|
val messageInfo = contents.first()
|
||||||
|
runCatching {
|
||||||
|
MessageMetaInfo(
|
||||||
|
targetChatId,
|
||||||
|
bot.execute(
|
||||||
|
CopyMessage(
|
||||||
|
toChatId = targetChatId,
|
||||||
|
fromChatId = messageInfo.chatId,
|
||||||
|
messageId = messageInfo.messageId,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}.onFailure { _ ->
|
||||||
|
runCatching {
|
||||||
|
bot.execute(
|
||||||
|
ForwardMessage(
|
||||||
|
toChatId = targetChatId,
|
||||||
|
fromChatId = messageInfo.chatId,
|
||||||
|
messageId = messageInfo.messageId
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}.onSuccess {
|
||||||
|
MessageMetaInfo(
|
||||||
|
targetChatId,
|
||||||
|
bot.execute(
|
||||||
|
CopyMessage(
|
||||||
|
toChatId = targetChatId,
|
||||||
|
fromChatId = it.chat.id,
|
||||||
|
messageId = it.messageId
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}.getOrNull() ?.let {
|
||||||
|
sourceMessagesToSentMessages.add(messageInfo to it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else -> {
|
||||||
|
val resultContents = contents.mapNotNull {
|
||||||
|
it to (
|
||||||
|
bot.execute(
|
||||||
|
ForwardMessage(
|
||||||
|
toChatId = cacheChatId,
|
||||||
|
fromChatId = it.chatId,
|
||||||
|
messageId = it.messageId
|
||||||
|
)
|
||||||
|
) as? ContentMessage<*> ?: return@mapNotNull null)
|
||||||
|
}.mapNotNull { (src, forwardedMessage) ->
|
||||||
|
val forwardedMessageAsMediaPartMessage = forwardedMessage.takeIf {
|
||||||
|
it.content is MediaGroupPartContent
|
||||||
|
} ?.let {
|
||||||
|
it as ContentMessage<MediaGroupPartContent>
|
||||||
|
}
|
||||||
|
src to (forwardedMessageAsMediaPartMessage ?: null.also { _ ->
|
||||||
|
sourceMessagesToSentMessages.add(
|
||||||
|
src to MessageMetaInfo(
|
||||||
|
targetChatId,
|
||||||
|
bot.execute(
|
||||||
|
CopyMessage(
|
||||||
|
toChatId = targetChatId,
|
||||||
|
fromChatId = forwardedMessage.chat.id,
|
||||||
|
messageId = forwardedMessage.messageId
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
} ?: return@mapNotNull null)
|
||||||
|
}
|
||||||
|
|
||||||
|
resultContents.singleOrNull() ?.also { (src, it) ->
|
||||||
|
sourceMessagesToSentMessages.add(
|
||||||
|
src to MessageMetaInfo(
|
||||||
|
targetChatId,
|
||||||
|
bot.execute(
|
||||||
|
CopyMessage(
|
||||||
|
toChatId = targetChatId,
|
||||||
|
fromChatId = it.chat.id,
|
||||||
|
messageId = it.messageId
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
} ?: resultContents.chunked(mediaCountInMediaGroup.last).forEach {
|
||||||
|
bot.execute(
|
||||||
|
SendMediaGroup<MediaGroupPartContent>(
|
||||||
|
targetChatId,
|
||||||
|
it.map { it.second.content.toMediaGroupMemberTelegramMedia() }
|
||||||
|
)
|
||||||
|
).content.group.mapIndexed { i, partWrapper ->
|
||||||
|
it.getOrNull(i) ?.let {
|
||||||
|
sourceMessagesToSentMessages.add(
|
||||||
|
it.first to MessageMetaInfo(
|
||||||
|
partWrapper.sourceMessage.chat.id,
|
||||||
|
partWrapper.sourceMessage.messageId,
|
||||||
|
partWrapper.sourceMessage.mediaGroupId
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
leftToSend.takeIf { it.isNotEmpty() } ?.removeAt(0) ?.also {
|
||||||
|
sent.addAll(it)
|
||||||
|
}
|
||||||
|
sourceMessagesToSentMessages.toList()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun resend(
|
||||||
|
targetChatId: IdChatIdentifier,
|
||||||
|
messagesInfo: List<MessageMetaInfo>
|
||||||
|
): List<Pair<MessageMetaInfo, MessageMetaInfo>> = resend(targetChatId, messagesInfo) { _, _ -> }
|
||||||
|
}
|
||||||
@@ -7,6 +7,8 @@ String[] includes = [
|
|||||||
|
|
||||||
":cache:content:common",
|
":cache:content:common",
|
||||||
":cache:content:micro_utils",
|
":cache:content:micro_utils",
|
||||||
|
|
||||||
|
":resender",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user