mirror of
				https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
				synced 2025-10-31 04:02:50 +00:00 
			
		
		
		
	Compare commits
	
		
			7 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 5b62bfa7d3 | |||
| d94d847715 | |||
| 91013b914d | |||
| cec4c610f3 | |||
| b9003388b1 | |||
| 6d161c2d78 | |||
| dc63639fee | 
| @@ -38,8 +38,8 @@ fun TelegramBot.createAdminsCacheAPI( | ||||
|             { long("chatId") }, | ||||
|             { text("member") }, | ||||
|             "AdminsTable" | ||||
|         ).withMapper<IdChatIdentifier, AdministratorChatMember, Identifier, String>( | ||||
|             keyFromToTo = { chatId }, | ||||
|         ).withMapper<IdChatIdentifier, AdministratorChatMember, Long, String>( | ||||
|             keyFromToTo = { chatId.long }, | ||||
|             valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdministratorChatMember.serializer(), this) }, | ||||
|             keyToToFrom = { toChatId() }, | ||||
|             valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdministratorChatMember.serializer(), this) } | ||||
| @@ -49,8 +49,8 @@ fun TelegramBot.createAdminsCacheAPI( | ||||
|             { long("chatId") }, | ||||
|             { long("datetime") }, | ||||
|             "AdminsUpdatesTimesTable" | ||||
|         ).withMapper<IdChatIdentifier, Long, Identifier, Long>( | ||||
|             keyFromToTo = { chatId }, | ||||
|         ).withMapper<IdChatIdentifier, Long, Long, Long>( | ||||
|             keyFromToTo = { chatId.long }, | ||||
|             valueFromToTo = { this }, | ||||
|             keyToToFrom = { toChatId() }, | ||||
|             valueToToFrom = { this } | ||||
| @@ -63,8 +63,8 @@ fun TelegramBot.createAdminsCacheAPI( | ||||
|             { long("chatId") }, | ||||
|             { text("settings") }, | ||||
|             "DynamicAdminsCacheSettingsAPI" | ||||
|         ).withMapper<IdChatIdentifier, AdminsCacheSettings, Identifier, String>( | ||||
|             keyFromToTo = { chatId }, | ||||
|         ).withMapper<IdChatIdentifier, AdminsCacheSettings, Long, String>( | ||||
|             keyFromToTo = { chatId.long }, | ||||
|             valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdminsCacheSettings.serializer() , this) }, | ||||
|             keyToToFrom = { toChatId() }, | ||||
|             valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdminsCacheSettings.serializer() , this) } | ||||
|   | ||||
| @@ -55,8 +55,8 @@ class AdminsPlugin : Plugin { | ||||
|                     { long("chatId") }, | ||||
|                     { text("member") }, | ||||
|                     "AdminsTable" | ||||
|                 ).withMapper<IdChatIdentifier, AdministratorChatMember, Identifier, String>( | ||||
|                     keyFromToTo = { chatId }, | ||||
|                 ).withMapper<IdChatIdentifier, AdministratorChatMember, Long, String>( | ||||
|                     keyFromToTo = { chatId.long }, | ||||
|                     valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) }, | ||||
|                     keyToToFrom = { toChatId() }, | ||||
|                     valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) } | ||||
| @@ -66,8 +66,8 @@ class AdminsPlugin : Plugin { | ||||
|                     { long("chatId") }, | ||||
|                     { long("datetime") }, | ||||
|                     "AdminsUpdatesTimesTable" | ||||
|                 ).withMapper<IdChatIdentifier, Long, Identifier, Long>( | ||||
|                     keyFromToTo = { chatId }, | ||||
|                 ).withMapper<IdChatIdentifier, Long, Long, Long>( | ||||
|                     keyFromToTo = { chatId.long }, | ||||
|                     valueFromToTo = { this }, | ||||
|                     keyToToFrom = { toChatId() }, | ||||
|                     valueToToFrom = { this } | ||||
| @@ -82,8 +82,8 @@ class AdminsPlugin : Plugin { | ||||
|                     { long("chatId") }, | ||||
|                     { text("settings") }, | ||||
|                     "DynamicAdminsCacheSettingsAPI" | ||||
|                 ).withMapper<IdChatIdentifier, AdminsCacheSettings, Identifier, String>( | ||||
|                     keyFromToTo = { chatId }, | ||||
|                 ).withMapper<IdChatIdentifier, AdminsCacheSettings, Long, String>( | ||||
|                     keyFromToTo = { chatId.long }, | ||||
|                     valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) }, | ||||
|                     keyToToFrom = { toChatId() }, | ||||
|                     valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) } | ||||
|   | ||||
| @@ -4,7 +4,7 @@ import dev.inmo.micro_utils.repos.* | ||||
| import dev.inmo.micro_utils.repos.mappers.withMapper | ||||
| import dev.inmo.tgbotapi.libraries.cache.media.common.MessagesSimpleCache | ||||
| 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 kotlinx.serialization.* | ||||
| import kotlinx.serialization.builtins.PairSerializer | ||||
| @@ -47,7 +47,7 @@ class SimpleKeyValueMessageContentCache<K>( | ||||
|  | ||||
| val chatIdToMessageIdentifierSerializer = PairSerializer( | ||||
|     ChatId.serializer(), | ||||
|     MessageIdentifier.serializer() | ||||
|     MessageId.serializer() | ||||
| ) | ||||
|  | ||||
| val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class) | ||||
| @@ -56,9 +56,9 @@ inline fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleK | ||||
|  | ||||
| inline fun KeyValueRepo<String, String>.asMessageContentCache( | ||||
|     serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } } | ||||
| ): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> { | ||||
| ): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> { | ||||
|     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(messageContentSerializer, this) }, | ||||
|         { serialFormat.decodeFromString(chatIdToMessageIdentifierSerializer, this) }, | ||||
| @@ -70,9 +70,9 @@ inline fun KeyValueRepo<String, String>.asMessageContentCache( | ||||
| @JsName("stringsKeyValueAsHexMessageContentCache") | ||||
| inline fun KeyValueRepo<String, String>.asMessageContentCache( | ||||
|     serialFormatCreator: (SerializersModule) -> BinaryFormat | ||||
| ): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> { | ||||
| ): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> { | ||||
|     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(messageContentSerializer, this) }, | ||||
|         { serialFormat.decodeFromHexString(chatIdToMessageIdentifierSerializer, this) }, | ||||
| @@ -84,9 +84,9 @@ inline fun KeyValueRepo<String, String>.asMessageContentCache( | ||||
| @JsName("bytesKeyValueAsMessageContentCache") | ||||
| inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache( | ||||
|     serialFormatCreator: (SerializersModule) -> BinaryFormat | ||||
| ): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> { | ||||
| ): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> { | ||||
|     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(messageContentSerializer, this) }, | ||||
|         { serialFormat.decodeFromByteArray(chatIdToMessageIdentifierSerializer, this) }, | ||||
|   | ||||
| @@ -6,21 +6,21 @@ kotlin.incremental=true | ||||
| kotlin.incremental.js=true | ||||
|  | ||||
|  | ||||
| kotlin_version=1.9.22 | ||||
| kotlin_serialisation_core_version=1.6.2 | ||||
| kotlin_version=1.9.23 | ||||
| kotlin_serialisation_core_version=1.6.3 | ||||
|  | ||||
| github_release_plugin_version=2.5.2 | ||||
|  | ||||
| tgbotapi_version=10.1.0 | ||||
| micro_utils_version=0.20.35 | ||||
| exposed_version=0.47.0 | ||||
| plagubot_version=8.2.0 | ||||
| tgbotapi_version=15.0.0 | ||||
| micro_utils_version=0.21.1 | ||||
| exposed_version=0.50.1 | ||||
| plagubot_version=8.4.0 | ||||
|  | ||||
| # Dokka | ||||
|  | ||||
| dokka_version=1.9.10 | ||||
| dokka_version=1.9.20 | ||||
|  | ||||
| # Project data | ||||
|  | ||||
| group=dev.inmo | ||||
| version=0.18.3 | ||||
| version=0.20.0 | ||||
|   | ||||
							
								
								
									
										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.5-bin.zip | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip | ||||
| zipStoreBase=GRADLE_USER_HOME | ||||
| zipStorePath=wrapper/dists | ||||
|   | ||||
| @@ -2,6 +2,7 @@ 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 | ||||
| @@ -14,7 +15,7 @@ data class MessageMetaInfo( | ||||
|     @Serializable(FullChatIdentifierSerializer::class) | ||||
|     val chatId: IdChatIdentifier, | ||||
|     val messageId: MessageId, | ||||
|     val group: String? = null | ||||
|     val group: MediaGroupId? = null | ||||
| ) { | ||||
|     val metaInfo: Message.MetaInfo | ||||
|         get() = Message.MetaInfo(chatId, messageId) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user