mirror of
https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
synced 2026-05-21 23:37:21 +00:00
Compare commits
1 Commits
0.26.7
...
e7afef21fc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e7afef21fc |
17
build.gradle
17
build.gradle
@@ -13,23 +13,6 @@ 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()
|
||||||
|
|||||||
@@ -1,15 +1,11 @@
|
|||||||
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
|
||||||
@@ -62,30 +58,6 @@ 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,5 @@
|
|||||||
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
|
||||||
@@ -14,11 +12,6 @@ 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
|
||||||
|
|||||||
@@ -6,17 +6,15 @@ kotlin.incremental=true
|
|||||||
kotlin.incremental.js=true
|
kotlin.incremental.js=true
|
||||||
|
|
||||||
|
|
||||||
kotlin_version=2.2.0
|
kotlin_version=2.1.10
|
||||||
kotlin_serialisation_core_version=1.9.0
|
kotlin_serialisation_core_version=1.8.0
|
||||||
|
|
||||||
github_release_plugin_version=2.5.2
|
github_release_plugin_version=2.5.2
|
||||||
|
|
||||||
tgbotapi_version=27.1.1
|
tgbotapi_version=23.2.0-branch_23.2.0-build2651
|
||||||
micro_utils_version=0.26.2
|
micro_utils_version=0.24.5
|
||||||
exposed_version=0.61.0
|
exposed_version=0.58.0
|
||||||
plagubot_version=10.7.0
|
plagubot_version=10.3.1
|
||||||
|
|
||||||
nmcp_version=1.0.2
|
|
||||||
|
|
||||||
# Dokka
|
# Dokka
|
||||||
|
|
||||||
@@ -25,4 +23,4 @@ dokka_version=2.0.0
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.26.7
|
version=0.26.2
|
||||||
|
|||||||
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.13-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
Reference in New Issue
Block a user