mirror of
				https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
				synced 2025-11-04 06:00:24 +00:00 
			
		
		
		
	Compare commits
	
		
			48 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 1bf9a1570f | |||
| f24825bcbc | |||
| 5b560118c0 | |||
| c27b5647d7 | |||
| 6a5cd2f469 | |||
| 69c819162d | |||
| 7a603c21b8 | |||
| bfebd1de50 | |||
| cbbe283305 | |||
| a2dab361cf | |||
| ac89551ac4 | |||
| 0b0d1e4ea5 | |||
| 9b056656e3 | |||
| 9023cc5acc | |||
| 617b8091db | |||
| 88a89ff1e7 | |||
| c211002ac1 | |||
| 50f592f52c | |||
| 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 | 
							
								
								
									
										3
									
								
								.github/workflows/commit-publish.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/commit-publish.yml
									
									
									
									
										vendored
									
									
								
							@@ -8,9 +8,6 @@ jobs:
 | 
				
			|||||||
      - uses: actions/setup-java@v1
 | 
					      - uses: actions/setup-java@v1
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          java-version: 11
 | 
					          java-version: 11
 | 
				
			||||||
      - name: Fix android 32.0.0 dx
 | 
					 | 
				
			||||||
        continue-on-error: true
 | 
					 | 
				
			||||||
        run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
 | 
					 | 
				
			||||||
      - name: Update version
 | 
					      - name: Update version
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
 | 
					          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,6 +18,7 @@ allprojects {
 | 
				
			|||||||
        mavenLocal()
 | 
					        mavenLocal()
 | 
				
			||||||
        mavenCentral()
 | 
					        mavenCentral()
 | 
				
			||||||
        google()
 | 
					        google()
 | 
				
			||||||
 | 
					        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
@@ -23,22 +23,22 @@ data class AdminsCacheSettings(
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
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]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onChatMe
 | 
				
			|||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
 | 
					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.ByChatChatMemberUpdatedMarkerFactory
 | 
				
			||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
 | 
					import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
 | 
				
			||||||
import dev.inmo.tgbotapi.types.ChatId
 | 
					import dev.inmo.tgbotapi.types.IdChatIdentifier
 | 
				
			||||||
import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 | 
					import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 | 
				
			||||||
import dev.inmo.tgbotapi.types.chat.member.ChatMemberUpdated
 | 
					import dev.inmo.tgbotapi.types.chat.member.ChatMemberUpdated
 | 
				
			||||||
import dev.inmo.tgbotapi.types.update.abstracts.Update
 | 
					import dev.inmo.tgbotapi.types.update.abstracts.Update
 | 
				
			||||||
@@ -35,7 +35,7 @@ suspend fun BehaviourContext.activateAdminsChangesListening(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
suspend fun BehaviourContext.activateAdminsChangesListening(
 | 
					suspend fun BehaviourContext.activateAdminsChangesListening(
 | 
				
			||||||
    repo: DefaultAdminsCacheAPIRepo,
 | 
					    repo: DefaultAdminsCacheAPIRepo,
 | 
				
			||||||
    allowedChats: List<ChatId>
 | 
					    allowedChats: List<IdChatIdentifier>
 | 
				
			||||||
) = activateAdminsChangesListening(
 | 
					) = activateAdminsChangesListening(
 | 
				
			||||||
    repo,
 | 
					    repo,
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,19 +2,19 @@ package dev.inmo.tgbotapi.libraries.cache.admins
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import dev.inmo.tgbotapi.abstracts.FromUser
 | 
					import dev.inmo.tgbotapi.abstracts.FromUser
 | 
				
			||||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
 | 
					import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
 | 
				
			||||||
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.Message
 | 
					import dev.inmo.tgbotapi.types.message.abstracts.Message
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fun AdminsChecker(
 | 
					fun AdminsChecker(
 | 
				
			||||||
    adminsCacheAPI: AdminsCacheAPI
 | 
					    adminsCacheAPI: AdminsCacheAPI
 | 
				
			||||||
): SimpleFilter<Pair<ChatId, UserId>> = SimpleFilter {
 | 
					): SimpleFilter<Pair<IdChatIdentifier, UserId>> = SimpleFilter {
 | 
				
			||||||
    adminsCacheAPI.isAdmin(it.first, it.second)
 | 
					    adminsCacheAPI.isAdmin(it.first, it.second)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fun <T> AdminsChecker(
 | 
					fun <T> AdminsChecker(
 | 
				
			||||||
    adminsCacheAPI: AdminsCacheAPI,
 | 
					    adminsCacheAPI: AdminsCacheAPI,
 | 
				
			||||||
    mapper: (T) -> Pair<ChatId, UserId>
 | 
					    mapper: (T) -> Pair<IdChatIdentifier, UserId>
 | 
				
			||||||
): SimpleFilter<T> {
 | 
					): SimpleFilter<T> {
 | 
				
			||||||
    val baseChecker = AdminsChecker(adminsCacheAPI)
 | 
					    val baseChecker = AdminsChecker(adminsCacheAPI)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -31,7 +31,7 @@ fun MessageAdminsChecker(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
fun AdminsChecker(
 | 
					fun AdminsChecker(
 | 
				
			||||||
    adminsCacheAPI: AdminsCacheAPI,
 | 
					    adminsCacheAPI: AdminsCacheAPI,
 | 
				
			||||||
    chatId: ChatId
 | 
					    chatId: IdChatIdentifier
 | 
				
			||||||
) = SimpleFilter<FromUser> {
 | 
					) = SimpleFilter<FromUser> {
 | 
				
			||||||
    adminsCacheAPI.isAdmin(chatId, it.from.id)
 | 
					    adminsCacheAPI.isAdmin(chatId, it.from.id)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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,7 +29,7 @@ class DefaultAdminsCacheAPI(
 | 
				
			|||||||
        bot.getMe().also { botInfo = it }
 | 
					        bot.getMe().also { botInfo = it }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? {
 | 
					    override suspend fun getChatAdmins(chatId: IdChatIdentifier): 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 {
 | 
				
			||||||
@@ -42,7 +42,7 @@ class DefaultAdminsCacheAPI(
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    override suspend fun isAdmin(chatId: ChatId, userId: UserId): Boolean {
 | 
					    override suspend fun isAdmin(chatId: IdChatIdentifier, userId: UserId): Boolean {
 | 
				
			||||||
        val settings = settingsAPI.getChatSettings(chatId)
 | 
					        val settings = settingsAPI.getChatSettings(chatId)
 | 
				
			||||||
        val lastUpdate = repo.lastUpdate(chatId)
 | 
					        val lastUpdate = repo.lastUpdate(chatId)
 | 
				
			||||||
        return when {
 | 
					        return when {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
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.*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -13,7 +13,7 @@ suspend inline fun AdminsCacheAPI.isAdmin(message: Message) = when (message) {
 | 
				
			|||||||
suspend inline fun AdminsCacheAPI.verifyMessageFromAdmin(message: Message) = isAdmin(message)
 | 
					suspend inline fun AdminsCacheAPI.verifyMessageFromAdmin(message: Message) = isAdmin(message)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
suspend inline fun <R : Any> AdminsCacheAPI.doIfAdmin(
 | 
					suspend inline fun <R : Any> AdminsCacheAPI.doIfAdmin(
 | 
				
			||||||
    chatId: ChatId,
 | 
					    chatId: IdChatIdentifier,
 | 
				
			||||||
    userId: UserId,
 | 
					    userId: UserId,
 | 
				
			||||||
    block: () -> R
 | 
					    block: () -> R
 | 
				
			||||||
) = if(isAdmin(chatId, userId)) {
 | 
					) = if(isAdmin(chatId, userId)) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,12 +3,12 @@ package dev.inmo.tgbotapi.libraries.cache.admins
 | 
				
			|||||||
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.get.getChatAdministrators
 | 
				
			||||||
import dev.inmo.tgbotapi.types.ChatId
 | 
					import dev.inmo.tgbotapi.types.IdChatIdentifier
 | 
				
			||||||
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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
internal suspend fun TelegramBot.updateAdmins(
 | 
					internal suspend fun TelegramBot.updateAdmins(
 | 
				
			||||||
    chatId: ChatId,
 | 
					    chatId: IdChatIdentifier,
 | 
				
			||||||
    repo: DefaultAdminsCacheAPIRepo,
 | 
					    repo: DefaultAdminsCacheAPIRepo,
 | 
				
			||||||
    botInfo: ExtendedBot? = null
 | 
					    botInfo: ExtendedBot? = null
 | 
				
			||||||
): List<AdministratorChatMember> {
 | 
					): List<AdministratorChatMember> {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,22 +15,22 @@ private sealed class RepoActions<T> {
 | 
				
			|||||||
    abstract val deferred: CompletableDeferred<T>
 | 
					    abstract val deferred: CompletableDeferred<T>
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
private class GetUpdateDateTimeRepoAction(
 | 
					private class GetUpdateDateTimeRepoAction(
 | 
				
			||||||
    val chatId: ChatId,
 | 
					    val chatId: IdChatIdentifier,
 | 
				
			||||||
    override val deferred: CompletableDeferred<DateTime?>
 | 
					    override val deferred: CompletableDeferred<DateTime?>
 | 
				
			||||||
) : RepoActions<DateTime?>()
 | 
					) : RepoActions<DateTime?>()
 | 
				
			||||||
private class GetChatAdminsRepoAction(
 | 
					private class GetChatAdminsRepoAction(
 | 
				
			||||||
    val chatId: ChatId,
 | 
					    val chatId: IdChatIdentifier,
 | 
				
			||||||
    override val deferred: CompletableDeferred<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 deferred: CompletableDeferred<Unit>
 | 
					    override val deferred: CompletableDeferred<Unit>
 | 
				
			||||||
) : RepoActions<Unit>()
 | 
					) : RepoActions<Unit>()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DefaultAdminsCacheAPIRepoImpl(
 | 
					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.actorAsync<RepoActions<*>>(Channel.UNLIMITED) {
 | 
					    private val actor = scope.actorAsync<RepoActions<*>>(Channel.UNLIMITED) {
 | 
				
			||||||
@@ -54,7 +54,7 @@ class DefaultAdminsCacheAPIRepoImpl(
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? {
 | 
					    override suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>? {
 | 
				
			||||||
        val deferred = CompletableDeferred<List<AdministratorChatMember>?>()
 | 
					        val deferred = CompletableDeferred<List<AdministratorChatMember>?>()
 | 
				
			||||||
        actor.trySend(
 | 
					        actor.trySend(
 | 
				
			||||||
            GetChatAdminsRepoAction(chatId, deferred)
 | 
					            GetChatAdminsRepoAction(chatId, deferred)
 | 
				
			||||||
@@ -64,7 +64,7 @@ class DefaultAdminsCacheAPIRepoImpl(
 | 
				
			|||||||
        return deferred.await()
 | 
					        return deferred.await()
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    override suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>) {
 | 
					    override suspend fun setChatAdmins(chatId: IdChatIdentifier, chatMembers: List<AdministratorChatMember>) {
 | 
				
			||||||
        val deferred = CompletableDeferred<Unit>()
 | 
					        val deferred = CompletableDeferred<Unit>()
 | 
				
			||||||
        actor.trySend(
 | 
					        actor.trySend(
 | 
				
			||||||
            SetChatAdminsRepoAction(chatId, chatMembers, deferred)
 | 
					            SetChatAdminsRepoAction(chatId, chatMembers, deferred)
 | 
				
			||||||
@@ -73,7 +73,7 @@ class DefaultAdminsCacheAPIRepoImpl(
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
        return deferred.await()
 | 
					        return deferred.await()
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    override suspend fun lastUpdate(chatId: ChatId): DateTime? {
 | 
					    override suspend fun lastUpdate(chatId: IdChatIdentifier): DateTime? {
 | 
				
			||||||
        val deferred = CompletableDeferred<DateTime?>()
 | 
					        val deferred = CompletableDeferred<DateTime?>()
 | 
				
			||||||
        actor.trySend(
 | 
					        actor.trySend(
 | 
				
			||||||
            GetUpdateDateTimeRepoAction(chatId, deferred)
 | 
					            GetUpdateDateTimeRepoAction(chatId, deferred)
 | 
				
			||||||
@@ -85,7 +85,7 @@ class DefaultAdminsCacheAPIRepoImpl(
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fun DefaultAdminsCacheAPIRepo(
 | 
					fun DefaultAdminsCacheAPIRepo(
 | 
				
			||||||
    adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>,
 | 
					    adminsRepo: KeyValuesRepo<IdChatIdentifier, AdministratorChatMember>,
 | 
				
			||||||
    updatesRepo: KeyValueRepo<ChatId, MilliSeconds>,
 | 
					    updatesRepo: KeyValueRepo<IdChatIdentifier, MilliSeconds>,
 | 
				
			||||||
    scope: CoroutineScope
 | 
					    scope: CoroutineScope
 | 
				
			||||||
) = DefaultAdminsCacheAPIRepoImpl(adminsRepo, updatesRepo, scope)
 | 
					) = 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()
 | 
				
			||||||
@@ -28,4 +28,4 @@ class DynamicAdminsCacheSettingsAPI(
 | 
				
			|||||||
            settings
 | 
					            settings
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,7 +38,7 @@ fun TelegramBot.createAdminsCacheAPI(
 | 
				
			|||||||
            { 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 = { telegramAdminsSerializationFormat.encodeToString(AdministratorChatMember.serializer(), this) },
 | 
					            valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdministratorChatMember.serializer(), this) },
 | 
				
			||||||
            keyToToFrom = { toChatId() },
 | 
					            keyToToFrom = { toChatId() },
 | 
				
			||||||
@@ -49,7 +49,7 @@ fun TelegramBot.createAdminsCacheAPI(
 | 
				
			|||||||
            { 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() },
 | 
				
			||||||
@@ -63,7 +63,7 @@ fun TelegramBot.createAdminsCacheAPI(
 | 
				
			|||||||
            { 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 = { telegramAdminsSerializationFormat.encodeToString(AdminsCacheSettings.serializer() , this) },
 | 
					            valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdminsCacheSettings.serializer() , this) },
 | 
				
			||||||
            keyToToFrom = { toChatId() },
 | 
					            keyToToFrom = { toChatId() },
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,7 +55,7 @@ class AdminsPlugin : Plugin {
 | 
				
			|||||||
                    { 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 = { telegramAdminsSerializationFormat.encodeToString(this) },
 | 
					                    valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
 | 
				
			||||||
                    keyToToFrom = { toChatId() },
 | 
					                    keyToToFrom = { toChatId() },
 | 
				
			||||||
@@ -66,7 +66,7 @@ class AdminsPlugin : Plugin {
 | 
				
			|||||||
                    { 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() },
 | 
				
			||||||
@@ -82,7 +82,7 @@ class AdminsPlugin : Plugin {
 | 
				
			|||||||
                    { 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 = { telegramAdminsSerializationFormat.encodeToString(this) },
 | 
					                    valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
 | 
				
			||||||
                    keyToToFrom = { toChatId() },
 | 
					                    keyToToFrom = { toChatId() },
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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 {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,19 +4,17 @@ org.gradle.parallel=true
 | 
				
			|||||||
kotlin.js.generate.externals=true
 | 
					kotlin.js.generate.externals=true
 | 
				
			||||||
kotlin.incremental=true
 | 
					kotlin.incremental=true
 | 
				
			||||||
kotlin.incremental.js=true
 | 
					kotlin.incremental.js=true
 | 
				
			||||||
android.useAndroidX=true
 | 
					 | 
				
			||||||
android.enableJetifier=true
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
kotlin_version=1.7.20
 | 
					kotlin_version=1.8.10
 | 
				
			||||||
kotlin_serialisation_core_version=1.4.1
 | 
					kotlin_serialisation_core_version=1.5.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
github_release_plugin_version=2.4.1
 | 
					github_release_plugin_version=2.4.1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
tgbotapi_version=3.3.0
 | 
					tgbotapi_version=6.0.1
 | 
				
			||||||
micro_utils_version=0.13.1
 | 
					micro_utils_version=0.17.1
 | 
				
			||||||
exposed_version=0.39.2
 | 
					exposed_version=0.41.1
 | 
				
			||||||
plagubot_version=2.4.0
 | 
					plagubot_version=4.0.1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Dokka
 | 
					# Dokka
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -25,4 +23,4 @@ dokka_version=1.7.20
 | 
				
			|||||||
# Project data
 | 
					# Project data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
group=dev.inmo
 | 
					group=dev.inmo
 | 
				
			||||||
version=0.5.6
 | 
					version=0.9.1
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										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
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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"}}}
 | 
				
			||||||
							
								
								
									
										17
									
								
								resender/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								resender/build.gradle
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,17 @@
 | 
				
			|||||||
 | 
					plugins {
 | 
				
			||||||
 | 
					    id "org.jetbrains.kotlin.multiplatform"
 | 
				
			||||||
 | 
					    id "org.jetbrains.kotlin.plugin.serialization"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					apply from: "$mppJavaWithJsProjectPath"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					kotlin {
 | 
				
			||||||
 | 
					    sourceSets {
 | 
				
			||||||
 | 
					        commonMain {
 | 
				
			||||||
 | 
					            dependencies {
 | 
				
			||||||
 | 
					                api "dev.inmo:tgbotapi.core:$tgbotapi_version"
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										20
									
								
								resender/src/commonMain/kotlin/MessageMetaInfo.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								resender/src/commonMain/kotlin/MessageMetaInfo.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,20 @@
 | 
				
			|||||||
 | 
					package dev.inmo.tgbotapi.libraries.resender
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.IdChatIdentifier
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.MessageId
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.message.abstracts.Message
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage
 | 
				
			||||||
 | 
					import kotlinx.serialization.Serializable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Serializable
 | 
				
			||||||
 | 
					data class MessageMetaInfo(
 | 
				
			||||||
 | 
					    @Serializable(FullChatIdentifierSerializer::class)
 | 
				
			||||||
 | 
					    val chatId: IdChatIdentifier,
 | 
				
			||||||
 | 
					    val messageId: MessageId,
 | 
				
			||||||
 | 
					    val group: String? = null
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					operator fun MessageMetaInfo.Companion.invoke(
 | 
				
			||||||
 | 
					    message: Message
 | 
				
			||||||
 | 
					) = MessageMetaInfo(message.chat.id, message.messageId, (message as? PossiblyMediaGroupMessage<*>) ?.mediaGroupId)
 | 
				
			||||||
							
								
								
									
										144
									
								
								resender/src/commonMain/kotlin/MessagesResender.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										144
									
								
								resender/src/commonMain/kotlin/MessagesResender.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,144 @@
 | 
				
			|||||||
 | 
					package dev.inmo.tgbotapi.libraries.resender
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.bot.TelegramBot
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.requests.ForwardMessage
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.requests.send.CopyMessage
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.requests.send.media.SendMediaGroup
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.ChatIdentifier
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.IdChatIdentifier
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.mediaCountInMediaGroup
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 | 
				
			||||||
 | 
					import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class MessagesResender(
 | 
				
			||||||
 | 
					    private val bot: TelegramBot,
 | 
				
			||||||
 | 
					    private val cacheChatId: ChatIdentifier
 | 
				
			||||||
 | 
					) {
 | 
				
			||||||
 | 
					    suspend fun resend(
 | 
				
			||||||
 | 
					        targetChatId: IdChatIdentifier,
 | 
				
			||||||
 | 
					        messagesInfo: List<MessageMetaInfo>
 | 
				
			||||||
 | 
					    ): List<Pair<MessageMetaInfo, MessageMetaInfo>> {
 | 
				
			||||||
 | 
					        val messagesWithOrders = messagesInfo.mapIndexed { i, messageInfo -> messageInfo to i }.toMap()
 | 
				
			||||||
 | 
					        val ordersWithMessagesGroups = messagesInfo.groupBy { it.group }.flatMap { (group, list) ->
 | 
				
			||||||
 | 
					            if (group == null) {
 | 
				
			||||||
 | 
					                list.map {
 | 
				
			||||||
 | 
					                    messagesWithOrders.getValue(it) to listOf(it)
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                listOf(messagesWithOrders.getValue(list.first()) to list)
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }.sortedBy { it.first }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return ordersWithMessagesGroups.flatMap { (_, contents) ->
 | 
				
			||||||
 | 
					            val sourceMessagesToSentMessages = mutableListOf<Pair<MessageMetaInfo, MessageMetaInfo>>()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            when {
 | 
				
			||||||
 | 
					                contents.size == 1 -> {
 | 
				
			||||||
 | 
					                    val messageInfo = contents.first()
 | 
				
			||||||
 | 
					                    runCatching {
 | 
				
			||||||
 | 
					                        MessageMetaInfo(
 | 
				
			||||||
 | 
					                            targetChatId,
 | 
				
			||||||
 | 
					                            bot.execute(
 | 
				
			||||||
 | 
					                                CopyMessage(
 | 
				
			||||||
 | 
					                                    targetChatId,
 | 
				
			||||||
 | 
					                                    fromChatId = messageInfo.chatId,
 | 
				
			||||||
 | 
					                                    messageId = messageInfo.messageId
 | 
				
			||||||
 | 
					                                )
 | 
				
			||||||
 | 
					                            )
 | 
				
			||||||
 | 
					                        )
 | 
				
			||||||
 | 
					                    }.onFailure { _ ->
 | 
				
			||||||
 | 
					                        runCatching {
 | 
				
			||||||
 | 
					                            bot.execute(
 | 
				
			||||||
 | 
					                                ForwardMessage(
 | 
				
			||||||
 | 
					                                    toChatId = targetChatId,
 | 
				
			||||||
 | 
					                                    fromChatId = messageInfo.chatId,
 | 
				
			||||||
 | 
					                                    messageId = messageInfo.messageId
 | 
				
			||||||
 | 
					                                )
 | 
				
			||||||
 | 
					                            )
 | 
				
			||||||
 | 
					                        }.onSuccess {
 | 
				
			||||||
 | 
					                            MessageMetaInfo(
 | 
				
			||||||
 | 
					                                targetChatId,
 | 
				
			||||||
 | 
					                                bot.execute(
 | 
				
			||||||
 | 
					                                    CopyMessage(
 | 
				
			||||||
 | 
					                                        targetChatId,
 | 
				
			||||||
 | 
					                                        fromChatId = it.chat.id,
 | 
				
			||||||
 | 
					                                        messageId = it.messageId
 | 
				
			||||||
 | 
					                                    )
 | 
				
			||||||
 | 
					                                )
 | 
				
			||||||
 | 
					                            )
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                    }.getOrNull() ?.let {
 | 
				
			||||||
 | 
					                        sourceMessagesToSentMessages.add(messageInfo to it)
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                else -> {
 | 
				
			||||||
 | 
					                    val resultContents = contents.mapNotNull {
 | 
				
			||||||
 | 
					                        it to (
 | 
				
			||||||
 | 
					                            bot.execute(
 | 
				
			||||||
 | 
					                                ForwardMessage(
 | 
				
			||||||
 | 
					                                    toChatId = cacheChatId,
 | 
				
			||||||
 | 
					                                    fromChatId = it.chatId,
 | 
				
			||||||
 | 
					                                    messageId = it.messageId
 | 
				
			||||||
 | 
					                                )
 | 
				
			||||||
 | 
					                            ) as? ContentMessage<*> ?: return@mapNotNull null)
 | 
				
			||||||
 | 
					                    }.mapNotNull { (src, forwardedMessage) ->
 | 
				
			||||||
 | 
					                        val forwardedMessageAsMediaPartMessage = forwardedMessage.takeIf {
 | 
				
			||||||
 | 
					                            it.content is MediaGroupPartContent
 | 
				
			||||||
 | 
					                        } ?.let {
 | 
				
			||||||
 | 
					                            it as ContentMessage<MediaGroupPartContent>
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                        src to (forwardedMessageAsMediaPartMessage ?: null.also { _ ->
 | 
				
			||||||
 | 
					                            sourceMessagesToSentMessages.add(
 | 
				
			||||||
 | 
					                                src to MessageMetaInfo(
 | 
				
			||||||
 | 
					                                    targetChatId,
 | 
				
			||||||
 | 
					                                    bot.execute(
 | 
				
			||||||
 | 
					                                        CopyMessage(
 | 
				
			||||||
 | 
					                                            targetChatId,
 | 
				
			||||||
 | 
					                                            fromChatId = forwardedMessage.chat.id,
 | 
				
			||||||
 | 
					                                            messageId = forwardedMessage.messageId
 | 
				
			||||||
 | 
					                                        )
 | 
				
			||||||
 | 
					                                    )
 | 
				
			||||||
 | 
					                                )
 | 
				
			||||||
 | 
					                            )
 | 
				
			||||||
 | 
					                        } ?: return@mapNotNull null)
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    resultContents.singleOrNull() ?.also { (src, it) ->
 | 
				
			||||||
 | 
					                        sourceMessagesToSentMessages.add(
 | 
				
			||||||
 | 
					                            src to MessageMetaInfo(
 | 
				
			||||||
 | 
					                                targetChatId,
 | 
				
			||||||
 | 
					                                bot.execute(
 | 
				
			||||||
 | 
					                                    CopyMessage(
 | 
				
			||||||
 | 
					                                        targetChatId,
 | 
				
			||||||
 | 
					                                        it.chat.id,
 | 
				
			||||||
 | 
					                                        it.messageId
 | 
				
			||||||
 | 
					                                    )
 | 
				
			||||||
 | 
					                                )
 | 
				
			||||||
 | 
					                            )
 | 
				
			||||||
 | 
					                        )
 | 
				
			||||||
 | 
					                    } ?: resultContents.chunked(mediaCountInMediaGroup.last).forEach {
 | 
				
			||||||
 | 
					                        bot.execute(
 | 
				
			||||||
 | 
					                            SendMediaGroup<MediaGroupPartContent>(
 | 
				
			||||||
 | 
					                                targetChatId,
 | 
				
			||||||
 | 
					                                it.map { it.second.content.toMediaGroupMemberTelegramMedia() }
 | 
				
			||||||
 | 
					                            )
 | 
				
			||||||
 | 
					                        ).content.group.mapIndexed { i, partWrapper ->
 | 
				
			||||||
 | 
					                            it.getOrNull(i) ?.let {
 | 
				
			||||||
 | 
					                                sourceMessagesToSentMessages.add(
 | 
				
			||||||
 | 
					                                    it.first to MessageMetaInfo(
 | 
				
			||||||
 | 
					                                        partWrapper.sourceMessage.chat.id,
 | 
				
			||||||
 | 
					                                        partWrapper.sourceMessage.messageId,
 | 
				
			||||||
 | 
					                                        partWrapper.sourceMessage.mediaGroupId
 | 
				
			||||||
 | 
					                                    )
 | 
				
			||||||
 | 
					                                )
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            sourceMessagesToSentMessages.toList()
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -7,6 +7,8 @@ String[] includes = [
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    ":cache:content:common",
 | 
					    ":cache:content:common",
 | 
				
			||||||
    ":cache:content:micro_utils",
 | 
					    ":cache:content:micro_utils",
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ":resender",
 | 
				
			||||||
]
 | 
					]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user