Compare commits

...

19 Commits

Author SHA1 Message Date
f86dbcefce update dependencies 2025-09-04 17:38:47 +06:00
e4aba03cdc start 0.26.8 2025-09-04 17:33:39 +06:00
c8f8608a60 Merge pull request #117 from InsanusMokrassar/0.26.7
0.26.7
2025-08-04 13:47:08 +06:00
19fcee9f3e start 0.26.7 and update dependencies 2025-08-04 13:38:57 +06:00
825e6474cc Merge pull request #111 from InsanusMokrassar/0.26.6
0.26.6
2025-06-27 09:50:49 +06:00
ff99bdd45d update publishing way 2025-06-27 09:50:18 +06:00
2ae7507c01 0.26.6 2025-06-27 09:48:39 +06:00
7b30d95f56 Merge pull request #108 from InsanusMokrassar/0.26.5
0.26.5
2025-04-30 13:42:46 +06:00
bbe9367ef3 update gradle wrapper 2025-04-30 13:37:12 +06:00
6403fe6f5d update dependencies 2025-04-30 13:36:50 +06:00
3cad9ec337 start 0.26.5 2025-04-30 13:34:36 +06:00
78e5da9db7 Merge pull request #105 from InsanusMokrassar/0.26.4
0.26.4
2025-03-26 22:40:12 +06:00
74329a8eb2 small improvements 2025-03-26 20:41:46 +06:00
953df71d9e add MessageContentCache.sendAndSave 2025-03-26 18:14:25 +06:00
c25f6d522f start 0.26.4 2025-03-26 18:10:27 +06:00
d569f46e48 Merge pull request #100 from InsanusMokrassar/0.26.3
0.26.3
2025-02-16 09:24:40 +06:00
f2731f6e7d update dependencies 2025-02-16 09:23:30 +06:00
f10c7412f4 start 0.26.3 2025-02-16 09:23:08 +06:00
a113e6e37e Merge pull request #96 from InsanusMokrassar/0.26.2
0.26.2
2025-01-29 14:33:23 +06:00
5 changed files with 62 additions and 8 deletions

View File

@@ -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 {
repositories {
mavenLocal()

View File

@@ -1,11 +1,15 @@
package dev.inmo.tgbotapi.libraries.cache.media.common
import dev.inmo.tgbotapi.bot.TelegramBot
import dev.inmo.tgbotapi.requests.DeleteMessage
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.send.media.*
import dev.inmo.tgbotapi.types.IdChatIdentifier
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.MessageContent
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? {
val savedSimpleContent = simpleMessageContentCache.get(k) ?: return null

View File

@@ -1,5 +1,7 @@
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.MessageContent
import io.ktor.utils.io.core.Input
@@ -12,6 +14,11 @@ interface MessageContentCache<K> {
filename: String,
inputAllocator: suspend () -> Input
)
suspend fun sendAndSave(
k: K,
filename: String,
inputAllocator: () -> Input
): DocumentContent
suspend fun get(k: K): MessageContent?
suspend fun contains(k: K): Boolean

View File

@@ -6,15 +6,17 @@ kotlin.incremental=true
kotlin.incremental.js=true
kotlin_version=2.1.10
kotlin_serialisation_core_version=1.8.0
kotlin_version=2.2.10
kotlin_serialisation_core_version=1.9.0
github_release_plugin_version=2.5.2
tgbotapi_version=23.1.2
micro_utils_version=0.24.5
exposed_version=0.58.0
plagubot_version=10.3.1
tgbotapi_version=28.0.1
micro_utils_version=0.26.3
exposed_version=0.61.0
plagubot_version=10.8.0
nmcp_version=1.1.0
# Dokka
@@ -23,4 +25,4 @@ dokka_version=2.0.0
# Project data
group=dev.inmo
version=0.26.2
version=0.26.8

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists