mirror of
				https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
				synced 2025-11-04 06:00:24 +00:00 
			
		
		
		
	Compare commits
	
		
			54 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| efeb15b971 | |||
| d33ca67c7c | |||
| f59ff6dd3c | |||
| 8f643a7d5b | |||
| 980badd275 | |||
| a2e65f7b24 | |||
| f86cef7118 | |||
| 2278572cb2 | |||
| 3ce3b03f02 | |||
| 48b5f88359 | |||
| 0bb7257ec3 | |||
| 2b503786ca | |||
| 4622359592 | |||
| 0fa045f6a9 | |||
| 7759d5faa5 | |||
| d6896c63b5 | |||
| 262c496d45 | |||
| 17072092ae | |||
| 78c44a2c61 | |||
| 0263fe0862 | |||
| 3baccc6c12 | |||
| 87bd39544d | |||
| 4bb1f54ddb | |||
| a4662b084a | |||
| 53fd94f094 | |||
| 2b288c43c0 | |||
| 842dcbf4b6 | |||
| 653d17827a | |||
| e4a21fe293 | |||
| 7b75828b2e | |||
| e8cb9556db | |||
| d118a3d060 | |||
| 62fb8854b9 | |||
| 7163f7d64a | |||
| 8a6925e95c | |||
| fd275ddacf | |||
| 8e281f0edc | |||
| f802aa6a99 | |||
| ee9f524fc6 | |||
| 950eebea06 | |||
| 7845b7cc5f | |||
| 539515da43 | |||
| 3695ab7936 | |||
| ab802df7d1 | |||
| c85d92c7ba | |||
| cea8ba47db | |||
| b2719c0760 | |||
| 1c87f64a6d | |||
| 53630d4864 | |||
| bb7fb985e3 | |||
| 18fc3fd1dd | |||
| 5f1f512db4 | |||
| 961d7d9afd | |||
| 6a84bcb860 | 
@@ -7,10 +7,8 @@ buildscript {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dependencies {
 | 
					    dependencies {
 | 
				
			||||||
        classpath 'com.android.tools.build:gradle:7.0.4'
 | 
					 | 
				
			||||||
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 | 
					        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 | 
				
			||||||
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 | 
					        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 | 
				
			||||||
        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
 | 
					 | 
				
			||||||
        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
 | 
					        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -20,6 +18,7 @@ allprojects {
 | 
				
			|||||||
        mavenLocal()
 | 
					        mavenLocal()
 | 
				
			||||||
        mavenCentral()
 | 
					        mavenCentral()
 | 
				
			||||||
        google()
 | 
					        google()
 | 
				
			||||||
 | 
					        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								cache/admins/common/build.gradle
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								cache/admins/common/build.gradle
									
									
									
									
										vendored
									
									
								
							@@ -1,10 +1,9 @@
 | 
				
			|||||||
plugins {
 | 
					plugins {
 | 
				
			||||||
    id "org.jetbrains.kotlin.multiplatform"
 | 
					    id "org.jetbrains.kotlin.multiplatform"
 | 
				
			||||||
    id "org.jetbrains.kotlin.plugin.serialization"
 | 
					    id "org.jetbrains.kotlin.plugin.serialization"
 | 
				
			||||||
    id "com.android.library"
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
apply from: "$mppProjectWithSerializationPresetPath"
 | 
					apply from: "$mppJavaWithJsProjectPath"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
kotlin {
 | 
					kotlin {
 | 
				
			||||||
    sourceSets {
 | 
					    sourceSets {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,8 +7,8 @@ import dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage
 | 
				
			|||||||
import dev.inmo.tgbotapi.types.message.abstracts.Message
 | 
					import dev.inmo.tgbotapi.types.message.abstracts.Message
 | 
				
			||||||
 | 
					
 | 
				
			||||||
interface AdminsCacheAPI {
 | 
					interface AdminsCacheAPI {
 | 
				
			||||||
    suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>?
 | 
					    suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>?
 | 
				
			||||||
    suspend fun isAdmin(chatId: ChatId, userId: UserId): Boolean = getChatAdmins(chatId) ?.any {
 | 
					    suspend fun isAdmin(chatId: IdChatIdentifier, userId: UserId): Boolean = getChatAdmins(chatId) ?.any {
 | 
				
			||||||
        it.user.id == userId
 | 
					        it.user.id == userId
 | 
				
			||||||
    } == true
 | 
					    } == true
 | 
				
			||||||
    suspend fun sentByAdmin(groupContentMessage: GroupContentMessage<*>): Boolean
 | 
					    suspend fun sentByAdmin(groupContentMessage: GroupContentMessage<*>): Boolean
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package dev.inmo.tgbotapi.libraries.cache.admins
 | 
					package dev.inmo.tgbotapi.libraries.cache.admins
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.soywiz.klock.minutes
 | 
					import com.soywiz.klock.minutes
 | 
				
			||||||
import dev.inmo.tgbotapi.types.ChatId
 | 
					import dev.inmo.tgbotapi.types.IdChatIdentifier
 | 
				
			||||||
import dev.inmo.tgbotapi.types.Seconds
 | 
					import dev.inmo.tgbotapi.types.Seconds
 | 
				
			||||||
import kotlinx.coroutines.flow.SharedFlow
 | 
					import kotlinx.coroutines.flow.SharedFlow
 | 
				
			||||||
import kotlinx.serialization.Serializable
 | 
					import kotlinx.serialization.Serializable
 | 
				
			||||||
@@ -15,27 +15,30 @@ 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 {
 | 
				
			||||||
    suspend fun getChatSettings(chatId: ChatId): AdminsCacheSettings?
 | 
					    suspend fun getChatSettings(chatId: IdChatIdentifier): AdminsCacheSettings?
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
interface MutableAdminsCacheSettingsAPI : AdminsCacheSettingsAPI {
 | 
					interface MutableAdminsCacheSettingsAPI : AdminsCacheSettingsAPI {
 | 
				
			||||||
    val chatSettingsUpdatedFlow: SharedFlow<Pair<ChatId, AdminsCacheSettings>>
 | 
					    val chatSettingsUpdatedFlow: SharedFlow<Pair<IdChatIdentifier, AdminsCacheSettings>>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    suspend fun setChatSettings(chatId: ChatId, settings: AdminsCacheSettings)
 | 
					    suspend fun setChatSettings(chatId: IdChatIdentifier, settings: AdminsCacheSettings)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fun AdminsCacheSettingsAPI.asMutable(): MutableAdminsCacheSettingsAPI? = this as? MutableAdminsCacheSettingsAPI
 | 
					fun AdminsCacheSettingsAPI.asMutable(): MutableAdminsCacheSettingsAPI? = this as? MutableAdminsCacheSettingsAPI
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@Serializable
 | 
					@Serializable
 | 
				
			||||||
class StaticAdminsCacheSettingsAPI(
 | 
					class StaticAdminsCacheSettingsAPI(
 | 
				
			||||||
    private val settings: Map<ChatId, AdminsCacheSettings>
 | 
					    private val settings: Map<IdChatIdentifier, AdminsCacheSettings>
 | 
				
			||||||
) : AdminsCacheSettingsAPI {
 | 
					) : AdminsCacheSettingsAPI {
 | 
				
			||||||
    override suspend fun getChatSettings(chatId: ChatId): AdminsCacheSettings? = settings[chatId]
 | 
					    override suspend fun getChatSettings(chatId: IdChatIdentifier): AdminsCacheSettings? = settings[chatId]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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.IdChatIdentifier
 | 
				
			||||||
 | 
					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<IdChatIdentifier>
 | 
				
			||||||
 | 
					) = 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.IdChatIdentifier
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.UserId
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.message.abstracts.Message
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					fun AdminsChecker(
 | 
				
			||||||
 | 
					    adminsCacheAPI: AdminsCacheAPI
 | 
				
			||||||
 | 
					): SimpleFilter<Pair<IdChatIdentifier, UserId>> = SimpleFilter {
 | 
				
			||||||
 | 
					    adminsCacheAPI.isAdmin(it.first, it.second)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					fun <T> AdminsChecker(
 | 
				
			||||||
 | 
					    adminsCacheAPI: AdminsCacheAPI,
 | 
				
			||||||
 | 
					    mapper: (T) -> Pair<IdChatIdentifier, 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: IdChatIdentifier
 | 
				
			||||||
 | 
					) = SimpleFilter<FromUser> {
 | 
				
			||||||
 | 
					    adminsCacheAPI.isAdmin(chatId, it.from.id)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -3,7 +3,7 @@ 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.chat.ExtendedBot
 | 
					import dev.inmo.tgbotapi.types.chat.ExtendedBot
 | 
				
			||||||
import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 | 
					import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 | 
				
			||||||
@@ -11,9 +11,9 @@ import dev.inmo.tgbotapi.types.message.abstracts.*
 | 
				
			|||||||
import kotlinx.serialization.Serializable
 | 
					import kotlinx.serialization.Serializable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
interface DefaultAdminsCacheAPIRepo {
 | 
					interface DefaultAdminsCacheAPIRepo {
 | 
				
			||||||
    suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>?
 | 
					    suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>?
 | 
				
			||||||
    suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>)
 | 
					    suspend fun setChatAdmins(chatId: IdChatIdentifier, chatMembers: List<AdministratorChatMember>)
 | 
				
			||||||
    suspend fun lastUpdate(chatId: ChatId): DateTime?
 | 
					    suspend fun lastUpdate(chatId: IdChatIdentifier): DateTime?
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@Serializable
 | 
					@Serializable
 | 
				
			||||||
@@ -29,28 +29,37 @@ class DefaultAdminsCacheAPI(
 | 
				
			|||||||
        bot.getMe().also { botInfo = it }
 | 
					        bot.getMe().also { botInfo = it }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private suspend fun triggerUpdate(chatId: ChatId): List<AdministratorChatMember> {
 | 
					    override suspend fun getChatAdmins(chatId: IdChatIdentifier): 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>? {
 | 
					 | 
				
			||||||
        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: IdChatIdentifier, 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
 | 
				
			||||||
@@ -63,5 +72,4 @@ class DefaultAdminsCacheAPI(
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    override suspend fun settings(): AdminsCacheSettingsAPI = settingsAPI
 | 
					    override suspend fun settings(): AdminsCacheSettingsAPI = settingsAPI
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,20 +1,43 @@
 | 
				
			|||||||
package dev.inmo.tgbotapi.libraries.cache.admins
 | 
					package dev.inmo.tgbotapi.libraries.cache.admins
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import dev.inmo.tgbotapi.types.ChatId
 | 
					import dev.inmo.tgbotapi.types.IdChatIdentifier
 | 
				
			||||||
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: IdChatIdentifier,
 | 
				
			||||||
 | 
					    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.IdChatIdentifier
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.chat.ExtendedBot
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					internal suspend fun TelegramBot.updateAdmins(
 | 
				
			||||||
 | 
					    chatId: IdChatIdentifier,
 | 
				
			||||||
 | 
					    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 +0,0 @@
 | 
				
			|||||||
<manifest package="dev.inmo.tgbotapi.libraries.cache.admins"/>
 | 
					 | 
				
			||||||
							
								
								
									
										3
									
								
								cache/admins/micro_utils/build.gradle
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								cache/admins/micro_utils/build.gradle
									
									
									
									
										vendored
									
									
								
							@@ -1,10 +1,9 @@
 | 
				
			|||||||
plugins {
 | 
					plugins {
 | 
				
			||||||
    id "org.jetbrains.kotlin.multiplatform"
 | 
					    id "org.jetbrains.kotlin.multiplatform"
 | 
				
			||||||
    id "org.jetbrains.kotlin.plugin.serialization"
 | 
					    id "org.jetbrains.kotlin.plugin.serialization"
 | 
				
			||||||
    id "com.android.library"
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
apply from: "$mppProjectWithSerializationPresetPath"
 | 
					apply from: "$mppJavaWithJsProjectPath"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
kotlin {
 | 
					kotlin {
 | 
				
			||||||
    sourceSets {
 | 
					    sourceSets {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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.chat.member.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: IdChatIdentifier,
 | 
				
			||||||
    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: IdChatIdentifier,
 | 
				
			||||||
    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: IdChatIdentifier,
 | 
				
			||||||
    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<IdChatIdentifier, AdministratorChatMember>,
 | 
				
			||||||
    private val updatesRepo: KeyValueRepo<ChatId, MilliSeconds>,
 | 
					    private val updatesRepo: KeyValueRepo<IdChatIdentifier, 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: IdChatIdentifier): 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: IdChatIdentifier, 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: IdChatIdentifier): 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<IdChatIdentifier, AdministratorChatMember>,
 | 
				
			||||||
 | 
					    updatesRepo: KeyValueRepo<IdChatIdentifier, MilliSeconds>,
 | 
				
			||||||
 | 
					    scope: CoroutineScope
 | 
				
			||||||
 | 
					) = DefaultAdminsCacheAPIRepoImpl(adminsRepo, updatesRepo, scope)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,22 +3,22 @@ package dev.inmo.tgbotapi.libraries.cache.admins.micro_utils
 | 
				
			|||||||
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 | 
					import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 | 
				
			||||||
import dev.inmo.micro_utils.repos.*
 | 
					import dev.inmo.micro_utils.repos.*
 | 
				
			||||||
import dev.inmo.tgbotapi.libraries.cache.admins.*
 | 
					import dev.inmo.tgbotapi.libraries.cache.admins.*
 | 
				
			||||||
import dev.inmo.tgbotapi.types.ChatId
 | 
					import dev.inmo.tgbotapi.types.IdChatIdentifier
 | 
				
			||||||
import kotlinx.coroutines.CoroutineScope
 | 
					import kotlinx.coroutines.CoroutineScope
 | 
				
			||||||
import kotlinx.coroutines.flow.*
 | 
					import kotlinx.coroutines.flow.*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DynamicAdminsCacheSettingsAPI(
 | 
					class DynamicAdminsCacheSettingsAPI(
 | 
				
			||||||
    private val repo: KeyValueRepo<ChatId, AdminsCacheSettings>,
 | 
					    private val repo: KeyValueRepo<IdChatIdentifier, AdminsCacheSettings>,
 | 
				
			||||||
    private val scope: CoroutineScope
 | 
					    private val scope: CoroutineScope
 | 
				
			||||||
) : AdminsCacheSettingsAPI, MutableAdminsCacheSettingsAPI {
 | 
					) : AdminsCacheSettingsAPI, MutableAdminsCacheSettingsAPI {
 | 
				
			||||||
    override val chatSettingsUpdatedFlow: SharedFlow<Pair<ChatId, AdminsCacheSettings>>
 | 
					    override val chatSettingsUpdatedFlow: SharedFlow<Pair<IdChatIdentifier, AdminsCacheSettings>>
 | 
				
			||||||
        get() = repo.onNewValue.shareIn(scope, SharingStarted.Eagerly)
 | 
					        get() = repo.onNewValue.shareIn(scope, SharingStarted.Eagerly)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    override suspend fun setChatSettings(chatId: ChatId, settings: AdminsCacheSettings) {
 | 
					    override suspend fun setChatSettings(chatId: IdChatIdentifier, settings: AdminsCacheSettings) {
 | 
				
			||||||
        repo.set(chatId, settings)
 | 
					        repo.set(chatId, settings)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    override suspend fun getChatSettings(chatId: ChatId): AdminsCacheSettings {
 | 
					    override suspend fun getChatSettings(chatId: IdChatIdentifier): AdminsCacheSettings {
 | 
				
			||||||
        val settings = repo.get(chatId)
 | 
					        val settings = repo.get(chatId)
 | 
				
			||||||
        return if (settings == null) {
 | 
					        return if (settings == null) {
 | 
				
			||||||
            val newSettings = AdminsCacheSettings()
 | 
					            val newSettings = AdminsCacheSettings()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,20 +5,18 @@ 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.chat.member.*
 | 
					import dev.inmo.tgbotapi.types.chat.member.*
 | 
				
			||||||
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) {
 | 
				
			||||||
@@ -29,30 +27,29 @@ private val serializationFormat = Json {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
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,
 | 
					 | 
				
			||||||
    DefaultAdminsCacheAPIRepo(
 | 
					 | 
				
			||||||
        ExposedKeyValuesRepo(
 | 
					        ExposedKeyValuesRepo(
 | 
				
			||||||
            database,
 | 
					            database,
 | 
				
			||||||
            { long("chatId") },
 | 
					            { long("chatId") },
 | 
				
			||||||
            { text("member") },
 | 
					            { text("member") },
 | 
				
			||||||
            "AdminsTable"
 | 
					            "AdminsTable"
 | 
				
			||||||
        ).withMapper<ChatId, AdministratorChatMember, Identifier, String>(
 | 
					        ).withMapper<IdChatIdentifier, 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,
 | 
				
			||||||
            { long("chatId") },
 | 
					            { long("chatId") },
 | 
				
			||||||
            { long("datetime") },
 | 
					            { long("datetime") },
 | 
				
			||||||
            "AdminsUpdatesTimesTable"
 | 
					            "AdminsUpdatesTimesTable"
 | 
				
			||||||
        ).withMapper<ChatId, Long, Identifier, Long>(
 | 
					        ).withMapper<IdChatIdentifier, Long, Identifier, Long>(
 | 
				
			||||||
            keyFromToTo = { chatId },
 | 
					            keyFromToTo = { chatId },
 | 
				
			||||||
            valueFromToTo = { this },
 | 
					            valueFromToTo = { this },
 | 
				
			||||||
            keyToToFrom = { toChatId() },
 | 
					            keyToToFrom = { toChatId() },
 | 
				
			||||||
@@ -60,20 +57,27 @@ fun AdminsCacheAPI(
 | 
				
			|||||||
        ),
 | 
					        ),
 | 
				
			||||||
        scope
 | 
					        scope
 | 
				
			||||||
    ),
 | 
					    ),
 | 
				
			||||||
    DynamicAdminsCacheSettingsAPI(
 | 
					    adminsCacheSettingsAPI: AdminsCacheSettingsAPI = DynamicAdminsCacheSettingsAPI(
 | 
				
			||||||
        ExposedKeyValueRepo(
 | 
					        ExposedKeyValueRepo(
 | 
				
			||||||
            database,
 | 
					            database,
 | 
				
			||||||
            { long("chatId") },
 | 
					            { long("chatId") },
 | 
				
			||||||
            { text("settings") },
 | 
					            { text("settings") },
 | 
				
			||||||
            "DynamicAdminsCacheSettingsAPI"
 | 
					            "DynamicAdminsCacheSettingsAPI"
 | 
				
			||||||
        ).withMapper<ChatId, AdminsCacheSettings, Identifier, String>(
 | 
					        ).withMapper<IdChatIdentifier, 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 +0,0 @@
 | 
				
			|||||||
<manifest package="dev.inmo.tgbotapi.libraries.cache.admins.micro_utils"/>
 | 
					 | 
				
			||||||
							
								
								
									
										3
									
								
								cache/admins/plagubot/build.gradle
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								cache/admins/plagubot/build.gradle
									
									
									
									
										vendored
									
									
								
							@@ -1,10 +1,9 @@
 | 
				
			|||||||
plugins {
 | 
					plugins {
 | 
				
			||||||
    id "org.jetbrains.kotlin.multiplatform"
 | 
					    id "org.jetbrains.kotlin.multiplatform"
 | 
				
			||||||
    id "org.jetbrains.kotlin.plugin.serialization"
 | 
					    id "org.jetbrains.kotlin.plugin.serialization"
 | 
				
			||||||
    id "com.android.library"
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
apply from: "$mppProjectWithSerializationPresetPath"
 | 
					apply from: "$mppJavaWithJsProjectPath"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
kotlin {
 | 
					kotlin {
 | 
				
			||||||
    sourceSets {
 | 
					    sourceSets {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,18 +1,26 @@
 | 
				
			|||||||
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 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.Koin
 | 
				
			||||||
import org.koin.core.module.Module
 | 
					import org.koin.core.module.Module
 | 
				
			||||||
 | 
					import org.koin.core.qualifier.named
 | 
				
			||||||
import org.koin.core.scope.Scope
 | 
					import org.koin.core.scope.Scope
 | 
				
			||||||
 | 
					import org.koin.dsl.binds
 | 
				
			||||||
 | 
					
 | 
				
			||||||
val Scope.adminsPlugin: AdminsPlugin?
 | 
					val Scope.adminsPlugin: AdminsPlugin?
 | 
				
			||||||
    get() = getOrNull()
 | 
					    get() = getOrNull()
 | 
				
			||||||
@@ -28,6 +36,7 @@ class AdminsPlugin : Plugin {
 | 
				
			|||||||
    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 {
 | 
				
			||||||
        val flow = mutex.withLock {
 | 
					        val flow = mutex.withLock {
 | 
				
			||||||
            databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) }
 | 
					            databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) }
 | 
				
			||||||
@@ -37,16 +46,61 @@ class AdminsPlugin : Plugin {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    override fun Module.setupDI(database: Database, params: JsonObject) {
 | 
					    override fun Module.setupDI(database: Database, params: JsonObject) {
 | 
				
			||||||
        single { this@AdminsPlugin }
 | 
					        single { this@AdminsPlugin }
 | 
				
			||||||
 | 
					        val scopeQualifier = named("admins plugin scope")
 | 
				
			||||||
 | 
					        single(scopeQualifier) { CoroutineScope(Dispatchers.IO + SupervisorJob()) }
 | 
				
			||||||
 | 
					        single<DefaultAdminsCacheAPIRepo> {
 | 
				
			||||||
 | 
					            DefaultAdminsCacheAPIRepoImpl(
 | 
				
			||||||
 | 
					                ExposedKeyValuesRepo(
 | 
				
			||||||
 | 
					                    database,
 | 
				
			||||||
 | 
					                    { long("chatId") },
 | 
				
			||||||
 | 
					                    { text("member") },
 | 
				
			||||||
 | 
					                    "AdminsTable"
 | 
				
			||||||
 | 
					                ).withMapper<IdChatIdentifier, AdministratorChatMember, Identifier, String>(
 | 
				
			||||||
 | 
					                    keyFromToTo = { chatId },
 | 
				
			||||||
 | 
					                    valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
 | 
				
			||||||
 | 
					                    keyToToFrom = { toChatId() },
 | 
				
			||||||
 | 
					                    valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
 | 
				
			||||||
 | 
					                ),
 | 
				
			||||||
 | 
					                ExposedKeyValueRepo(
 | 
				
			||||||
 | 
					                    database,
 | 
				
			||||||
 | 
					                    { long("chatId") },
 | 
				
			||||||
 | 
					                    { long("datetime") },
 | 
				
			||||||
 | 
					                    "AdminsUpdatesTimesTable"
 | 
				
			||||||
 | 
					                ).withMapper<IdChatIdentifier, Long, Identifier, Long>(
 | 
				
			||||||
 | 
					                    keyFromToTo = { chatId },
 | 
				
			||||||
 | 
					                    valueFromToTo = { this },
 | 
				
			||||||
 | 
					                    keyToToFrom = { toChatId() },
 | 
				
			||||||
 | 
					                    valueToToFrom = { this }
 | 
				
			||||||
 | 
					                ),
 | 
				
			||||||
 | 
					                get(scopeQualifier)
 | 
				
			||||||
 | 
					            )
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        single<AdminsCacheSettingsAPI> {
 | 
				
			||||||
 | 
					            DynamicAdminsCacheSettingsAPI(
 | 
				
			||||||
 | 
					                ExposedKeyValueRepo(
 | 
				
			||||||
 | 
					                    database,
 | 
				
			||||||
 | 
					                    { long("chatId") },
 | 
				
			||||||
 | 
					                    { text("settings") },
 | 
				
			||||||
 | 
					                    "DynamicAdminsCacheSettingsAPI"
 | 
				
			||||||
 | 
					                ).withMapper<IdChatIdentifier, 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) {
 | 
					    override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
 | 
				
			||||||
        with(koin) {
 | 
					        with(koin) {
 | 
				
			||||||
            mutex.withLock {
 | 
					            activateAdminsChangesListening(
 | 
				
			||||||
                val flow = databaseToAdminsCacheAPI.getOrPut(koin.get()){ MutableStateFlow(null) }
 | 
					                get()
 | 
				
			||||||
                if (flow.value == null) {
 | 
					            )
 | 
				
			||||||
                    flow.value = AdminsCacheAPI(koin.get())
 | 
					 | 
				
			||||||
                }
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1 +0,0 @@
 | 
				
			|||||||
<manifest package="dev.inmo.tgbotapi.libraries.cache.admins.plagubot"/>
 | 
					 | 
				
			||||||
							
								
								
									
										3
									
								
								cache/content/common/build.gradle
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								cache/content/common/build.gradle
									
									
									
									
										vendored
									
									
								
							@@ -1,10 +1,9 @@
 | 
				
			|||||||
plugins {
 | 
					plugins {
 | 
				
			||||||
    id "org.jetbrains.kotlin.multiplatform"
 | 
					    id "org.jetbrains.kotlin.multiplatform"
 | 
				
			||||||
    id "org.jetbrains.kotlin.plugin.serialization"
 | 
					    id "org.jetbrains.kotlin.plugin.serialization"
 | 
				
			||||||
    id "com.android.library"
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
apply from: "$mppProjectWithSerializationPresetPath"
 | 
					apply from: "$mppJavaWithJsProjectPath"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
kotlin {
 | 
					kotlin {
 | 
				
			||||||
    sourceSets {
 | 
					    sourceSets {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 | 
				
			|||||||
import dev.inmo.tgbotapi.requests.DownloadFileStream
 | 
					import dev.inmo.tgbotapi.requests.DownloadFileStream
 | 
				
			||||||
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.ChatId
 | 
					import dev.inmo.tgbotapi.types.IdChatIdentifier
 | 
				
			||||||
import dev.inmo.tgbotapi.types.media.*
 | 
					import dev.inmo.tgbotapi.types.media.*
 | 
				
			||||||
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
 | 
				
			||||||
@@ -13,7 +13,7 @@ import io.ktor.utils.io.core.Input
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
class DefaultMessageContentCache<K>(
 | 
					class DefaultMessageContentCache<K>(
 | 
				
			||||||
    private val bot: TelegramBot,
 | 
					    private val bot: TelegramBot,
 | 
				
			||||||
    private val filesRefreshingChatId: ChatId,
 | 
					    private val filesRefreshingChatId: IdChatIdentifier,
 | 
				
			||||||
    private val simpleMessageContentCache: MessagesSimpleCache<K>,
 | 
					    private val simpleMessageContentCache: MessagesSimpleCache<K>,
 | 
				
			||||||
    private val mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
 | 
					    private val mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
 | 
				
			||||||
        MediaFileActualityChecker.Default(filesRefreshingChatId)
 | 
					        MediaFileActualityChecker.Default(filesRefreshingChatId)
 | 
				
			||||||
@@ -111,7 +111,7 @@ class DefaultMessageContentCache<K>(
 | 
				
			|||||||
    companion object {
 | 
					    companion object {
 | 
				
			||||||
        operator fun invoke(
 | 
					        operator fun invoke(
 | 
				
			||||||
            bot: TelegramBot,
 | 
					            bot: TelegramBot,
 | 
				
			||||||
            filesRefreshingChatId: ChatId,
 | 
					            filesRefreshingChatId: IdChatIdentifier,
 | 
				
			||||||
            simpleMessageContentCache: MessagesSimpleCache<String> = InMemoryMessagesSimpleCache(),
 | 
					            simpleMessageContentCache: MessagesSimpleCache<String> = InMemoryMessagesSimpleCache(),
 | 
				
			||||||
            mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
 | 
					            mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
 | 
				
			||||||
                MediaFileActualityChecker.Default(filesRefreshingChatId)
 | 
					                MediaFileActualityChecker.Default(filesRefreshingChatId)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,6 +6,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 | 
				
			|||||||
import dev.inmo.tgbotapi.requests.DeleteMessage
 | 
					import dev.inmo.tgbotapi.requests.DeleteMessage
 | 
				
			||||||
import dev.inmo.tgbotapi.requests.abstracts.FileId
 | 
					import dev.inmo.tgbotapi.requests.abstracts.FileId
 | 
				
			||||||
import dev.inmo.tgbotapi.types.ChatId
 | 
					import dev.inmo.tgbotapi.types.ChatId
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.IdChatIdentifier
 | 
				
			||||||
import dev.inmo.tgbotapi.types.MilliSeconds
 | 
					import dev.inmo.tgbotapi.types.MilliSeconds
 | 
				
			||||||
import dev.inmo.tgbotapi.types.message.content.MediaContent
 | 
					import dev.inmo.tgbotapi.types.message.content.MediaContent
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -14,7 +15,7 @@ fun interface MediaFileActualityChecker {
 | 
				
			|||||||
    suspend fun TelegramBot.saved(mediaContent: MediaContent) {}
 | 
					    suspend fun TelegramBot.saved(mediaContent: MediaContent) {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    class Default(
 | 
					    class Default(
 | 
				
			||||||
        private val checkingChatId: ChatId
 | 
					        private val checkingChatId: IdChatIdentifier
 | 
				
			||||||
    ) : MediaFileActualityChecker {
 | 
					    ) : MediaFileActualityChecker {
 | 
				
			||||||
        override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean {
 | 
					        override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean {
 | 
				
			||||||
            return runCatching {
 | 
					            return runCatching {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1 +0,0 @@
 | 
				
			|||||||
<manifest package="dev.inmo.tgbotapi.libraries.cache.content.common"/>
 | 
					 | 
				
			||||||
							
								
								
									
										3
									
								
								cache/content/micro_utils/build.gradle
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								cache/content/micro_utils/build.gradle
									
									
									
									
										vendored
									
									
								
							@@ -1,10 +1,9 @@
 | 
				
			|||||||
plugins {
 | 
					plugins {
 | 
				
			||||||
    id "org.jetbrains.kotlin.multiplatform"
 | 
					    id "org.jetbrains.kotlin.multiplatform"
 | 
				
			||||||
    id "org.jetbrains.kotlin.plugin.serialization"
 | 
					    id "org.jetbrains.kotlin.plugin.serialization"
 | 
				
			||||||
    id "com.android.library"
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
apply from: "$mppProjectWithSerializationPresetPath"
 | 
					apply from: "$mppJavaWithJsProjectPath"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
kotlin {
 | 
					kotlin {
 | 
				
			||||||
    sourceSets {
 | 
					    sourceSets {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1 +0,0 @@
 | 
				
			|||||||
<manifest package="dev.inmo.tgbotapi.libraries.cache.content.micro_utils"/>
 | 
					 | 
				
			||||||
@@ -1,40 +0,0 @@
 | 
				
			|||||||
apply plugin: 'com.getkeepsafe.dexcount'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
android {
 | 
					 | 
				
			||||||
    compileSdkVersion "$android_compileSdkVersion".toInteger()
 | 
					 | 
				
			||||||
    buildToolsVersion "$android_buildToolsVersion"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    defaultConfig {
 | 
					 | 
				
			||||||
        minSdkVersion "$android_minSdkVersion".toInteger()
 | 
					 | 
				
			||||||
        targetSdkVersion "$android_compileSdkVersion".toInteger()
 | 
					 | 
				
			||||||
        versionCode "${android_code_version}".toInteger()
 | 
					 | 
				
			||||||
        versionName "$version"
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    buildTypes {
 | 
					 | 
				
			||||||
        release {
 | 
					 | 
				
			||||||
            minifyEnabled false
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
        debug {
 | 
					 | 
				
			||||||
            debuggable true
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    packagingOptions {
 | 
					 | 
				
			||||||
        exclude 'META-INF/kotlinx-serialization-runtime.kotlin_module'
 | 
					 | 
				
			||||||
        exclude 'META-INF/kotlinx-serialization-cbor.kotlin_module'
 | 
					 | 
				
			||||||
        exclude 'META-INF/kotlinx-serialization-properties.kotlin_module'
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    compileOptions {
 | 
					 | 
				
			||||||
        sourceCompatibility JavaVersion.VERSION_1_8
 | 
					 | 
				
			||||||
        targetCompatibility JavaVersion.VERSION_1_8
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    kotlinOptions {
 | 
					 | 
				
			||||||
        jvmTarget = JavaVersion.VERSION_1_8.toString()
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    sourceSets {
 | 
					 | 
				
			||||||
        main.java.srcDirs += 'src/main/kotlin'
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -13,11 +13,7 @@ allprojects {
 | 
				
			|||||||
            projectByName(name)
 | 
					            projectByName(name)
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
 | 
					        mppJavaWithJsProjectPath = "${rootProject.projectDir.absolutePath}/mppJavaWithJsProject.gradle"
 | 
				
			||||||
        mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
 | 
					 | 
				
			||||||
        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
 | 
					        publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,3 +1,4 @@
 | 
				
			|||||||
 | 
					org.gradle.jvmargs=-Xmx512m
 | 
				
			||||||
kotlin.code.style=official
 | 
					kotlin.code.style=official
 | 
				
			||||||
org.gradle.parallel=true
 | 
					org.gradle.parallel=true
 | 
				
			||||||
kotlin.js.generate.externals=true
 | 
					kotlin.js.generate.externals=true
 | 
				
			||||||
@@ -6,32 +7,22 @@ kotlin.incremental.js=true
 | 
				
			|||||||
android.useAndroidX=true
 | 
					android.useAndroidX=true
 | 
				
			||||||
android.enableJetifier=true
 | 
					android.enableJetifier=true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
kotlin_version=1.7.10
 | 
					
 | 
				
			||||||
kotlin_serialisation_core_version=1.4.0-RC
 | 
					kotlin_version=1.7.22
 | 
				
			||||||
 | 
					kotlin_serialisation_core_version=1.4.1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
github_release_plugin_version=2.4.1
 | 
					github_release_plugin_version=2.4.1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
tgbotapi_version=3.1.1
 | 
					tgbotapi_version=5.0.0
 | 
				
			||||||
micro_utils_version=0.12.1
 | 
					micro_utils_version=0.16.4
 | 
				
			||||||
exposed_version=0.39.2
 | 
					exposed_version=0.41.1
 | 
				
			||||||
plagubot_version=2.1.0
 | 
					plagubot_version=3.3.0
 | 
				
			||||||
 | 
					 | 
				
			||||||
# ANDROID
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
android_minSdkVersion=21
 | 
					 | 
				
			||||||
android_compileSdkVersion=32
 | 
					 | 
				
			||||||
android_buildToolsVersion=32.0.0
 | 
					 | 
				
			||||||
dexcount_version=3.1.0
 | 
					 | 
				
			||||||
junit_version=4.12
 | 
					 | 
				
			||||||
test_ext_junit_version=1.1.3
 | 
					 | 
				
			||||||
espresso_core=3.4.0
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Dokka
 | 
					# Dokka
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dokka_version=1.7.10
 | 
					dokka_version=1.7.20
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Project data
 | 
					# Project data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
group=dev.inmo
 | 
					group=dev.inmo
 | 
				
			||||||
version=0.5.1
 | 
					version=0.7.0
 | 
				
			||||||
android_code_version=28
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										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.5.1-bin.zip
 | 
					distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 | 
				
			||||||
zipStoreBase=GRADLE_USER_HOME
 | 
					zipStoreBase=GRADLE_USER_HOME
 | 
				
			||||||
zipStorePath=wrapper/dists
 | 
					zipStorePath=wrapper/dists
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,26 +0,0 @@
 | 
				
			|||||||
project.version = "$version"
 | 
					 | 
				
			||||||
project.group = "$group"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
apply from: "$publishGradlePath"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
kotlin {
 | 
					 | 
				
			||||||
    android {
 | 
					 | 
				
			||||||
        publishAllLibraryVariants()
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    sourceSets {
 | 
					 | 
				
			||||||
        commonMain {
 | 
					 | 
				
			||||||
            dependencies {
 | 
					 | 
				
			||||||
                implementation kotlin('stdlib')
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
        commonTest {
 | 
					 | 
				
			||||||
            dependencies {
 | 
					 | 
				
			||||||
                implementation kotlin('test-common')
 | 
					 | 
				
			||||||
                implementation kotlin('test-annotations-common')
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
apply from: "$defaultAndroidSettingsPresetPath"
 | 
					 | 
				
			||||||
@@ -1,39 +0,0 @@
 | 
				
			|||||||
project.version = "$version"
 | 
					 | 
				
			||||||
project.group = "$group"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
apply from: "$publishGradlePath"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
kotlin {
 | 
					 | 
				
			||||||
    jvm {
 | 
					 | 
				
			||||||
        compilations.main {
 | 
					 | 
				
			||||||
            kotlinOptions {
 | 
					 | 
				
			||||||
                jvmTarget = "1.8"
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    sourceSets {
 | 
					 | 
				
			||||||
        commonMain {
 | 
					 | 
				
			||||||
            dependencies {
 | 
					 | 
				
			||||||
                implementation kotlin('stdlib')
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
        commonTest {
 | 
					 | 
				
			||||||
            dependencies {
 | 
					 | 
				
			||||||
                implementation kotlin('test-common')
 | 
					 | 
				
			||||||
                implementation kotlin('test-annotations-common')
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        jvmTest {
 | 
					 | 
				
			||||||
            dependencies {
 | 
					 | 
				
			||||||
                implementation kotlin('test-junit')
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
java {
 | 
					 | 
				
			||||||
    sourceCompatibility = JavaVersion.VERSION_1_8
 | 
					 | 
				
			||||||
    targetCompatibility = JavaVersion.VERSION_1_8
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -15,9 +15,6 @@ kotlin {
 | 
				
			|||||||
        browser()
 | 
					        browser()
 | 
				
			||||||
        nodejs()
 | 
					        nodejs()
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    android {
 | 
					 | 
				
			||||||
        publishAllLibraryVariants()
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    sourceSets {
 | 
					    sourceSets {
 | 
				
			||||||
        commonMain {
 | 
					        commonMain {
 | 
				
			||||||
@@ -43,13 +40,6 @@ kotlin {
 | 
				
			|||||||
                implementation kotlin('test-junit')
 | 
					                implementation kotlin('test-junit')
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        androidTest {
 | 
					 | 
				
			||||||
            dependencies {
 | 
					 | 
				
			||||||
                implementation kotlin('test-junit')
 | 
					 | 
				
			||||||
                implementation "androidx.test.ext:junit:$test_ext_junit_version"
 | 
					 | 
				
			||||||
                implementation "androidx.test.espresso:espresso-core:$espresso_core"
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -57,5 +47,3 @@ java {
 | 
				
			|||||||
    sourceCompatibility = JavaVersion.VERSION_1_8
 | 
					    sourceCompatibility = JavaVersion.VERSION_1_8
 | 
				
			||||||
    targetCompatibility = JavaVersion.VERSION_1_8
 | 
					    targetCompatibility = JavaVersion.VERSION_1_8
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					 | 
				
			||||||
apply from: "$defaultAndroidSettingsPresetPath"
 | 
					 | 
				
			||||||
@@ -42,20 +42,40 @@ publishing {
 | 
				
			|||||||
                maven {
 | 
					                maven {
 | 
				
			||||||
                    name = "GithubPackages"
 | 
					                    name = "GithubPackages"
 | 
				
			||||||
                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries")
 | 
					                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries")
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
                    credentials {
 | 
					                    credentials {
 | 
				
			||||||
                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
 | 
					                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
 | 
				
			||||||
                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
 | 
					                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
 | 
				
			||||||
 | 
					                maven {
 | 
				
			||||||
 | 
					                    name = "Gitea"
 | 
				
			||||||
 | 
					                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
 | 
					                    credentials(HttpHeaderCredentials) {
 | 
				
			||||||
 | 
					                        name = "Authorization"
 | 
				
			||||||
 | 
					                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
 | 
					                    authentication {
 | 
				
			||||||
 | 
					                        header(HttpHeaderAuthentication)
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
 | 
					            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
 | 
				
			||||||
                maven {
 | 
					                maven {
 | 
				
			||||||
                    name = "sonatype"
 | 
					                    name = "sonatype"
 | 
				
			||||||
                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
 | 
					                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
                    credentials {
 | 
					                    credentials {
 | 
				
			||||||
                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
 | 
					                        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')
 | 
					                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1 +1 @@
 | 
				
			|||||||
{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries","vcsUrl":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
 | 
					{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries","vcsUrl":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
 | 
				
			||||||
		Reference in New Issue
	
	Block a user