mirror of
				https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
				synced 2025-11-04 06:00:24 +00:00 
			
		
		
		
	Compare commits
	
		
			11 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| ff99bdd45d | |||
| 2ae7507c01 | |||
| 7b30d95f56 | |||
| bbe9367ef3 | |||
| 6403fe6f5d | |||
| 3cad9ec337 | |||
| 78e5da9db7 | |||
| 74329a8eb2 | |||
| 953df71d9e | |||
| c25f6d522f | |||
| d569f46e48 | 
							
								
								
									
										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 {
 | 
			
		||||
    repositories {
 | 
			
		||||
        mavenLocal()
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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.1.20
 | 
			
		||||
kotlin_serialisation_core_version=1.8.1
 | 
			
		||||
 | 
			
		||||
github_release_plugin_version=2.5.2
 | 
			
		||||
 | 
			
		||||
tgbotapi_version=23.2.0
 | 
			
		||||
micro_utils_version=0.24.6
 | 
			
		||||
exposed_version=0.59.0
 | 
			
		||||
plagubot_version=10.4.0
 | 
			
		||||
tgbotapi_version=26.0.0
 | 
			
		||||
micro_utils_version=0.25.8
 | 
			
		||||
exposed_version=0.61.0
 | 
			
		||||
plagubot_version=10.6.0
 | 
			
		||||
 | 
			
		||||
nmcp_version=0.2.1
 | 
			
		||||
 | 
			
		||||
# Dokka
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +25,4 @@ dokka_version=2.0.0
 | 
			
		||||
# Project data
 | 
			
		||||
 | 
			
		||||
group=dev.inmo
 | 
			
		||||
version=0.26.3
 | 
			
		||||
version=0.26.6
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user