mirror of
				https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
				synced 2025-10-31 12:10:15 +00:00 
			
		
		
		
	Compare commits
	
		
			67 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 8e281f0edc | |||
| f802aa6a99 | |||
| ee9f524fc6 | |||
| 950eebea06 | |||
| 7845b7cc5f | |||
| 539515da43 | |||
| 3695ab7936 | |||
| ab802df7d1 | |||
| c85d92c7ba | |||
| cea8ba47db | |||
| b2719c0760 | |||
| 1c87f64a6d | |||
| 53630d4864 | |||
| bb7fb985e3 | |||
| 18fc3fd1dd | |||
| 5f1f512db4 | |||
| 961d7d9afd | |||
| 6a84bcb860 | |||
| cd1ba035ac | |||
| 6f443c1617 | |||
| 85a1048b13 | |||
| 8dc1687b8e | |||
| 2518109290 | |||
| 760e51cabb | |||
| 3a667946da | |||
| f6df96c405 | |||
| fd33cbfca3 | |||
| 62a10b9042 | |||
| a7814c61b5 | |||
| 4eb27b42ad | |||
| 5367ff5629 | |||
| 50caa740cc | |||
| 6c85e977f1 | |||
| 156a8dd8be | |||
| 3728983653 | |||
| 8e99cb9e18 | |||
| 0f569ead82 | |||
| 71f6710397 | |||
| 243926cd17 | |||
| b2d3ded0da | |||
| fbbd8e640c | |||
| 15c0f9979a | |||
| e6d04de433 | |||
| a6b837f633 | |||
| 866b016e08 | |||
| b67212ec0b | |||
| dc83bbc9aa | |||
| 14b56c659b | |||
| 99218de932 | |||
| ce14a78e09 | |||
| 827d9b43f7 | |||
| 6aaa801fe0 | |||
| 5cb7d30431 | |||
| c34d7597b4 | |||
| d5ae880e77 | |||
| 570568cd26 | |||
| ec69456bcc | |||
| 6327366720 | |||
| 0f05779e0d | |||
| be1b13debb | |||
| 043948401d | |||
| cde0a11c1b | |||
| 7e37a43904 | |||
| 5305438686 | |||
| f423d31423 | |||
| 6591c8ffa8 | |||
| 5d6d4a0ade | 
| @@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.libraries.cache.admins | |||||||
|  |  | ||||||
| import dev.inmo.tgbotapi.extensions.utils.asGroupContentMessage | import dev.inmo.tgbotapi.extensions.utils.asGroupContentMessage | ||||||
| import dev.inmo.tgbotapi.types.* | import dev.inmo.tgbotapi.types.* | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember | import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember | ||||||
| import dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage | import dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage | ||||||
| import dev.inmo.tgbotapi.types.message.abstracts.Message | import dev.inmo.tgbotapi.types.message.abstracts.Message | ||||||
|  |  | ||||||
|   | |||||||
| @@ -15,8 +15,11 @@ data class AdminsCacheSettings( | |||||||
|      */ |      */ | ||||||
|     val disableRequestsRefreshMode: Boolean = false |     val disableRequestsRefreshMode: Boolean = false | ||||||
| ) { | ) { | ||||||
|     val refreshOnRequests: Boolean |     val refreshOnCacheCalls: Boolean | ||||||
|         get() = !disableRequestsRefreshMode |         get() = !disableRequestsRefreshMode | ||||||
|  |     @Deprecated("Renamed", ReplaceWith("refreshOnCacheCalls")) | ||||||
|  |     val refreshOnRequests: Boolean | ||||||
|  |         get() = refreshOnCacheCalls | ||||||
| } | } | ||||||
|  |  | ||||||
| interface AdminsCacheSettingsAPI { | interface AdminsCacheSettingsAPI { | ||||||
|   | |||||||
| @@ -0,0 +1,44 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.admins | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.extensions.api.bot.getMe | ||||||
|  | import dev.inmo.tgbotapi.extensions.behaviour_builder.* | ||||||
|  | import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.ChatMemberUpdatedFilterByChat | ||||||
|  | import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onChatMemberUpdated | ||||||
|  | import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter | ||||||
|  | import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatChatMemberUpdatedMarkerFactory | ||||||
|  | import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory | ||||||
|  | import dev.inmo.tgbotapi.types.ChatId | ||||||
|  | import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember | ||||||
|  | import dev.inmo.tgbotapi.types.chat.member.ChatMemberUpdated | ||||||
|  | import dev.inmo.tgbotapi.types.update.abstracts.Update | ||||||
|  | import kotlinx.coroutines.Job | ||||||
|  |  | ||||||
|  | suspend fun BehaviourContext.activateAdminsChangesListening( | ||||||
|  |     repo: DefaultAdminsCacheAPIRepo, | ||||||
|  |     initialFilter: SimpleFilter<ChatMemberUpdated>? = null, | ||||||
|  |     markerFactory: MarkerFactory<ChatMemberUpdated, Any> = ByChatChatMemberUpdatedMarkerFactory | ||||||
|  | ): Job { | ||||||
|  |     val me = getMe() | ||||||
|  |     return onChatMemberUpdated(initialFilter, markerFactory = markerFactory) { | ||||||
|  |         when { | ||||||
|  |             it.oldChatMemberState is AdministratorChatMember && it.newChatMemberState !is AdministratorChatMember || | ||||||
|  |             it.newChatMemberState is AdministratorChatMember && it.oldChatMemberState !is AdministratorChatMember -> { | ||||||
|  |                 updateAdmins( | ||||||
|  |                     it.chat.id, | ||||||
|  |                     repo, | ||||||
|  |                     me | ||||||
|  |                 ) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend fun BehaviourContext.activateAdminsChangesListening( | ||||||
|  |     repo: DefaultAdminsCacheAPIRepo, | ||||||
|  |     allowedChats: List<ChatId> | ||||||
|  | ) = activateAdminsChangesListening( | ||||||
|  |     repo, | ||||||
|  |     { | ||||||
|  |         it.chat.id in allowedChats | ||||||
|  |     } | ||||||
|  | ) | ||||||
| @@ -0,0 +1,37 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.admins | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.abstracts.FromUser | ||||||
|  | import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter | ||||||
|  | import dev.inmo.tgbotapi.types.ChatId | ||||||
|  | import dev.inmo.tgbotapi.types.UserId | ||||||
|  | import dev.inmo.tgbotapi.types.message.abstracts.Message | ||||||
|  |  | ||||||
|  | fun AdminsChecker( | ||||||
|  |     adminsCacheAPI: AdminsCacheAPI | ||||||
|  | ): SimpleFilter<Pair<ChatId, UserId>> = SimpleFilter { | ||||||
|  |     adminsCacheAPI.isAdmin(it.first, it.second) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun <T> AdminsChecker( | ||||||
|  |     adminsCacheAPI: AdminsCacheAPI, | ||||||
|  |     mapper: (T) -> Pair<ChatId, UserId> | ||||||
|  | ): SimpleFilter<T> { | ||||||
|  |     val baseChecker = AdminsChecker(adminsCacheAPI) | ||||||
|  |  | ||||||
|  |     return SimpleFilter<T> { | ||||||
|  |         baseChecker(mapper(it)) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun MessageAdminsChecker( | ||||||
|  |     adminsCacheAPI: AdminsCacheAPI | ||||||
|  | ) = SimpleFilter<Message> { | ||||||
|  |     adminsCacheAPI.isAdmin(it) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun AdminsChecker( | ||||||
|  |     adminsCacheAPI: AdminsCacheAPI, | ||||||
|  |     chatId: ChatId | ||||||
|  | ) = SimpleFilter<FromUser> { | ||||||
|  |     adminsCacheAPI.isAdmin(chatId, it.from.id) | ||||||
|  | } | ||||||
| @@ -3,9 +3,10 @@ package dev.inmo.tgbotapi.libraries.cache.admins | |||||||
| import com.soywiz.klock.DateTime | import com.soywiz.klock.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.get.getChatAdministrators | import dev.inmo.tgbotapi.extensions.api.chat.members.getChatMember | ||||||
| import dev.inmo.tgbotapi.types.* | import dev.inmo.tgbotapi.types.* | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember | import dev.inmo.tgbotapi.types.chat.ExtendedBot | ||||||
|  | import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember | ||||||
| import dev.inmo.tgbotapi.types.message.abstracts.* | import dev.inmo.tgbotapi.types.message.abstracts.* | ||||||
| import kotlinx.serialization.Serializable | import kotlinx.serialization.Serializable | ||||||
|  |  | ||||||
| @@ -28,28 +29,37 @@ class DefaultAdminsCacheAPI( | |||||||
|         bot.getMe().also { botInfo = it } |         bot.getMe().also { botInfo = it } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private suspend fun triggerUpdate(chatId: ChatId): List<AdministratorChatMember> { |  | ||||||
|         val botInfo = getBotInfo() |  | ||||||
|         val admins = bot.getChatAdministrators(chatId).filter { |  | ||||||
|             botInfo.id != it.user.id |  | ||||||
|         } |  | ||||||
|         repo.setChatAdmins(chatId, admins) |  | ||||||
|         return admins |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? { |     override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? { | ||||||
|         val settings = settingsAPI.getChatSettings(chatId) |         val settings = settingsAPI.getChatSettings(chatId) | ||||||
|         val lastUpdate = repo.lastUpdate(chatId) |         val lastUpdate = repo.lastUpdate(chatId) | ||||||
|         return when { |         return when { | ||||||
|             settings == null -> null |             settings == null -> null | ||||||
|             settings.refreshOnRequests && |             settings.refreshOnCacheCalls && | ||||||
|                 (lastUpdate == null || (DateTime.now() - lastUpdate).seconds > settings.refreshSeconds) -> { |                 (lastUpdate == null || (DateTime.now() - lastUpdate).seconds > settings.refreshSeconds) -> { | ||||||
|                 triggerUpdate(chatId) |                 bot.updateAdmins(chatId, repo, getBotInfo()) | ||||||
|             } |             } | ||||||
|             else -> repo.getChatAdmins(chatId) ?: triggerUpdate(chatId) |             else -> repo.getChatAdmins(chatId) ?: bot.updateAdmins(chatId, repo, getBotInfo()) | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     override suspend fun isAdmin(chatId: ChatId, userId: UserId): Boolean { | ||||||
|  |         val settings = settingsAPI.getChatSettings(chatId) | ||||||
|  |         val lastUpdate = repo.lastUpdate(chatId) | ||||||
|  |         return when { | ||||||
|  |             settings == null -> return false | ||||||
|  |             settings.refreshOnCacheCalls && (lastUpdate == null || (DateTime.now() - lastUpdate).seconds > settings.refreshSeconds) -> { | ||||||
|  |                 bot.updateAdmins(chatId, repo, getBotInfo()) | ||||||
|  |             } | ||||||
|  |             else -> { | ||||||
|  |                 val chatAdmins = repo.getChatAdmins(chatId) | ||||||
|  |                 if (chatAdmins == null) { | ||||||
|  |                     return bot.getChatMember(chatId, userId) is AdministratorChatMember | ||||||
|  |                 } | ||||||
|  |                 chatAdmins | ||||||
|  |             } | ||||||
|  |         }.any { it.user.id == userId } | ||||||
|  |     } | ||||||
|  |  | ||||||
|     override suspend fun sentByAdmin(groupContentMessage: GroupContentMessage<*>): Boolean { |     override suspend fun sentByAdmin(groupContentMessage: GroupContentMessage<*>): Boolean { | ||||||
|         return when (groupContentMessage) { |         return when (groupContentMessage) { | ||||||
|             is AnonymousGroupContentMessage -> true |             is AnonymousGroupContentMessage -> true | ||||||
| @@ -62,5 +72,4 @@ class DefaultAdminsCacheAPI( | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     override suspend fun settings(): AdminsCacheSettingsAPI = settingsAPI |     override suspend fun settings(): AdminsCacheSettingsAPI = settingsAPI | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -4,17 +4,40 @@ import dev.inmo.tgbotapi.types.ChatId | |||||||
| import dev.inmo.tgbotapi.types.UserId | import dev.inmo.tgbotapi.types.UserId | ||||||
| import dev.inmo.tgbotapi.types.message.abstracts.* | import dev.inmo.tgbotapi.types.message.abstracts.* | ||||||
|  |  | ||||||
| suspend fun AdminsCacheAPI.verifyMessageFromAdmin(message: ContentMessage<*>) = when (message) { | suspend inline fun AdminsCacheAPI.isAdmin(message: Message) = when (message) { | ||||||
|     is CommonGroupContentMessage<*> -> isAdmin(message.chat.id, message.user.id) |     is CommonGroupContentMessage<*> -> isAdmin(message.chat.id, message.user.id) | ||||||
|     is AnonymousGroupContentMessage<*> -> true |     is AnonymousGroupContentMessage<*> -> true | ||||||
|     else -> false |     else -> false | ||||||
| } | } | ||||||
|  |  | ||||||
| suspend fun <R> ContentMessage<*>.doAfterVerification(adminsCacheAPI: AdminsCacheAPI, block: suspend () -> R): R? { | suspend inline fun AdminsCacheAPI.verifyMessageFromAdmin(message: Message) = isAdmin(message) | ||||||
|     val verified = adminsCacheAPI.verifyMessageFromAdmin(this) |  | ||||||
|  | suspend inline fun <R : Any> AdminsCacheAPI.doIfAdmin( | ||||||
|  |     chatId: ChatId, | ||||||
|  |     userId: UserId, | ||||||
|  |     block: () -> R | ||||||
|  | ) = if(isAdmin(chatId, userId)) { | ||||||
|  |     block() | ||||||
|  | } else { | ||||||
|  |     null | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend inline fun <R : Any> AdminsCacheAPI.doIfAdmin( | ||||||
|  |     message: Message, | ||||||
|  |     block: () -> R | ||||||
|  | ) = if(isAdmin(message)) { | ||||||
|  |     block() | ||||||
|  | } else { | ||||||
|  |     null | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend inline fun <R> ContentMessage<*>.doIfAdmin(adminsCacheAPI: AdminsCacheAPI, block: () -> R): R? { | ||||||
|  |     val verified = adminsCacheAPI.isAdmin(this) | ||||||
|     return if (verified) { |     return if (verified) { | ||||||
|         block() |         block() | ||||||
|     } else { |     } else { | ||||||
|         null |         null | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | suspend inline fun <R> ContentMessage<*>.doAfterVerification(adminsCacheAPI: AdminsCacheAPI, block: () -> R) = doIfAdmin(adminsCacheAPI, block) | ||||||
|   | |||||||
| @@ -0,0 +1,21 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.admins | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.bot.TelegramBot | ||||||
|  | import dev.inmo.tgbotapi.extensions.api.bot.getMe | ||||||
|  | import dev.inmo.tgbotapi.extensions.api.chat.get.getChatAdministrators | ||||||
|  | import dev.inmo.tgbotapi.types.ChatId | ||||||
|  | import dev.inmo.tgbotapi.types.chat.ExtendedBot | ||||||
|  | import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember | ||||||
|  |  | ||||||
|  | internal suspend fun TelegramBot.updateAdmins( | ||||||
|  |     chatId: ChatId, | ||||||
|  |     repo: DefaultAdminsCacheAPIRepo, | ||||||
|  |     botInfo: ExtendedBot? = null | ||||||
|  | ): List<AdministratorChatMember> { | ||||||
|  |     val botInfo = botInfo ?: getMe() | ||||||
|  |     val admins = getChatAdministrators(chatId).filter { | ||||||
|  |         botInfo.id != it.user.id | ||||||
|  |     } | ||||||
|  |     repo.setChatAdmins(chatId, admins) | ||||||
|  |     return admins | ||||||
|  | } | ||||||
| @@ -1,62 +1,91 @@ | |||||||
| package dev.inmo.tgbotapi.libraries.cache.admins.micro_utils | package dev.inmo.tgbotapi.libraries.cache.admins.micro_utils | ||||||
|  |  | ||||||
| import com.soywiz.klock.DateTime | import com.soywiz.klock.DateTime | ||||||
| import dev.inmo.micro_utils.coroutines.actor | import dev.inmo.micro_utils.coroutines.* | ||||||
| import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions |  | ||||||
| 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 | ||||||
| import dev.inmo.tgbotapi.types.* | import dev.inmo.tgbotapi.types.* | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember | import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember | ||||||
|  | import kotlinx.coroutines.CompletableDeferred | ||||||
| import kotlinx.coroutines.CoroutineScope | import kotlinx.coroutines.CoroutineScope | ||||||
| import kotlinx.coroutines.channels.Channel | import kotlinx.coroutines.channels.* | ||||||
| import kotlin.coroutines.* | import kotlin.coroutines.* | ||||||
|  |  | ||||||
| private sealed class RepoActions<T> { | private sealed class RepoActions<T> { | ||||||
|     abstract val toReturn: Continuation<T> |     abstract val deferred: CompletableDeferred<T> | ||||||
| } | } | ||||||
| private class GetUpdateDateTimeRepoAction( | private class GetUpdateDateTimeRepoAction( | ||||||
|     val chatId: ChatId, |     val chatId: ChatId, | ||||||
|     override val toReturn: Continuation<DateTime?> |     override val deferred: CompletableDeferred<DateTime?> | ||||||
| ) : RepoActions<DateTime?>() | ) : RepoActions<DateTime?>() | ||||||
| private class GetChatAdminsRepoAction( | private class GetChatAdminsRepoAction( | ||||||
|     val chatId: ChatId, |     val chatId: ChatId, | ||||||
|     override val toReturn: Continuation<List<AdministratorChatMember>?> |     override val deferred: CompletableDeferred<List<AdministratorChatMember>?> | ||||||
| ) : RepoActions<List<AdministratorChatMember>?>() | ) : RepoActions<List<AdministratorChatMember>?>() | ||||||
| private class SetChatAdminsRepoAction( | private class SetChatAdminsRepoAction( | ||||||
|     val chatId: ChatId, |     val chatId: ChatId, | ||||||
|     val newValue: List<AdministratorChatMember>, |     val newValue: List<AdministratorChatMember>, | ||||||
|     override val toReturn: Continuation<Unit> |     override val deferred: CompletableDeferred<Unit> | ||||||
| ) : RepoActions<Unit>() | ) : RepoActions<Unit>() | ||||||
|  |  | ||||||
| class DefaultAdminsCacheAPIRepo( | class DefaultAdminsCacheAPIRepoImpl( | ||||||
|     private val adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>, |     private val adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>, | ||||||
|     private val updatesRepo: KeyValueRepo<ChatId, MilliSeconds>, |     private val updatesRepo: KeyValueRepo<ChatId, MilliSeconds>, | ||||||
|     private val scope: CoroutineScope |     private val scope: CoroutineScope | ||||||
| ) : DefaultAdminsCacheAPIRepo { | ) : DefaultAdminsCacheAPIRepo { | ||||||
|     private val actor = scope.actor<RepoActions<*>>(Channel.UNLIMITED) { |     private val actor = scope.actorAsync<RepoActions<*>>(Channel.UNLIMITED) { | ||||||
|         safelyWithoutExceptions { |         safelyWithoutExceptions( | ||||||
|  |             { e -> | ||||||
|  |                 it.deferred.completeExceptionally(e) | ||||||
|  |             } | ||||||
|  |         ) { | ||||||
|             when (it) { |             when (it) { | ||||||
|                 is GetUpdateDateTimeRepoAction -> it.toReturn.resume( |                 is GetUpdateDateTimeRepoAction -> it.deferred.complete( | ||||||
|                     updatesRepo.get(it.chatId) ?.let { DateTime(it.toDouble()) } |                     updatesRepo.get(it.chatId) ?.let { DateTime(it.toDouble()) } | ||||||
|                 ) |                 ) | ||||||
|                 is GetChatAdminsRepoAction -> it.toReturn.resume(adminsRepo.getAll(it.chatId)) |                 is GetChatAdminsRepoAction -> it.deferred.complete(adminsRepo.getAll(it.chatId)) | ||||||
|                 is SetChatAdminsRepoAction -> { |                 is SetChatAdminsRepoAction -> { | ||||||
|                     adminsRepo.clear(it.chatId) |                     adminsRepo.clear(it.chatId) | ||||||
|                     adminsRepo.set(it.chatId, it.newValue) |                     adminsRepo.set(it.chatId, it.newValue) | ||||||
|                     updatesRepo.set(it.chatId, DateTime.now().unixMillisLong) |                     updatesRepo.set(it.chatId, DateTime.now().unixMillisLong) | ||||||
|                     it.toReturn.resume(Unit) |                     it.deferred.complete(Unit) | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? = suspendCoroutine { |     override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? { | ||||||
|         actor.trySend(GetChatAdminsRepoAction(chatId, it)) |         val deferred = CompletableDeferred<List<AdministratorChatMember>?>() | ||||||
|  |         actor.trySend( | ||||||
|  |             GetChatAdminsRepoAction(chatId, deferred) | ||||||
|  |         ).onFailure { | ||||||
|  |             deferred.completeExceptionally(it ?: IllegalStateException("Something went wrong when tried to add getChatAdmins action")) | ||||||
|  |         } | ||||||
|  |         return deferred.await() | ||||||
|     } |     } | ||||||
|     override suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>) = suspendCoroutine<Unit> { |  | ||||||
|         actor.trySend(SetChatAdminsRepoAction(chatId, chatMembers, it)) |     override suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>) { | ||||||
|  |         val deferred = CompletableDeferred<Unit>() | ||||||
|  |         actor.trySend( | ||||||
|  |             SetChatAdminsRepoAction(chatId, chatMembers, deferred) | ||||||
|  |         ).onFailure { | ||||||
|  |             deferred.completeExceptionally(it ?: IllegalStateException("Something went wrong when tried to add setChatAdmins action")) | ||||||
|  |         } | ||||||
|  |         return deferred.await() | ||||||
|     } |     } | ||||||
|     override suspend fun lastUpdate(chatId: ChatId): DateTime? = suspendCoroutine { |     override suspend fun lastUpdate(chatId: ChatId): DateTime? { | ||||||
|         actor.trySend(GetUpdateDateTimeRepoAction(chatId, it)) |         val deferred = CompletableDeferred<DateTime?>() | ||||||
|  |         actor.trySend( | ||||||
|  |             GetUpdateDateTimeRepoAction(chatId, deferred) | ||||||
|  |         ).onFailure { | ||||||
|  |             deferred.completeExceptionally(it ?: IllegalStateException("Something went wrong when tried to add lastUpdate action")) | ||||||
|  |         } | ||||||
|  |         return deferred.await() | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | fun DefaultAdminsCacheAPIRepo( | ||||||
|  |     adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>, | ||||||
|  |     updatesRepo: KeyValueRepo<ChatId, MilliSeconds>, | ||||||
|  |     scope: CoroutineScope | ||||||
|  | ) = DefaultAdminsCacheAPIRepoImpl(adminsRepo, updatesRepo, scope) | ||||||
|   | |||||||
| @@ -1,53 +1,48 @@ | |||||||
| package dev.inmo.tgbotapi.libraries.cache.admins | package dev.inmo.tgbotapi.libraries.cache.admins | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo | import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo | ||||||
| import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedOneToManyKeyValueRepo | 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.tgbotapi.bot.TelegramBot | import dev.inmo.tgbotapi.bot.TelegramBot | ||||||
| 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.DefaultAdminsCacheAPIRepo | 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 | ||||||
| import dev.inmo.tgbotapi.types.* | import dev.inmo.tgbotapi.types.* | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.AdministratorChatMemberImpl | import dev.inmo.tgbotapi.types.chat.member.* | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.CreatorChatMember |  | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember |  | ||||||
| import kotlinx.coroutines.CoroutineScope | import kotlinx.coroutines.CoroutineScope | ||||||
| import kotlinx.serialization.* | import kotlinx.serialization.* | ||||||
| import kotlinx.serialization.cbor.Cbor |  | ||||||
| import kotlinx.serialization.json.Json | import kotlinx.serialization.json.Json | ||||||
| import kotlinx.serialization.modules.SerializersModule | import kotlinx.serialization.modules.SerializersModule | ||||||
| import kotlinx.serialization.modules.polymorphic | import kotlinx.serialization.modules.polymorphic | ||||||
| import org.jetbrains.exposed.sql.Database | import org.jetbrains.exposed.sql.Database | ||||||
| import org.jetbrains.exposed.sql.statements.api.ExposedBlob |  | ||||||
|  |  | ||||||
| private val serializationFormat = Json { | val telegramAdminsSerializationFormat = Json { | ||||||
|     ignoreUnknownKeys = true |     ignoreUnknownKeys = true | ||||||
|     serializersModule = SerializersModule { |     serializersModule = SerializersModule { | ||||||
|         polymorphic(AdministratorChatMember::class) { |         polymorphic(AdministratorChatMember::class) { | ||||||
|             subclass(AdministratorChatMemberImpl::class, AdministratorChatMemberImpl.serializer()) |             subclass(AdministratorChatMemberImpl::class, AdministratorChatMemberImpl.serializer()) | ||||||
|             subclass(CreatorChatMember::class, CreatorChatMember.serializer()) |             subclass(OwnerChatMember::class, OwnerChatMember.serializer()) | ||||||
|         } |         } | ||||||
|         contextual(AdministratorChatMember::class, PolymorphicSerializer(AdministratorChatMember::class)) |         contextual(AdministratorChatMember::class, PolymorphicSerializer(AdministratorChatMember::class)) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| fun AdminsCacheAPI( | fun BehaviourContext.createAdminsCacheAPI(database: Database) = AdminsCacheAPI(this, database, this) | ||||||
|     bot: TelegramBot, |  | ||||||
|  | fun TelegramBot.createAdminsCacheAPI( | ||||||
|     database: Database, |     database: Database, | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
| ) : AdminsCacheAPI = DefaultAdminsCacheAPI( |     defaultAdminsCacheAPIRepo: DefaultAdminsCacheAPIRepo = DefaultAdminsCacheAPIRepoImpl( | ||||||
|     bot, |         ExposedKeyValuesRepo( | ||||||
|     DefaultAdminsCacheAPIRepo( |  | ||||||
|         ExposedOneToManyKeyValueRepo( |  | ||||||
|             database, |             database, | ||||||
|             { long("chatId") }, |             { long("chatId") }, | ||||||
|             { text("member") }, |             { text("member") }, | ||||||
|             "AdminsTable" |             "AdminsTable" | ||||||
|         ).withMapper<ChatId, AdministratorChatMember, Identifier, String>( |         ).withMapper<ChatId, AdministratorChatMember, Identifier, String>( | ||||||
|             keyFromToTo = { chatId }, |             keyFromToTo = { chatId }, | ||||||
|             valueFromToTo = { serializationFormat.encodeToString(this) }, |             valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdministratorChatMember.serializer(), this) }, | ||||||
|             keyToToFrom = { toChatId() }, |             keyToToFrom = { toChatId() }, | ||||||
|             valueToToFrom = { serializationFormat.decodeFromString(this) } |             valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdministratorChatMember.serializer(), this) } | ||||||
|         ), |         ), | ||||||
|         ExposedKeyValueRepo( |         ExposedKeyValueRepo( | ||||||
|             database, |             database, | ||||||
| @@ -62,7 +57,7 @@ fun AdminsCacheAPI( | |||||||
|         ), |         ), | ||||||
|         scope |         scope | ||||||
|     ), |     ), | ||||||
|     DynamicAdminsCacheSettingsAPI( |     adminsCacheSettingsAPI: AdminsCacheSettingsAPI = DynamicAdminsCacheSettingsAPI( | ||||||
|         ExposedKeyValueRepo( |         ExposedKeyValueRepo( | ||||||
|             database, |             database, | ||||||
|             { long("chatId") }, |             { long("chatId") }, | ||||||
| @@ -70,12 +65,19 @@ fun AdminsCacheAPI( | |||||||
|             "DynamicAdminsCacheSettingsAPI" |             "DynamicAdminsCacheSettingsAPI" | ||||||
|         ).withMapper<ChatId, AdminsCacheSettings, Identifier, String>( |         ).withMapper<ChatId, AdminsCacheSettings, Identifier, String>( | ||||||
|             keyFromToTo = { chatId }, |             keyFromToTo = { chatId }, | ||||||
|             valueFromToTo = { serializationFormat.encodeToString(this) }, |             valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdminsCacheSettings.serializer() , this) }, | ||||||
|             keyToToFrom = { toChatId() }, |             keyToToFrom = { toChatId() }, | ||||||
|             valueToToFrom = { serializationFormat.decodeFromString(this) } |             valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdminsCacheSettings.serializer() , this) } | ||||||
|         ), |         ), | ||||||
|         scope |         scope | ||||||
|     ) |     ) | ||||||
| ) | ) = DefaultAdminsCacheAPI(this, defaultAdminsCacheAPIRepo, adminsCacheSettingsAPI) | ||||||
|  |  | ||||||
| fun BehaviourContext.AdminsCacheAPI(database: Database) = AdminsCacheAPI(this, database, this) | fun AdminsCacheAPI( | ||||||
|  |     bot: TelegramBot, | ||||||
|  |     database: Database, | ||||||
|  |     scope: CoroutineScope | ||||||
|  | ) : AdminsCacheAPI = bot.createAdminsCacheAPI( | ||||||
|  |     database, | ||||||
|  |     scope | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -1,53 +1,106 @@ | |||||||
| package dev.inmo.tgbotapi.libraries.cache.admins | package dev.inmo.tgbotapi.libraries.cache.admins | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo | ||||||
|  | import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedKeyValuesRepo | ||||||
|  | import dev.inmo.micro_utils.repos.mappers.withMapper | ||||||
| import dev.inmo.plagubot.Plugin | import dev.inmo.plagubot.Plugin | ||||||
| import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext | import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext | ||||||
| import dev.inmo.tgbotapi.types.ChatId | import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepoImpl | ||||||
|  | import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DynamicAdminsCacheSettingsAPI | ||||||
|  | import dev.inmo.tgbotapi.types.* | ||||||
|  | import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember | ||||||
|  | import kotlinx.coroutines.* | ||||||
| import kotlinx.coroutines.flow.* | import kotlinx.coroutines.flow.* | ||||||
| import kotlinx.coroutines.sync.Mutex | import kotlinx.coroutines.sync.Mutex | ||||||
| import kotlinx.coroutines.sync.withLock | import kotlinx.coroutines.sync.withLock | ||||||
| import kotlinx.serialization.Serializable | import kotlinx.serialization.* | ||||||
| import kotlinx.serialization.Transient | import kotlinx.serialization.json.JsonObject | ||||||
| import org.jetbrains.exposed.sql.Database | import org.jetbrains.exposed.sql.Database | ||||||
|  | import org.koin.core.Koin | ||||||
|  | import org.koin.core.module.Module | ||||||
|  | import org.koin.core.qualifier.named | ||||||
|  | import org.koin.core.scope.Scope | ||||||
|  | import org.koin.dsl.binds | ||||||
|  |  | ||||||
| val Map<String, Any>.adminsPlugin: AdminsPlugin? | val Scope.adminsPlugin: AdminsPlugin? | ||||||
|     get() = get("admins") as? AdminsPlugin |     get() = getOrNull() | ||||||
|  |  | ||||||
|  | val Koin.adminsPlugin: AdminsPlugin? | ||||||
|  |     get() = getOrNull() | ||||||
|  |  | ||||||
| @Serializable | @Serializable | ||||||
| class AdminsPlugin( | class AdminsPlugin : Plugin { | ||||||
|     private val chatsSettings: Map<ChatId, AdminsCacheSettings>? = null |  | ||||||
| ) : Plugin { |  | ||||||
|     @Transient |     @Transient | ||||||
|     private val globalAdminsCacheAPI = MutableStateFlow<AdminsCacheAPI?>(null) |     private val globalAdminsCacheAPI = MutableStateFlow<AdminsCacheAPI?>(null) | ||||||
|     @Transient |     @Transient | ||||||
|     private val databaseToAdminsCacheAPI = mutableMapOf<Database, MutableStateFlow<AdminsCacheAPI?>>() |     private val databaseToAdminsCacheAPI = mutableMapOf<Database, MutableStateFlow<AdminsCacheAPI?>>() | ||||||
|     private val mutex = Mutex() |     private val mutex = Mutex() | ||||||
|  |  | ||||||
|  |     @Deprecated("Will be removed soon due to its redundancy") | ||||||
|     suspend fun adminsAPI(database: Database): AdminsCacheAPI { |     suspend fun adminsAPI(database: Database): AdminsCacheAPI { | ||||||
|         return when (chatsSettings) { |         val flow = mutex.withLock { | ||||||
|             null -> { |             databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) } | ||||||
|                 val flow = mutex.withLock { |  | ||||||
|                     databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) } |  | ||||||
|                 } |  | ||||||
|                 flow.first { it != null }!! |  | ||||||
|             } |  | ||||||
|             else -> globalAdminsCacheAPI.first { it != null }!! |  | ||||||
|         } |         } | ||||||
|  |         return flow.filterNotNull().first() | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     override suspend fun BehaviourContext.invoke(database: Database, params: Map<String, Any>) { |     override fun Module.setupDI(database: Database, params: JsonObject) { | ||||||
|         when (chatsSettings) { |         single { this@AdminsPlugin } | ||||||
|             null -> { |         val scopeQualifier = named("admins plugin scope") | ||||||
|                 mutex.withLock { |         single(scopeQualifier) { CoroutineScope(Dispatchers.IO + SupervisorJob()) } | ||||||
|                     val flow = databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) } |         single<DefaultAdminsCacheAPIRepo> { | ||||||
|                     if (flow.value == null) { |             DefaultAdminsCacheAPIRepoImpl( | ||||||
|                         flow.value = AdminsCacheAPI(database) |                 ExposedKeyValuesRepo( | ||||||
|                     } |                     database, | ||||||
|                 } |                     { long("chatId") }, | ||||||
|             } |                     { text("member") }, | ||||||
|             else -> mutex.withLock { |                     "AdminsTable" | ||||||
|                 globalAdminsCacheAPI.value = AdminsCacheAPI(database) |                 ).withMapper<ChatId, AdministratorChatMember, Identifier, String>( | ||||||
|             } |                     keyFromToTo = { chatId }, | ||||||
|  |                     valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) }, | ||||||
|  |                     keyToToFrom = { toChatId() }, | ||||||
|  |                     valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) } | ||||||
|  |                 ), | ||||||
|  |                 ExposedKeyValueRepo( | ||||||
|  |                     database, | ||||||
|  |                     { long("chatId") }, | ||||||
|  |                     { long("datetime") }, | ||||||
|  |                     "AdminsUpdatesTimesTable" | ||||||
|  |                 ).withMapper<ChatId, Long, Identifier, Long>( | ||||||
|  |                     keyFromToTo = { chatId }, | ||||||
|  |                     valueFromToTo = { this }, | ||||||
|  |                     keyToToFrom = { toChatId() }, | ||||||
|  |                     valueToToFrom = { this } | ||||||
|  |                 ), | ||||||
|  |                 get(scopeQualifier) | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |         single<AdminsCacheSettingsAPI> { | ||||||
|  |             DynamicAdminsCacheSettingsAPI( | ||||||
|  |                 ExposedKeyValueRepo( | ||||||
|  |                     database, | ||||||
|  |                     { long("chatId") }, | ||||||
|  |                     { text("settings") }, | ||||||
|  |                     "DynamicAdminsCacheSettingsAPI" | ||||||
|  |                 ).withMapper<ChatId, AdminsCacheSettings, Identifier, String>( | ||||||
|  |                     keyFromToTo = { chatId }, | ||||||
|  |                     valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) }, | ||||||
|  |                     keyToToFrom = { toChatId() }, | ||||||
|  |                     valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) } | ||||||
|  |                 ), | ||||||
|  |                 get(scopeQualifier) | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |         single { DefaultAdminsCacheAPI(get(), get(), get()) } binds arrayOf( | ||||||
|  |             AdminsCacheAPI::class | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) { | ||||||
|  |         with(koin) { | ||||||
|  |             activateAdminsChangesListening( | ||||||
|  |                 get() | ||||||
|  |             ) | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,3 +6,13 @@ plugins { | |||||||
| 
 | 
 | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppProjectWithSerializationPresetPath" | ||||||
| 
 | 
 | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api "dev.inmo:tgbotapi.core:$tgbotapi_version" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | 
 | ||||||
| @@ -0,0 +1,122 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.bot.TelegramBot | ||||||
|  | import dev.inmo.tgbotapi.requests.DownloadFileStream | ||||||
|  | import dev.inmo.tgbotapi.requests.get.GetFile | ||||||
|  | import dev.inmo.tgbotapi.requests.send.media.* | ||||||
|  | import dev.inmo.tgbotapi.types.ChatId | ||||||
|  | import dev.inmo.tgbotapi.types.media.* | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MediaContent | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MessageContent | ||||||
|  | import dev.inmo.tgbotapi.utils.asInput | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  |  | ||||||
|  | class DefaultMessageContentCache<K>( | ||||||
|  |     private val bot: TelegramBot, | ||||||
|  |     private val filesRefreshingChatId: ChatId, | ||||||
|  |     private val simpleMessageContentCache: MessagesSimpleCache<K>, | ||||||
|  |     private val mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay( | ||||||
|  |         MediaFileActualityChecker.Default(filesRefreshingChatId) | ||||||
|  |     ), | ||||||
|  |     private val messagesFilesCache: MessagesFilesCache<K> = InMemoryMessagesFilesCache() | ||||||
|  | ) : MessageContentCache<K> { | ||||||
|  |     override suspend fun save(k: K, content: MessageContent) { | ||||||
|  |         when (content) { | ||||||
|  |             is MediaContent -> { | ||||||
|  |                 val extendedInfo = bot.execute( | ||||||
|  |                     GetFile(content.media.fileId) | ||||||
|  |                 ) | ||||||
|  |                 val allocator = bot.execute( | ||||||
|  |                     DownloadFileStream( | ||||||
|  |                         extendedInfo.filePath | ||||||
|  |                     ) | ||||||
|  |                 ) | ||||||
|  |  | ||||||
|  |                 save(k, content, extendedInfo.fileName) { | ||||||
|  |                     allocator.invoke().asInput() | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             else -> simpleMessageContentCache.set(k, content) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun save( | ||||||
|  |         k: K, | ||||||
|  |         content: MediaContent, | ||||||
|  |         filename: String, | ||||||
|  |         inputAllocator: suspend () -> Input | ||||||
|  |     ) { | ||||||
|  |         simpleMessageContentCache.set(k, content) | ||||||
|  |         runCatching { | ||||||
|  |             messagesFilesCache.set(k, filename, inputAllocator) | ||||||
|  |         }.onFailure { | ||||||
|  |             simpleMessageContentCache.remove(k) | ||||||
|  |         }.onSuccess { | ||||||
|  |             with(mediaFileActualityChecker) { | ||||||
|  |                 bot.saved(content) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun get(k: K): MessageContent? { | ||||||
|  |         val savedSimpleContent = simpleMessageContentCache.get(k) ?: return null | ||||||
|  |  | ||||||
|  |         if (savedSimpleContent is MediaContent && !with(mediaFileActualityChecker) { bot.isActual(savedSimpleContent) }) { | ||||||
|  |             val savedFileContentAllocator = messagesFilesCache.get(k) ?: error("Unexpected absence of $k file for content ($simpleMessageContentCache)") | ||||||
|  |             val newContent = bot.execute( | ||||||
|  |                 when (savedSimpleContent.asTelegramMedia()) { | ||||||
|  |                     is TelegramMediaAnimation -> SendAnimation( | ||||||
|  |                         filesRefreshingChatId, | ||||||
|  |                         savedFileContentAllocator, | ||||||
|  |                         disableNotification = true | ||||||
|  |                     ) | ||||||
|  |                     is TelegramMediaAudio -> SendAudio( | ||||||
|  |                         filesRefreshingChatId, | ||||||
|  |                         savedFileContentAllocator, | ||||||
|  |                         disableNotification = true | ||||||
|  |                     ) | ||||||
|  |                     is TelegramMediaVideo -> SendVideo( | ||||||
|  |                         filesRefreshingChatId, | ||||||
|  |                         savedFileContentAllocator, | ||||||
|  |                         disableNotification = true | ||||||
|  |                     ) | ||||||
|  |                     is TelegramMediaDocument -> SendDocument( | ||||||
|  |                         filesRefreshingChatId, | ||||||
|  |                         savedFileContentAllocator, | ||||||
|  |                         disableNotification = true | ||||||
|  |                     ) | ||||||
|  |                     is TelegramMediaPhoto -> SendPhoto( | ||||||
|  |                         filesRefreshingChatId, | ||||||
|  |                         savedFileContentAllocator, | ||||||
|  |                         disableNotification = true | ||||||
|  |                     ) | ||||||
|  |                 } | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |             simpleMessageContentCache.update(k, newContent.content) | ||||||
|  |             return newContent.content | ||||||
|  |         } | ||||||
|  |         return savedSimpleContent | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun contains(k: K): Boolean { | ||||||
|  |         return simpleMessageContentCache.contains(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun remove(k: K) { | ||||||
|  |         simpleMessageContentCache.remove(k) | ||||||
|  |         messagesFilesCache.remove(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         operator fun invoke( | ||||||
|  |             bot: TelegramBot, | ||||||
|  |             filesRefreshingChatId: ChatId, | ||||||
|  |             simpleMessageContentCache: MessagesSimpleCache<String> = InMemoryMessagesSimpleCache(), | ||||||
|  |             mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay( | ||||||
|  |                 MediaFileActualityChecker.Default(filesRefreshingChatId) | ||||||
|  |             ), | ||||||
|  |             messagesFilesCache: MessagesFilesCache<String> = InMemoryMessagesFilesCache() | ||||||
|  |         ) = DefaultMessageContentCache(bot, filesRefreshingChatId, simpleMessageContentCache, mediaFileActualityChecker, messagesFilesCache) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,55 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import com.soywiz.klock.DateTime | ||||||
|  | import com.soywiz.klock.milliseconds | ||||||
|  | import dev.inmo.tgbotapi.bot.TelegramBot | ||||||
|  | import dev.inmo.tgbotapi.requests.DeleteMessage | ||||||
|  | import dev.inmo.tgbotapi.requests.abstracts.FileId | ||||||
|  | import dev.inmo.tgbotapi.types.ChatId | ||||||
|  | import dev.inmo.tgbotapi.types.MilliSeconds | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MediaContent | ||||||
|  |  | ||||||
|  | fun interface MediaFileActualityChecker { | ||||||
|  |     suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean | ||||||
|  |     suspend fun TelegramBot.saved(mediaContent: MediaContent) {} | ||||||
|  |  | ||||||
|  |     class Default( | ||||||
|  |         private val checkingChatId: ChatId | ||||||
|  |     ) : MediaFileActualityChecker { | ||||||
|  |         override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean { | ||||||
|  |             return runCatching { | ||||||
|  |                 execute(mediaContent.createResend(checkingChatId)).also { sentMessage -> | ||||||
|  |                     execute(DeleteMessage(sentMessage.chat.id, sentMessage.messageId)) | ||||||
|  |                 } | ||||||
|  |             }.isSuccess | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     class WithDelay( | ||||||
|  |         private val underhoodChecker: MediaFileActualityChecker, | ||||||
|  |         private val checkingDelay: MilliSeconds = 24 * 60 * 60 * 1000L // one day | ||||||
|  |     ) : MediaFileActualityChecker { | ||||||
|  |         private val fileIdChecksMap = mutableMapOf<FileId, DateTime>() | ||||||
|  |         private val checkingDelayTimeSpan = checkingDelay.milliseconds | ||||||
|  |  | ||||||
|  |         override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean { | ||||||
|  |             val now = DateTime.now() | ||||||
|  |             val lastCheck = fileIdChecksMap[mediaContent.media.fileId] | ||||||
|  |             return if (lastCheck == null || now - lastCheck > checkingDelayTimeSpan) { | ||||||
|  |                 with(underhoodChecker) { | ||||||
|  |                     isActual(mediaContent) | ||||||
|  |                 }.also { | ||||||
|  |                     if (it) { | ||||||
|  |                         fileIdChecksMap[mediaContent.media.fileId] = now | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } else { | ||||||
|  |                 true | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         override suspend fun TelegramBot.saved(mediaContent: MediaContent) { | ||||||
|  |             fileIdChecksMap[mediaContent.media.fileId] = DateTime.now() | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,19 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MediaContent | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MessageContent | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  |  | ||||||
|  | interface MessageContentCache<K> { | ||||||
|  |     suspend fun save(k: K, content: MessageContent) | ||||||
|  |     suspend fun save( | ||||||
|  |         k: K, | ||||||
|  |         content: MediaContent, | ||||||
|  |         filename: String, | ||||||
|  |         inputAllocator: suspend () -> Input | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |     suspend fun get(k: K): MessageContent? | ||||||
|  |     suspend fun contains(k: K): Boolean | ||||||
|  |     suspend fun remove(k: K) | ||||||
|  | } | ||||||
| @@ -0,0 +1,41 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.requests.abstracts.MultipartFile | ||||||
|  | import io.ktor.utils.io.core.* | ||||||
|  |  | ||||||
|  | interface MessagesFilesCache<K> { | ||||||
|  |     suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) | ||||||
|  |     suspend fun get(k: K): MultipartFile? | ||||||
|  |     suspend fun remove(k: K) | ||||||
|  |     suspend fun contains(k: K): Boolean | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * It is not recommended to use in production realization of [MessagesFilesCache] which has been created for fast | ||||||
|  |  * start of application creation with usage of [MessageContentCache] with aim to replace this realization by some | ||||||
|  |  * disks-oriented one | ||||||
|  |  */ | ||||||
|  | class InMemoryMessagesFilesCache<K> : MessagesFilesCache<K> { | ||||||
|  |     private val map = mutableMapOf<K, MultipartFile>() | ||||||
|  |  | ||||||
|  |     override suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) { | ||||||
|  |         val input = inputAllocator() | ||||||
|  |         map[k] = MultipartFile( | ||||||
|  |             filename | ||||||
|  |         ) { | ||||||
|  |             input | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun get(k: K): MultipartFile? { | ||||||
|  |         return map[k] | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun remove(k: K) { | ||||||
|  |         map.remove(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun contains(k: K): Boolean { | ||||||
|  |         return map.contains(k) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,53 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MessageContent | ||||||
|  |  | ||||||
|  | interface MessagesSimpleCache<K> { | ||||||
|  |     suspend fun set(k: K, content: MessageContent) | ||||||
|  |     suspend fun update(k: K, content: MessageContent): Boolean | ||||||
|  |     suspend fun get(k: K): MessageContent? | ||||||
|  |     suspend fun remove(k: K) | ||||||
|  |     suspend fun contains(k: K): Boolean | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * It is not recommended to use in production realization of [MessagesFilesCache] which has been created for fast | ||||||
|  |  * start of application creation with usage of [MessageContentCache] with aim to replace this realization by some | ||||||
|  |  * disks-oriented one | ||||||
|  |  */ | ||||||
|  | class InMemoryMessagesSimpleCache<K> : MessagesSimpleCache<K> { | ||||||
|  |     private val map = mutableMapOf<K, MessageContent>() | ||||||
|  |  | ||||||
|  |     override suspend fun set( | ||||||
|  |         k: K, | ||||||
|  |         content: MessageContent | ||||||
|  |     ) { | ||||||
|  |         map[k] = content | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun update( | ||||||
|  |         k: K, | ||||||
|  |         content: MessageContent | ||||||
|  |     ): Boolean { | ||||||
|  |         return map.runCatching { | ||||||
|  |             if (contains(k)) { | ||||||
|  |                 put(k, content) | ||||||
|  |                 true | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|  |         }.getOrDefault(false) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun get(k: K): MessageContent? { | ||||||
|  |         return map[k] | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun remove(k: K) { | ||||||
|  |         map.remove(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun contains(k: K): Boolean { | ||||||
|  |         return map.contains(k) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,72 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.requests.abstracts.MultipartFile | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  | import io.ktor.utils.io.core.copyTo | ||||||
|  | import io.ktor.utils.io.streams.asInput | ||||||
|  | import io.ktor.utils.io.streams.asOutput | ||||||
|  | import java.io.File | ||||||
|  |  | ||||||
|  | class InFilesMessagesFilesCache<K>( | ||||||
|  |     private val folderFile: File, | ||||||
|  |     private val filePrefixBuilder: (K) -> String | ||||||
|  | ) : MessagesFilesCache<K> { | ||||||
|  |     private val K.multipartFile: MultipartFile? | ||||||
|  |         get() { | ||||||
|  |             val prefix = filePrefix(this) | ||||||
|  |             val filename = folderFile.list() ?.firstOrNull { it.startsWith(prefix) } ?: return null | ||||||
|  |             val file = File(folderFile, filename) | ||||||
|  |             val storageFileFilename = file.name.removePrefix("$prefix ") | ||||||
|  |  | ||||||
|  |             return MultipartFile(storageFileFilename) { | ||||||
|  |                 file.inputStream().asInput() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |     init { | ||||||
|  |         require(!folderFile.isFile) { "Folder of messages files cache can't be file, but was $folderFile" } | ||||||
|  |         folderFile.mkdirs() | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     private fun filePrefix(k: K): String = filePrefixBuilder(k) | ||||||
|  |  | ||||||
|  |     private fun fileName(k: K, filename: String): String { | ||||||
|  |         return "${filePrefix(k)} $filename" | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) { | ||||||
|  |         val fullFileName = fileName(k, filename) | ||||||
|  |         val file = File(folderFile, fullFileName).apply { | ||||||
|  |             delete() | ||||||
|  |         } | ||||||
|  |         inputAllocator().use { input -> | ||||||
|  |             file.outputStream().asOutput().use { output -> | ||||||
|  |                 input.copyTo(output) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun get(k: K): MultipartFile? { | ||||||
|  |         return k.multipartFile | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun remove(k: K) { | ||||||
|  |         val prefix = filePrefix(k) | ||||||
|  |         folderFile.listFiles() ?.forEach { | ||||||
|  |             if (it.name.startsWith(prefix)) { | ||||||
|  |                 it.delete() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun contains(k: K): Boolean { | ||||||
|  |         val prefix = filePrefix(k) | ||||||
|  |         return folderFile.list() ?.any { it.startsWith(prefix) } == true | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         operator fun invoke(folderFile: File) = InFilesMessagesFilesCache<String>( | ||||||
|  |             folderFile | ||||||
|  |         ) { it } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										1
									
								
								cache/content/common/src/main/AndroidManifest.xml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								cache/content/common/src/main/AndroidManifest.xml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <manifest package="dev.inmo.tgbotapi.libraries.cache.content.common"/> | ||||||
							
								
								
									
										19
									
								
								cache/content/micro_utils/build.gradle
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								cache/content/micro_utils/build.gradle
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,19 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppProjectWithSerializationPresetPath" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api "dev.inmo:micro_utils.repos.common:$micro_utils_version" | ||||||
|  |                 api project(":tgbotapi.libraries.cache.content.common") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
| @@ -0,0 +1,95 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.micro_utils | ||||||
|  |  | ||||||
|  | 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.message.content.MessageContent | ||||||
|  | import kotlinx.serialization.* | ||||||
|  | import kotlinx.serialization.builtins.PairSerializer | ||||||
|  | import kotlinx.serialization.builtins.serializer | ||||||
|  | import kotlinx.serialization.json.Json | ||||||
|  | import kotlinx.serialization.modules.SerializersModule | ||||||
|  | import kotlin.js.JsName | ||||||
|  | import kotlin.jvm.JvmName | ||||||
|  |  | ||||||
|  | class SimpleKeyValueMessageContentCache<K>( | ||||||
|  |     private val keyValueRepo: KeyValueRepo<K, MessageContent> | ||||||
|  | ) : MessagesSimpleCache<K> { | ||||||
|  |     override suspend fun set(k: K, content: MessageContent) { | ||||||
|  |         keyValueRepo.set(k, content) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun update(k: K, content: MessageContent): Boolean { | ||||||
|  |         return keyValueRepo.runCatching { | ||||||
|  |             if (contains(k)) { | ||||||
|  |                 keyValueRepo.set(k, content) | ||||||
|  |                 true | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|  |         }.getOrDefault(false) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun get(k: K): MessageContent? { | ||||||
|  |         return keyValueRepo.get(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun contains(k: K): Boolean { | ||||||
|  |         return keyValueRepo.contains(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun remove(k: K) { | ||||||
|  |         keyValueRepo.unset(k) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | val chatIdToMessageIdentifierSerializer = PairSerializer( | ||||||
|  |     ChatId.serializer(), | ||||||
|  |     MessageIdentifier.serializer() | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class) | ||||||
|  |  | ||||||
|  | inline fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleKeyValueMessageContentCache(this) | ||||||
|  |  | ||||||
|  | inline fun KeyValueRepo<String, String>.asMessageContentCache( | ||||||
|  |     serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } } | ||||||
|  | ): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> { | ||||||
|  |     val serialFormat = serialFormatCreator(MessageContent.serializationModule()) | ||||||
|  |     return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, String, String>( | ||||||
|  |         { serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.encodeToString(messageContentSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromString(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromString(messageContentSerializer, this) }, | ||||||
|  |     ) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @JvmName("stringsKeyValueAsHexMessageContentCache") | ||||||
|  | @JsName("stringsKeyValueAsHexMessageContentCache") | ||||||
|  | inline fun KeyValueRepo<String, String>.asMessageContentCache( | ||||||
|  |     serialFormatCreator: (SerializersModule) -> BinaryFormat | ||||||
|  | ): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> { | ||||||
|  |     val serialFormat = serialFormatCreator(MessageContent.serializationModule()) | ||||||
|  |     return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, String, String>( | ||||||
|  |         { serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.encodeToHexString(messageContentSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromHexString(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromHexString(messageContentSerializer, this) }, | ||||||
|  |     ) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @JvmName("bytesKeyValueAsMessageContentCache") | ||||||
|  | @JsName("bytesKeyValueAsMessageContentCache") | ||||||
|  | inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache( | ||||||
|  |     serialFormatCreator: (SerializersModule) -> BinaryFormat | ||||||
|  | ): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> { | ||||||
|  |     val serialFormat = serialFormatCreator(MessageContent.serializationModule()) | ||||||
|  |     return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, ByteArray, ByteArray>( | ||||||
|  |         { serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.encodeToByteArray(messageContentSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromByteArray(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromByteArray(messageContentSerializer, this) }, | ||||||
|  |     ) | ||||||
|  | } | ||||||
							
								
								
									
										1
									
								
								cache/content/micro_utils/src/main/AndroidManifest.xml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								cache/content/micro_utils/src/main/AndroidManifest.xml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <manifest package="dev.inmo.tgbotapi.libraries.cache.content.micro_utils"/> | ||||||
							
								
								
									
										1
									
								
								cache/media/src/main/AndroidManifest.xml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								cache/media/src/main/AndroidManifest.xml
									
									
									
									
										vendored
									
									
								
							| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.tgbotapi.libraries.cache.media"/> |  | ||||||
| @@ -6,32 +6,32 @@ kotlin.incremental.js=true | |||||||
| android.useAndroidX=true | android.useAndroidX=true | ||||||
| android.enableJetifier=true | android.enableJetifier=true | ||||||
|  |  | ||||||
| kotlin_version=1.6.10 | kotlin_version=1.7.10 | ||||||
| kotlin_serialisation_core_version=1.3.2 | kotlin_serialisation_core_version=1.4.0 | ||||||
|  |  | ||||||
| github_release_plugin_version=2.2.12 | github_release_plugin_version=2.4.1 | ||||||
|  |  | ||||||
| tgbotapi_version=0.38.4 | tgbotapi_version=3.2.7 | ||||||
| micro_utils_version=0.9.5 | micro_utils_version=0.12.17 | ||||||
| exposed_version=0.37.2 | exposed_version=0.39.2 | ||||||
| plagubot_version=0.5.1 | plagubot_version=2.3.4 | ||||||
|  |  | ||||||
| # ANDROID | # ANDROID | ||||||
|  |  | ||||||
| android_minSdkVersion=21 | android_minSdkVersion=21 | ||||||
| android_compileSdkVersion=32 | android_compileSdkVersion=33 | ||||||
| android_buildToolsVersion=32.0.0 | android_buildToolsVersion=33.0.0 | ||||||
| dexcount_version=3.0.1 | dexcount_version=3.1.0 | ||||||
| junit_version=4.12 | junit_version=4.12 | ||||||
| test_ext_junit_version=1.1.2 | test_ext_junit_version=1.1.3 | ||||||
| espresso_core=3.3.0 | espresso_core=3.4.0 | ||||||
|  |  | ||||||
| # Dokka | # Dokka | ||||||
|  |  | ||||||
| dokka_version=1.6.10 | dokka_version=1.7.10 | ||||||
|  |  | ||||||
| # Project data | # Project data | ||||||
|  |  | ||||||
| group=dev.inmo | group=dev.inmo | ||||||
| version=0.0.16 | version=0.5.5 | ||||||
| android_code_version=16 | android_code_version=32 | ||||||
|   | |||||||
							
								
								
									
										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-7.3-bin.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
|   | |||||||
| @@ -5,7 +5,11 @@ apply from: "$publishGradlePath" | |||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     jvm { |     jvm { | ||||||
|         compilations.main.kotlinOptions.useIR = true |         compilations.main { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "1.8" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,13 @@ project.group = "$group" | |||||||
| apply from: "$publishGradlePath" | apply from: "$publishGradlePath" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     jvm() |     jvm { | ||||||
|  |         compilations.main { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "1.8" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|     js (IR) { |     js (IR) { | ||||||
|         browser() |         browser() | ||||||
|         nodejs() |         nodejs() | ||||||
|   | |||||||
| @@ -4,13 +4,15 @@ String[] includes = [ | |||||||
|     ":cache:admins:common", |     ":cache:admins:common", | ||||||
|     ":cache:admins:micro_utils", |     ":cache:admins:micro_utils", | ||||||
|     ":cache:admins:plagubot", |     ":cache:admins:plagubot", | ||||||
|     ":cache:media" |  | ||||||
|  |     ":cache:content:common", | ||||||
|  |     ":cache:content:micro_utils", | ||||||
| ] | ] | ||||||
|  |  | ||||||
|  |  | ||||||
| includes.each { originalName -> | includes.each { originalName -> | ||||||
|     String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replaceAll(":", File.separator)}" |     String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replace(":", File.separator)}" | ||||||
|     String projectName = "${rootProject.name}${originalName.replaceAll(":", ".")}" |     String projectName = "${rootProject.name}${originalName.replace(":", ".")}" | ||||||
|     String projectIdentifier = ":${projectName}" |     String projectIdentifier = ":${projectName}" | ||||||
|     include projectIdentifier |     include projectIdentifier | ||||||
|     ProjectDescriptor project = project(projectIdentifier) |     ProjectDescriptor project = project(projectIdentifier) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user