mirror of
				https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
				synced 2025-10-30 03:30:08 +00:00 
			
		
		
		
	Compare commits
	
		
			257 Commits
		
	
	
		
			0.0.13
			...
			renovate/g
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 03871c28d7 | ||
| 061bac146c | |||
| 00fc2a1e0b | |||
| 1e2e45c404 | |||
| 17398781a5 | |||
| f86dbcefce | |||
| e4aba03cdc | |||
| c8f8608a60 | |||
| 19fcee9f3e | |||
| 825e6474cc | |||
| ff99bdd45d | |||
| 2ae7507c01 | |||
| 7b30d95f56 | |||
| bbe9367ef3 | |||
| 6403fe6f5d | |||
| 3cad9ec337 | |||
| 78e5da9db7 | |||
| 74329a8eb2 | |||
| 953df71d9e | |||
| c25f6d522f | |||
| d569f46e48 | |||
| f2731f6e7d | |||
| f10c7412f4 | |||
| a113e6e37e | |||
| 7c6005bea3 | |||
| 3f6067b34e | |||
| af72bba116 | |||
| 84f04fb1f0 | |||
| 5524fc9fa0 | |||
| d0eebc0ace | |||
| 891dab1f4b | |||
| 9f6895a530 | |||
| 49084169d2 | |||
|  | 684172cc08 | ||
| 1457cfc748 | |||
| 6784a3c49a | |||
| 8ef89a32c7 | |||
| d16de6428a | |||
| 49475a457d | |||
| b8312873b0 | |||
| 3ede07c2a6 | |||
| a0e17a664c | |||
| fc3bf19453 | |||
| 8d1c57700e | |||
| 00c0f0fd6f | |||
| 551eb293ab | |||
| f1b58a889f | |||
| 36a0f9b65b | |||
| 86abe49bc1 | |||
| 5b62bfa7d3 | |||
| d94d847715 | |||
| 91013b914d | |||
| cec4c610f3 | |||
| b9003388b1 | |||
| 6d161c2d78 | |||
| dc63639fee | |||
| 66934c823d | |||
| 90870c225c | |||
| 106d01775c | |||
| cea2f7dc6e | |||
| 7d461edc9b | |||
| c52c6cb633 | |||
| 6db1755ee7 | |||
| ccf60c95ca | |||
| 4057d5167f | |||
| f19664da58 | |||
| 646a551b15 | |||
| a08974e76d | |||
| 30e62041c0 | |||
| be8fe43e76 | |||
| 42f3a064ad | |||
| 34f9d8c0ab | |||
| 6e4fc54a23 | |||
| 674ee28991 | |||
| 4950fd4ed0 | |||
| e3f5ae0b24 | |||
| 3bf2d858eb | |||
| b51bc97551 | |||
| c0680932ab | |||
| 849edadab0 | |||
| f02933a9d0 | |||
| f018b723cb | |||
| 65d8fd6be1 | |||
| d44c13bea5 | |||
| 50c1e33b52 | |||
| 41b9001e1f | |||
| 2c44a4e580 | |||
| ffa9525c70 | |||
| 4f2df31e5e | |||
| 18f9318b63 | |||
| c97a48dcd4 | |||
| caaba32f9a | |||
| 2734fc0adc | |||
| 9c2e271d57 | |||
| 3edb5b1b11 | |||
| 82d859272f | |||
| 64952fb054 | |||
| bd4e3d2380 | |||
| d77e08631c | |||
| 90e063a47a | |||
| a988117037 | |||
| 50d8511db5 | |||
| cf5b02057d | |||
| 64305c9393 | |||
| b4107cff26 | |||
| 23d68c9aa5 | |||
| 735e23cadb | |||
| 59b32f9b9a | |||
| b8601d4c90 | |||
| 240ee3de6f | |||
| 300ff6514b | |||
| ce85622876 | |||
| bd9e6045a3 | |||
| e8a41d97e8 | |||
| e2e329a757 | |||
| c69dd61eb9 | |||
| cf13bfadde | |||
| 6e33649e6c | |||
| 40dd4b166f | |||
| 95adaef36f | |||
| 8386690090 | |||
| 0f02910766 | |||
| 46b694c72b | |||
| 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 | |||
| e8cb9556db | |||
| d118a3d060 | |||
| 62fb8854b9 | |||
| 7163f7d64a | |||
| 8a6925e95c | |||
| fd275ddacf | |||
| 8e281f0edc | |||
| f802aa6a99 | |||
| ee9f524fc6 | |||
| 950eebea06 | |||
| 7845b7cc5f | |||
| 539515da43 | |||
| 3695ab7936 | |||
| ab802df7d1 | |||
| c85d92c7ba | |||
| cea8ba47db | |||
| b2719c0760 | |||
| 1c87f64a6d | |||
| 53630d4864 | |||
| bb7fb985e3 | |||
| 18fc3fd1dd | |||
| 5f1f512db4 | |||
| 961d7d9afd | |||
| 6a84bcb860 | |||
| cd1ba035ac | |||
| 6f443c1617 | |||
| 85a1048b13 | |||
| 8dc1687b8e | |||
| 2518109290 | |||
| 760e51cabb | |||
| 3a667946da | |||
| f6df96c405 | |||
| fd33cbfca3 | |||
| 62a10b9042 | |||
| a7814c61b5 | |||
| 4eb27b42ad | |||
| 5367ff5629 | |||
| 50caa740cc | |||
| 6c85e977f1 | |||
| 156a8dd8be | |||
| 3728983653 | |||
| 8e99cb9e18 | |||
| 0f569ead82 | |||
| 71f6710397 | |||
| 243926cd17 | |||
| b2d3ded0da | |||
| fbbd8e640c | |||
| 15c0f9979a | |||
| e6d04de433 | |||
| a6b837f633 | |||
| 866b016e08 | |||
| b67212ec0b | |||
| dc83bbc9aa | |||
| 14b56c659b | |||
| 99218de932 | |||
| ce14a78e09 | |||
| 827d9b43f7 | |||
| 6aaa801fe0 | |||
| 5cb7d30431 | |||
| c34d7597b4 | |||
| d5ae880e77 | |||
| 570568cd26 | |||
| ec69456bcc | |||
| 6327366720 | |||
| 0f05779e0d | |||
| be1b13debb | |||
| 043948401d | |||
| cde0a11c1b | |||
| 7e37a43904 | |||
| 5305438686 | |||
| f423d31423 | |||
| 6591c8ffa8 | |||
| 5d6d4a0ade | |||
| 5a31a5566c | |||
| fecbfc4130 | |||
| bf3c4bc11f | |||
| 2ef2d60213 | |||
| a1c2e48622 | |||
| ffdf808a89 | |||
| ef8bc50bd9 | |||
| df5dea4915 | |||
| 989f3af9db | |||
| 4c0cdc8d1e | |||
| ce132cb4e7 | |||
| c519881800 | |||
| 17d7fe6659 | 
							
								
								
									
										5
									
								
								.github/workflows/commit-publish.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/commit-publish.yml
									
									
									
									
										vendored
									
									
								
							| @@ -7,10 +7,7 @@ jobs: | |||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - uses: actions/setup-java@v1 |       - uses: actions/setup-java@v1 | ||||||
|         with: |         with: | ||||||
|           java-version: 1.8 |           java-version: 17 | ||||||
|       - name: Fix android 31.0.0 dx |  | ||||||
|         continue-on-error: true |  | ||||||
|         run: cd /usr/local/lib/android/sdk/build-tools/31.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 "[^/]*$"`" | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1,4 +1,5 @@ | |||||||
| .idea | .idea | ||||||
|  | .kotlin | ||||||
| out/* | out/* | ||||||
| *.iml | *.iml | ||||||
| target | target | ||||||
| @@ -11,5 +12,6 @@ out/ | |||||||
|  |  | ||||||
| secret.gradle | secret.gradle | ||||||
| local.properties | local.properties | ||||||
|  | kotlin-js-store/ | ||||||
|  |  | ||||||
| publishing.sh | publishing.sh | ||||||
|   | |||||||
							
								
								
									
										23
									
								
								build.gradle
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								build.gradle
									
									
									
									
									
								
							| @@ -1,6 +1,5 @@ | |||||||
| buildscript { | buildscript { | ||||||
|     repositories { |     repositories { | ||||||
|         jcenter() |  | ||||||
|         google() |         google() | ||||||
|         mavenCentral() |         mavenCentral() | ||||||
|         mavenLocal() |         mavenLocal() | ||||||
| @@ -8,21 +7,35 @@ buildscript { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     dependencies { |     dependencies { | ||||||
|         classpath 'com.android.tools.build:gradle:4.2.2' |  | ||||||
|         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" | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | plugins { | ||||||
|  |     id "com.gradleup.nmcp.aggregation" version "$nmcp_version" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { | ||||||
|  |     nmcpAggregation { | ||||||
|  |         centralPortal { | ||||||
|  |             username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') | ||||||
|  |             password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') | ||||||
|  |             validationTimeout = Duration.ofHours(4) | ||||||
|  |             publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED" | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         publishAllProjectsProbablyBreakingProjectIsolation() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
| allprojects { | allprojects { | ||||||
|     repositories { |     repositories { | ||||||
|         mavenLocal() |         mavenLocal() | ||||||
|         jcenter() |  | ||||||
|         mavenCentral() |         mavenCentral() | ||||||
|         google() |         google() | ||||||
|         maven { url "https://kotlin.bintray.com/kotlinx" } |         maven { url "https://nexus.inmo.dev/repository/maven-releases/" } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										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 { | ||||||
|   | |||||||
| @@ -2,13 +2,13 @@ package dev.inmo.tgbotapi.libraries.cache.admins | |||||||
|  |  | ||||||
| import dev.inmo.tgbotapi.extensions.utils.asGroupContentMessage | import dev.inmo.tgbotapi.extensions.utils.asGroupContentMessage | ||||||
| import dev.inmo.tgbotapi.types.* | import dev.inmo.tgbotapi.types.* | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember | import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember | ||||||
| import dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage | import dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage | ||||||
| import dev.inmo.tgbotapi.types.message.abstracts.Message | import dev.inmo.tgbotapi.types.message.abstracts.Message | ||||||
|  |  | ||||||
| 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,8 +1,9 @@ | |||||||
| package dev.inmo.tgbotapi.libraries.cache.admins | package dev.inmo.tgbotapi.libraries.cache.admins | ||||||
|  |  | ||||||
| import com.soywiz.klock.minutes | import korlibs.time.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 korlibs.time.seconds | ||||||
| import kotlinx.coroutines.flow.SharedFlow | import kotlinx.coroutines.flow.SharedFlow | ||||||
| import kotlinx.serialization.Serializable | import kotlinx.serialization.Serializable | ||||||
|  |  | ||||||
| @@ -15,27 +16,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) | ||||||
|  | } | ||||||
| @@ -1,18 +1,20 @@ | |||||||
| package dev.inmo.tgbotapi.libraries.cache.admins | package dev.inmo.tgbotapi.libraries.cache.admins | ||||||
|  |  | ||||||
| import com.soywiz.klock.DateTime | import korlibs.time.DateTime | ||||||
| import dev.inmo.tgbotapi.bot.TelegramBot | import dev.inmo.tgbotapi.bot.TelegramBot | ||||||
| import dev.inmo.tgbotapi.extensions.api.bot.getMe | import dev.inmo.tgbotapi.extensions.api.bot.getMe | ||||||
| import dev.inmo.tgbotapi.extensions.api.chat.get.getChatAdministrators | import dev.inmo.tgbotapi.extensions.api.chat.members.getChatMember | ||||||
| import dev.inmo.tgbotapi.types.* | import dev.inmo.tgbotapi.types.* | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember | import dev.inmo.tgbotapi.types.chat.ExtendedBot | ||||||
|  | import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember | ||||||
| import dev.inmo.tgbotapi.types.message.abstracts.* | import dev.inmo.tgbotapi.types.message.abstracts.* | ||||||
|  | import korlibs.time.seconds | ||||||
| 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 | ||||||
| @@ -28,28 +30,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 | ||||||
| @@ -62,5 +73,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 korlibs.time.DateTime | ||||||
| import dev.inmo.micro_utils.coroutines.actor | import dev.inmo.micro_utils.coroutines.* | ||||||
| import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions |  | ||||||
| import dev.inmo.micro_utils.repos.* | import dev.inmo.micro_utils.repos.* | ||||||
| import dev.inmo.tgbotapi.libraries.cache.admins.DefaultAdminsCacheAPIRepo | import dev.inmo.tgbotapi.libraries.cache.admins.DefaultAdminsCacheAPIRepo | ||||||
| import dev.inmo.tgbotapi.types.* | import dev.inmo.tgbotapi.types.* | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember | import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember | ||||||
|  | import kotlinx.coroutines.CompletableDeferred | ||||||
| import kotlinx.coroutines.CoroutineScope | import kotlinx.coroutines.CoroutineScope | ||||||
| import kotlinx.coroutines.channels.Channel | import kotlinx.coroutines.channels.* | ||||||
| import kotlin.coroutines.* | import kotlin.coroutines.* | ||||||
|  |  | ||||||
| private sealed class RepoActions<T> { | private sealed class RepoActions<T> { | ||||||
|     abstract val toReturn: Continuation<T> |     abstract val deferred: CompletableDeferred<T> | ||||||
| } | } | ||||||
| private class GetUpdateDateTimeRepoAction( | private class GetUpdateDateTimeRepoAction( | ||||||
|     val chatId: ChatId, |     val chatId: 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() | ||||||
|   | |||||||
| @@ -1,81 +1,83 @@ | |||||||
| package dev.inmo.tgbotapi.libraries.cache.admins | package dev.inmo.tgbotapi.libraries.cache.admins | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo | import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo | ||||||
| import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedOneToManyKeyValueRepo | import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedKeyValuesRepo | ||||||
| import dev.inmo.micro_utils.repos.mappers.withMapper | import dev.inmo.micro_utils.repos.mappers.withMapper | ||||||
| import dev.inmo.tgbotapi.bot.TelegramBot | import dev.inmo.tgbotapi.bot.TelegramBot | ||||||
| import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext | import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext | ||||||
| import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepo | import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepoImpl | ||||||
| import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DynamicAdminsCacheSettingsAPI | import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DynamicAdminsCacheSettingsAPI | ||||||
| import dev.inmo.tgbotapi.types.* | import dev.inmo.tgbotapi.types.* | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.AdministratorChatMemberImpl | import dev.inmo.tgbotapi.types.chat.member.* | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.CreatorChatMember |  | ||||||
| import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember |  | ||||||
| import kotlinx.coroutines.CoroutineScope | import kotlinx.coroutines.CoroutineScope | ||||||
| import kotlinx.serialization.* | import kotlinx.serialization.* | ||||||
| import kotlinx.serialization.cbor.Cbor |  | ||||||
| import kotlinx.serialization.json.Json | import kotlinx.serialization.json.Json | ||||||
| import kotlinx.serialization.modules.SerializersModule | import kotlinx.serialization.modules.SerializersModule | ||||||
| import kotlinx.serialization.modules.polymorphic | import kotlinx.serialization.modules.polymorphic | ||||||
| import org.jetbrains.exposed.sql.Database | import org.jetbrains.exposed.sql.Database | ||||||
| import org.jetbrains.exposed.sql.statements.api.ExposedBlob |  | ||||||
|  |  | ||||||
| private val serializationFormat = Json { | val telegramAdminsSerializationFormat = Json { | ||||||
|     ignoreUnknownKeys = true |     ignoreUnknownKeys = true | ||||||
|     serializersModule = SerializersModule { |     serializersModule = SerializersModule { | ||||||
|         polymorphic(AdministratorChatMember::class) { |         polymorphic(AdministratorChatMember::class) { | ||||||
|             subclass(AdministratorChatMemberImpl::class, AdministratorChatMemberImpl.serializer()) |             subclass(AdministratorChatMemberImpl::class, AdministratorChatMemberImpl.serializer()) | ||||||
|             subclass(CreatorChatMember::class, CreatorChatMember.serializer()) |             subclass(OwnerChatMember::class, OwnerChatMember.serializer()) | ||||||
|         } |         } | ||||||
|         contextual(AdministratorChatMember::class, PolymorphicSerializer(AdministratorChatMember::class)) |         contextual(AdministratorChatMember::class, PolymorphicSerializer(AdministratorChatMember::class)) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| fun AdminsCacheAPI( | fun BehaviourContext.createAdminsCacheAPI(database: Database) = AdminsCacheAPI(this, database, this) | ||||||
|     bot: TelegramBot, |  | ||||||
|  | fun TelegramBot.createAdminsCacheAPI( | ||||||
|     database: Database, |     database: Database, | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
| ) : AdminsCacheAPI = DefaultAdminsCacheAPI( |     defaultAdminsCacheAPIRepo: DefaultAdminsCacheAPIRepo = DefaultAdminsCacheAPIRepoImpl( | ||||||
|     bot, |         ExposedKeyValuesRepo( | ||||||
|     DefaultAdminsCacheAPIRepo( |  | ||||||
|         ExposedOneToManyKeyValueRepo( |  | ||||||
|             database, |             database, | ||||||
|             { long("chatId") }, |             { long("chatId") }, | ||||||
|             { text("member") }, |             { text("member") }, | ||||||
|             "AdminsTable" |             "AdminsTable" | ||||||
|         ).withMapper<ChatId, AdministratorChatMember, Identifier, String>( |         ).withMapper<IdChatIdentifier, AdministratorChatMember, Long, String>( | ||||||
|             keyFromToTo = { chatId }, |             keyFromToTo = { chatId.long }, | ||||||
|             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, Long, Long>( | ||||||
|             keyFromToTo = { chatId }, |             keyFromToTo = { chatId.long }, | ||||||
|             valueFromToTo = { this }, |             valueFromToTo = { this }, | ||||||
|             keyToToFrom = { toChatId() }, |             keyToToFrom = { toChatId() }, | ||||||
|             valueToToFrom = { this } |             valueToToFrom = { this } | ||||||
|         ), |         ), | ||||||
|         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, Long, String>( | ||||||
|             keyFromToTo = { chatId }, |             keyFromToTo = { chatId.long }, | ||||||
|             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,53 +1,107 @@ | |||||||
| 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.plagubot.database | ||||||
| import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext | import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext | ||||||
| import dev.inmo.tgbotapi.types.ChatId | import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepoImpl | ||||||
|  | import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DynamicAdminsCacheSettingsAPI | ||||||
|  | import dev.inmo.tgbotapi.types.* | ||||||
|  | import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember | ||||||
|  | import kotlinx.coroutines.* | ||||||
| import kotlinx.coroutines.flow.* | import kotlinx.coroutines.flow.* | ||||||
| import kotlinx.coroutines.sync.Mutex | import kotlinx.coroutines.sync.Mutex | ||||||
| import kotlinx.coroutines.sync.withLock | import kotlinx.coroutines.sync.withLock | ||||||
| import kotlinx.serialization.Serializable | import kotlinx.serialization.* | ||||||
| import kotlinx.serialization.Transient | import kotlinx.serialization.json.JsonObject | ||||||
| import org.jetbrains.exposed.sql.Database | import org.jetbrains.exposed.sql.Database | ||||||
|  | import org.koin.core.Koin | ||||||
|  | import org.koin.core.module.Module | ||||||
|  | import org.koin.core.qualifier.named | ||||||
|  | import org.koin.core.scope.Scope | ||||||
|  | import org.koin.dsl.binds | ||||||
|  |  | ||||||
| val Map<String, Any>.adminsPlugin: AdminsPlugin? | val Scope.adminsPlugin: AdminsPlugin? | ||||||
|     get() = get("admins") as? AdminsPlugin |     get() = getOrNull() | ||||||
|  |  | ||||||
|  | val Koin.adminsPlugin: AdminsPlugin? | ||||||
|  |     get() = getOrNull() | ||||||
|  |  | ||||||
| @Serializable | @Serializable | ||||||
| class AdminsPlugin( | class AdminsPlugin : Plugin { | ||||||
|     private val chatsSettings: Map<ChatId, AdminsCacheSettings>? = null |  | ||||||
| ) : Plugin { |  | ||||||
|     @Transient |     @Transient | ||||||
|     private val globalAdminsCacheAPI = MutableStateFlow<AdminsCacheAPI?>(null) |     private val globalAdminsCacheAPI = MutableStateFlow<AdminsCacheAPI?>(null) | ||||||
|     @Transient |     @Transient | ||||||
|     private val databaseToAdminsCacheAPI = mutableMapOf<Database, MutableStateFlow<AdminsCacheAPI?>>() |     private val databaseToAdminsCacheAPI = mutableMapOf<Database, MutableStateFlow<AdminsCacheAPI?>>() | ||||||
|     private val mutex = Mutex() |     private val mutex = Mutex() | ||||||
|  |  | ||||||
|  |     @Deprecated("Will be removed soon due to its redundancy") | ||||||
|     suspend fun adminsAPI(database: Database): AdminsCacheAPI { |     suspend fun adminsAPI(database: Database): AdminsCacheAPI { | ||||||
|         return when (chatsSettings) { |         val flow = mutex.withLock { | ||||||
|             null -> { |             databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) } | ||||||
|                 val flow = mutex.withLock { |  | ||||||
|                     databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) } |  | ||||||
|                 } |  | ||||||
|                 flow.first { it != null }!! |  | ||||||
|             } |  | ||||||
|             else -> globalAdminsCacheAPI.first { it != null }!! |  | ||||||
|         } |         } | ||||||
|  |         return flow.filterNotNull().first() | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     override suspend fun BehaviourContext.invoke(database: Database, params: Map<String, Any>) { |     override fun Module.setupDI(config: JsonObject) { | ||||||
|         when (chatsSettings) { |         single { this@AdminsPlugin } | ||||||
|             null -> { |         val scopeQualifier = named("admins plugin scope") | ||||||
|                 mutex.withLock { |         single(scopeQualifier) { CoroutineScope(Dispatchers.IO + SupervisorJob()) } | ||||||
|                     val flow = databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) } |         single<DefaultAdminsCacheAPIRepo> { | ||||||
|                     if (flow.value == null) { |             DefaultAdminsCacheAPIRepoImpl( | ||||||
|                         flow.value = AdminsCacheAPI(database) |                 ExposedKeyValuesRepo( | ||||||
|                     } |                     database, | ||||||
|                 } |                     { long("chatId") }, | ||||||
|             } |                     { text("member") }, | ||||||
|             else -> mutex.withLock { |                     "AdminsTable" | ||||||
|                 globalAdminsCacheAPI.value = AdminsCacheAPI(database) |                 ).withMapper<IdChatIdentifier, AdministratorChatMember, Long, String>( | ||||||
|             } |                     keyFromToTo = { chatId.long }, | ||||||
|  |                     valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) }, | ||||||
|  |                     keyToToFrom = { toChatId() }, | ||||||
|  |                     valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) } | ||||||
|  |                 ), | ||||||
|  |                 ExposedKeyValueRepo( | ||||||
|  |                     database, | ||||||
|  |                     { long("chatId") }, | ||||||
|  |                     { long("datetime") }, | ||||||
|  |                     "AdminsUpdatesTimesTable" | ||||||
|  |                 ).withMapper<IdChatIdentifier, Long, Long, Long>( | ||||||
|  |                     keyFromToTo = { chatId.long }, | ||||||
|  |                     valueFromToTo = { this }, | ||||||
|  |                     keyToToFrom = { toChatId() }, | ||||||
|  |                     valueToToFrom = { this } | ||||||
|  |                 ), | ||||||
|  |                 get(scopeQualifier) | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |         single<AdminsCacheSettingsAPI> { | ||||||
|  |             DynamicAdminsCacheSettingsAPI( | ||||||
|  |                 ExposedKeyValueRepo( | ||||||
|  |                     database, | ||||||
|  |                     { long("chatId") }, | ||||||
|  |                     { text("settings") }, | ||||||
|  |                     "DynamicAdminsCacheSettingsAPI" | ||||||
|  |                 ).withMapper<IdChatIdentifier, AdminsCacheSettings, Long, String>( | ||||||
|  |                     keyFromToTo = { chatId.long }, | ||||||
|  |                     valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) }, | ||||||
|  |                     keyToToFrom = { toChatId() }, | ||||||
|  |                     valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) } | ||||||
|  |                 ), | ||||||
|  |                 get(scopeQualifier) | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |         single { DefaultAdminsCacheAPI(get(), get(), get()) } binds arrayOf( | ||||||
|  |             AdminsCacheAPI::class | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) { | ||||||
|  |         with(koin) { | ||||||
|  |             activateAdminsChangesListening( | ||||||
|  |                 get() | ||||||
|  |             ) | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.tgbotapi.libraries.cache.admins.plagubot"/> |  | ||||||
							
								
								
									
										17
									
								
								cache/content/common/build.gradle
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								cache/content/common/build.gradle
									
									
									
									
										vendored
									
									
										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" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
| @@ -0,0 +1,150 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.bot.TelegramBot | ||||||
|  | import dev.inmo.tgbotapi.requests.DeleteMessage | ||||||
|  | import dev.inmo.tgbotapi.requests.DownloadFileStream | ||||||
|  | import dev.inmo.tgbotapi.requests.abstracts.MultipartFile | ||||||
|  | import dev.inmo.tgbotapi.requests.get.GetFile | ||||||
|  | import dev.inmo.tgbotapi.requests.send.media.* | ||||||
|  | import dev.inmo.tgbotapi.types.IdChatIdentifier | ||||||
|  | import dev.inmo.tgbotapi.types.media.* | ||||||
|  | import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.DocumentContent | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MediaContent | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MessageContent | ||||||
|  | import dev.inmo.tgbotapi.utils.asInput | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  |  | ||||||
|  | class DefaultMessageContentCache<K>( | ||||||
|  |     private val bot: TelegramBot, | ||||||
|  |     private val filesRefreshingChatId: IdChatIdentifier, | ||||||
|  |     private val simpleMessageContentCache: MessagesSimpleCache<K>, | ||||||
|  |     private val mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay( | ||||||
|  |         MediaFileActualityChecker.Default(filesRefreshingChatId) | ||||||
|  |     ), | ||||||
|  |     private val messagesFilesCache: MessagesFilesCache<K> = InMemoryMessagesFilesCache() | ||||||
|  | ) : MessageContentCache<K> { | ||||||
|  |     override suspend fun save(k: K, content: MessageContent) { | ||||||
|  |         when (content) { | ||||||
|  |             is MediaContent -> { | ||||||
|  |                 val extendedInfo = bot.execute( | ||||||
|  |                     GetFile(content.media.fileId) | ||||||
|  |                 ) | ||||||
|  |                 val allocator = bot.execute( | ||||||
|  |                     DownloadFileStream( | ||||||
|  |                         extendedInfo.filePath | ||||||
|  |                     ) | ||||||
|  |                 ) | ||||||
|  |  | ||||||
|  |                 save(k, content, extendedInfo.fileName) { | ||||||
|  |                     allocator.invoke().asInput() | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             else -> simpleMessageContentCache.set(k, content) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun save( | ||||||
|  |         k: K, | ||||||
|  |         content: MediaContent, | ||||||
|  |         filename: String, | ||||||
|  |         inputAllocator: suspend () -> Input | ||||||
|  |     ) { | ||||||
|  |         simpleMessageContentCache.set(k, content) | ||||||
|  |         runCatching { | ||||||
|  |             messagesFilesCache.set(k, filename, inputAllocator) | ||||||
|  |         }.onFailure { | ||||||
|  |             simpleMessageContentCache.remove(k) | ||||||
|  |         }.onSuccess { | ||||||
|  |             with(mediaFileActualityChecker) { | ||||||
|  |                 bot.saved(content) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun sendAndSave( | ||||||
|  |         k: K, | ||||||
|  |         filename: String, | ||||||
|  |         inputAllocator: () -> Input | ||||||
|  |     ): DocumentContent { | ||||||
|  |         val sentDocument = bot.execute( | ||||||
|  |             SendDocument( | ||||||
|  |                 filesRefreshingChatId, | ||||||
|  |                 MultipartFile(filename, inputAllocator), | ||||||
|  |             ) | ||||||
|  |         ) | ||||||
|  |         save(k, sentDocument.content, filename, inputAllocator) | ||||||
|  |         runCatching { | ||||||
|  |             bot.execute( | ||||||
|  |                 DeleteMessage( | ||||||
|  |                     sentDocument.chat.id, | ||||||
|  |                     sentDocument.messageId | ||||||
|  |                 ) | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         return sentDocument.content | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun get(k: K): MessageContent? { | ||||||
|  |         val savedSimpleContent = simpleMessageContentCache.get(k) ?: return null | ||||||
|  |  | ||||||
|  |         if (savedSimpleContent is MediaContent && !with(mediaFileActualityChecker) { bot.isActual(savedSimpleContent) }) { | ||||||
|  |             val savedFileContentAllocator = messagesFilesCache.get(k) ?: error("Unexpected absence of $k file for content ($simpleMessageContentCache)") | ||||||
|  |             val newContent = bot.execute( | ||||||
|  |                 when (savedSimpleContent.asTelegramMedia()) { | ||||||
|  |                     is TelegramMediaAnimation -> SendAnimation( | ||||||
|  |                         filesRefreshingChatId, | ||||||
|  |                         savedFileContentAllocator, | ||||||
|  |                         disableNotification = true | ||||||
|  |                     ) | ||||||
|  |                     is TelegramMediaAudio -> SendAudio( | ||||||
|  |                         filesRefreshingChatId, | ||||||
|  |                         savedFileContentAllocator, | ||||||
|  |                         disableNotification = true | ||||||
|  |                     ) | ||||||
|  |                     is TelegramMediaVideo -> SendVideo( | ||||||
|  |                         filesRefreshingChatId, | ||||||
|  |                         savedFileContentAllocator, | ||||||
|  |                         disableNotification = true | ||||||
|  |                     ) | ||||||
|  |                     is TelegramMediaDocument -> SendDocument( | ||||||
|  |                         filesRefreshingChatId, | ||||||
|  |                         savedFileContentAllocator, | ||||||
|  |                         disableNotification = true | ||||||
|  |                     ) | ||||||
|  |                     is TelegramMediaPhoto -> SendPhoto( | ||||||
|  |                         filesRefreshingChatId, | ||||||
|  |                         savedFileContentAllocator, | ||||||
|  |                         disableNotification = true | ||||||
|  |                     ) | ||||||
|  |                 } | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |             simpleMessageContentCache.update(k, newContent.content) | ||||||
|  |             return newContent.content | ||||||
|  |         } | ||||||
|  |         return savedSimpleContent | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun contains(k: K): Boolean { | ||||||
|  |         return simpleMessageContentCache.contains(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun remove(k: K) { | ||||||
|  |         simpleMessageContentCache.remove(k) | ||||||
|  |         messagesFilesCache.remove(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         operator fun invoke( | ||||||
|  |             bot: TelegramBot, | ||||||
|  |             filesRefreshingChatId: IdChatIdentifier, | ||||||
|  |             simpleMessageContentCache: MessagesSimpleCache<String> = InMemoryMessagesSimpleCache(), | ||||||
|  |             mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay( | ||||||
|  |                 MediaFileActualityChecker.Default(filesRefreshingChatId) | ||||||
|  |             ), | ||||||
|  |             messagesFilesCache: MessagesFilesCache<String> = InMemoryMessagesFilesCache() | ||||||
|  |         ) = DefaultMessageContentCache(bot, filesRefreshingChatId, simpleMessageContentCache, mediaFileActualityChecker, messagesFilesCache) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,56 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import korlibs.time.DateTime | ||||||
|  | import korlibs.time.milliseconds | ||||||
|  | import dev.inmo.tgbotapi.bot.TelegramBot | ||||||
|  | import dev.inmo.tgbotapi.requests.DeleteMessage | ||||||
|  | import dev.inmo.tgbotapi.requests.abstracts.FileId | ||||||
|  | import dev.inmo.tgbotapi.types.ChatId | ||||||
|  | import dev.inmo.tgbotapi.types.IdChatIdentifier | ||||||
|  | import dev.inmo.tgbotapi.types.MilliSeconds | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MediaContent | ||||||
|  |  | ||||||
|  | fun interface MediaFileActualityChecker { | ||||||
|  |     suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean | ||||||
|  |     suspend fun TelegramBot.saved(mediaContent: MediaContent) {} | ||||||
|  |  | ||||||
|  |     class Default( | ||||||
|  |         private val checkingChatId: IdChatIdentifier | ||||||
|  |     ) : MediaFileActualityChecker { | ||||||
|  |         override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean { | ||||||
|  |             return runCatching { | ||||||
|  |                 execute(mediaContent.createResend(checkingChatId)).also { sentMessage -> | ||||||
|  |                     execute(DeleteMessage(sentMessage.chat.id, sentMessage.messageId)) | ||||||
|  |                 } | ||||||
|  |             }.isSuccess | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     class WithDelay( | ||||||
|  |         private val underhoodChecker: MediaFileActualityChecker, | ||||||
|  |         private val checkingDelay: MilliSeconds = 24 * 60 * 60 * 1000L // one day | ||||||
|  |     ) : MediaFileActualityChecker { | ||||||
|  |         private val fileIdChecksMap = mutableMapOf<FileId, DateTime>() | ||||||
|  |         private val checkingDelayTimeSpan = checkingDelay.milliseconds | ||||||
|  |  | ||||||
|  |         override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean { | ||||||
|  |             val now = DateTime.now() | ||||||
|  |             val lastCheck = fileIdChecksMap[mediaContent.media.fileId] | ||||||
|  |             return if (lastCheck == null || now - lastCheck > checkingDelayTimeSpan) { | ||||||
|  |                 with(underhoodChecker) { | ||||||
|  |                     isActual(mediaContent) | ||||||
|  |                 }.also { | ||||||
|  |                     if (it) { | ||||||
|  |                         fileIdChecksMap[mediaContent.media.fileId] = now | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } else { | ||||||
|  |                 true | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         override suspend fun TelegramBot.saved(mediaContent: MediaContent) { | ||||||
|  |             fileIdChecksMap[mediaContent.media.fileId] = DateTime.now() | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,26 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.DocumentContent | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MediaContent | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MessageContent | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  |  | ||||||
|  | interface MessageContentCache<K> { | ||||||
|  |     suspend fun save(k: K, content: MessageContent) | ||||||
|  |     suspend fun save( | ||||||
|  |         k: K, | ||||||
|  |         content: MediaContent, | ||||||
|  |         filename: String, | ||||||
|  |         inputAllocator: suspend () -> Input | ||||||
|  |     ) | ||||||
|  |     suspend fun sendAndSave( | ||||||
|  |         k: K, | ||||||
|  |         filename: String, | ||||||
|  |         inputAllocator: () -> Input | ||||||
|  |     ): DocumentContent | ||||||
|  |  | ||||||
|  |     suspend fun get(k: K): MessageContent? | ||||||
|  |     suspend fun contains(k: K): Boolean | ||||||
|  |     suspend fun remove(k: K) | ||||||
|  | } | ||||||
| @@ -0,0 +1,41 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.requests.abstracts.MultipartFile | ||||||
|  | import io.ktor.utils.io.core.* | ||||||
|  |  | ||||||
|  | interface MessagesFilesCache<K> { | ||||||
|  |     suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) | ||||||
|  |     suspend fun get(k: K): MultipartFile? | ||||||
|  |     suspend fun remove(k: K) | ||||||
|  |     suspend fun contains(k: K): Boolean | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * It is not recommended to use in production realization of [MessagesFilesCache] which has been created for fast | ||||||
|  |  * start of application creation with usage of [MessageContentCache] with aim to replace this realization by some | ||||||
|  |  * disks-oriented one | ||||||
|  |  */ | ||||||
|  | class InMemoryMessagesFilesCache<K> : MessagesFilesCache<K> { | ||||||
|  |     private val map = mutableMapOf<K, MultipartFile>() | ||||||
|  |  | ||||||
|  |     override suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) { | ||||||
|  |         val input = inputAllocator() | ||||||
|  |         map[k] = MultipartFile( | ||||||
|  |             filename | ||||||
|  |         ) { | ||||||
|  |             input | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun get(k: K): MultipartFile? { | ||||||
|  |         return map[k] | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun remove(k: K) { | ||||||
|  |         map.remove(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun contains(k: K): Boolean { | ||||||
|  |         return map.contains(k) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,53 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MessageContent | ||||||
|  |  | ||||||
|  | interface MessagesSimpleCache<K> { | ||||||
|  |     suspend fun set(k: K, content: MessageContent) | ||||||
|  |     suspend fun update(k: K, content: MessageContent): Boolean | ||||||
|  |     suspend fun get(k: K): MessageContent? | ||||||
|  |     suspend fun remove(k: K) | ||||||
|  |     suspend fun contains(k: K): Boolean | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * It is not recommended to use in production realization of [MessagesFilesCache] which has been created for fast | ||||||
|  |  * start of application creation with usage of [MessageContentCache] with aim to replace this realization by some | ||||||
|  |  * disks-oriented one | ||||||
|  |  */ | ||||||
|  | class InMemoryMessagesSimpleCache<K> : MessagesSimpleCache<K> { | ||||||
|  |     private val map = mutableMapOf<K, MessageContent>() | ||||||
|  |  | ||||||
|  |     override suspend fun set( | ||||||
|  |         k: K, | ||||||
|  |         content: MessageContent | ||||||
|  |     ) { | ||||||
|  |         map[k] = content | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun update( | ||||||
|  |         k: K, | ||||||
|  |         content: MessageContent | ||||||
|  |     ): Boolean { | ||||||
|  |         return map.runCatching { | ||||||
|  |             if (contains(k)) { | ||||||
|  |                 put(k, content) | ||||||
|  |                 true | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|  |         }.getOrDefault(false) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun get(k: K): MessageContent? { | ||||||
|  |         return map[k] | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun remove(k: K) { | ||||||
|  |         map.remove(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun contains(k: K): Boolean { | ||||||
|  |         return map.contains(k) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,71 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.common | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.requests.abstracts.MultipartFile | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  | import io.ktor.utils.io.core.copyTo | ||||||
|  | import io.ktor.utils.io.streams.* | ||||||
|  | import java.io.File | ||||||
|  |  | ||||||
|  | class InFilesMessagesFilesCache<K>( | ||||||
|  |     private val folderFile: File, | ||||||
|  |     private val filePrefixBuilder: (K) -> String | ||||||
|  | ) : MessagesFilesCache<K> { | ||||||
|  |     private val K.multipartFile: MultipartFile? | ||||||
|  |         get() { | ||||||
|  |             val prefix = filePrefix(this) | ||||||
|  |             val filename = folderFile.list() ?.firstOrNull { it.startsWith(prefix) } ?: return null | ||||||
|  |             val file = File(folderFile, filename) | ||||||
|  |             val storageFileFilename = file.name.removePrefix("$prefix ") | ||||||
|  |  | ||||||
|  |             return MultipartFile(storageFileFilename) { | ||||||
|  |                 file.inputStream().asInput() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |     init { | ||||||
|  |         require(!folderFile.isFile) { "Folder of messages files cache can't be file, but was $folderFile" } | ||||||
|  |         folderFile.mkdirs() | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     private fun filePrefix(k: K): String = filePrefixBuilder(k) | ||||||
|  |  | ||||||
|  |     private fun fileName(k: K, filename: String): String { | ||||||
|  |         return "${filePrefix(k)} $filename" | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) { | ||||||
|  |         val fullFileName = fileName(k, filename) | ||||||
|  |         val file = File(folderFile, fullFileName).apply { | ||||||
|  |             delete() | ||||||
|  |         } | ||||||
|  |         inputAllocator().inputStream().use { input -> | ||||||
|  |             file.outputStream().use { output -> | ||||||
|  |                 input.copyTo(output) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun get(k: K): MultipartFile? { | ||||||
|  |         return k.multipartFile | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun remove(k: K) { | ||||||
|  |         val prefix = filePrefix(k) | ||||||
|  |         folderFile.listFiles() ?.forEach { | ||||||
|  |             if (it.name.startsWith(prefix)) { | ||||||
|  |                 it.delete() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun contains(k: K): Boolean { | ||||||
|  |         val prefix = filePrefix(k) | ||||||
|  |         return folderFile.list() ?.any { it.startsWith(prefix) } == true | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         operator fun invoke(folderFile: File) = InFilesMessagesFilesCache<String>( | ||||||
|  |             folderFile | ||||||
|  |         ) { it } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										18
									
								
								cache/content/micro_utils/build.gradle
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								cache/content/micro_utils/build.gradle
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,18 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppJavaWithJsProjectPath" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api "dev.inmo:micro_utils.repos.common:$micro_utils_version" | ||||||
|  |                 api project(":tgbotapi.libraries.cache.content.common") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
| @@ -0,0 +1,95 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.cache.media.micro_utils | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.repos.* | ||||||
|  | import dev.inmo.micro_utils.repos.mappers.withMapper | ||||||
|  | import dev.inmo.tgbotapi.libraries.cache.media.common.MessagesSimpleCache | ||||||
|  | import dev.inmo.tgbotapi.types.ChatId | ||||||
|  | import dev.inmo.tgbotapi.types.MessageId | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MessageContent | ||||||
|  | import kotlinx.serialization.* | ||||||
|  | import kotlinx.serialization.builtins.PairSerializer | ||||||
|  | import kotlinx.serialization.builtins.serializer | ||||||
|  | import kotlinx.serialization.json.Json | ||||||
|  | import kotlinx.serialization.modules.SerializersModule | ||||||
|  | import kotlin.js.JsName | ||||||
|  | import kotlin.jvm.JvmName | ||||||
|  |  | ||||||
|  | class SimpleKeyValueMessageContentCache<K>( | ||||||
|  |     private val keyValueRepo: KeyValueRepo<K, MessageContent> | ||||||
|  | ) : MessagesSimpleCache<K> { | ||||||
|  |     override suspend fun set(k: K, content: MessageContent) { | ||||||
|  |         keyValueRepo.set(k, content) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun update(k: K, content: MessageContent): Boolean { | ||||||
|  |         return keyValueRepo.runCatching { | ||||||
|  |             if (contains(k)) { | ||||||
|  |                 keyValueRepo.set(k, content) | ||||||
|  |                 true | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|  |         }.getOrDefault(false) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun get(k: K): MessageContent? { | ||||||
|  |         return keyValueRepo.get(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun contains(k: K): Boolean { | ||||||
|  |         return keyValueRepo.contains(k) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun remove(k: K) { | ||||||
|  |         keyValueRepo.unset(k) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | val chatIdToMessageIdentifierSerializer = PairSerializer( | ||||||
|  |     ChatId.serializer(), | ||||||
|  |     MessageId.serializer() | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class) | ||||||
|  |  | ||||||
|  | inline fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleKeyValueMessageContentCache(this) | ||||||
|  |  | ||||||
|  | inline fun KeyValueRepo<String, String>.asMessageContentCache( | ||||||
|  |     serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } } | ||||||
|  | ): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> { | ||||||
|  |     val serialFormat = serialFormatCreator(MessageContent.serializationModule()) | ||||||
|  |     return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>( | ||||||
|  |         { serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.encodeToString(messageContentSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromString(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromString(messageContentSerializer, this) }, | ||||||
|  |     ) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @JvmName("stringsKeyValueAsHexMessageContentCache") | ||||||
|  | @JsName("stringsKeyValueAsHexMessageContentCache") | ||||||
|  | inline fun KeyValueRepo<String, String>.asMessageContentCache( | ||||||
|  |     serialFormatCreator: (SerializersModule) -> BinaryFormat | ||||||
|  | ): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> { | ||||||
|  |     val serialFormat = serialFormatCreator(MessageContent.serializationModule()) | ||||||
|  |     return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>( | ||||||
|  |         { serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.encodeToHexString(messageContentSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromHexString(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromHexString(messageContentSerializer, this) }, | ||||||
|  |     ) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @JvmName("bytesKeyValueAsMessageContentCache") | ||||||
|  | @JsName("bytesKeyValueAsMessageContentCache") | ||||||
|  | inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache( | ||||||
|  |     serialFormatCreator: (SerializersModule) -> BinaryFormat | ||||||
|  | ): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> { | ||||||
|  |     val serialFormat = serialFormatCreator(MessageContent.serializationModule()) | ||||||
|  |     return withMapper<Pair<ChatId, MessageId>, MessageContent, ByteArray, ByteArray>( | ||||||
|  |         { serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.encodeToByteArray(messageContentSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromByteArray(chatIdToMessageIdentifierSerializer, this) }, | ||||||
|  |         { serialFormat.decodeFromByteArray(messageContentSerializer, this) }, | ||||||
|  |     ) | ||||||
|  | } | ||||||
							
								
								
									
										8
									
								
								cache/media/build.gradle
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								cache/media/build.gradle
									
									
									
									
										vendored
									
									
								
							| @@ -1,8 +0,0 @@ | |||||||
| plugins { |  | ||||||
|     id "org.jetbrains.kotlin.multiplatform" |  | ||||||
|     id "org.jetbrains.kotlin.plugin.serialization" |  | ||||||
|     id "com.android.library" |  | ||||||
| } |  | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" |  | ||||||
|  |  | ||||||
							
								
								
									
										1
									
								
								cache/media/src/main/AndroidManifest.xml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								cache/media/src/main/AndroidManifest.xml
									
									
									
									
										vendored
									
									
								
							| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.tgbotapi.libraries.cache.media"/> |  | ||||||
| @@ -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,37 +1,28 @@ | |||||||
|  | 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 | ||||||
| kotlin.incremental=true | kotlin.incremental=true | ||||||
| kotlin.incremental.js=true | kotlin.incremental.js=true | ||||||
| android.useAndroidX=true |  | ||||||
| android.enableJetifier=true |  | ||||||
|  |  | ||||||
| kotlin_version=1.5.31 |  | ||||||
| kotlin_serialisation_core_version=1.3.1 |  | ||||||
|  |  | ||||||
| github_release_plugin_version=2.2.12 | kotlin_version=2.2.20 | ||||||
|  | kotlin_serialisation_core_version=1.9.0 | ||||||
|  |  | ||||||
| tgbotapi_version=0.37.0 | github_release_plugin_version=2.5.2 | ||||||
| micro_utils_version=0.8.2 |  | ||||||
| exposed_version=0.36.1 |  | ||||||
| plagubot_version=0.4.0 |  | ||||||
|  |  | ||||||
| # ANDROID | tgbotapi_version=30.0.0 | ||||||
|  | micro_utils_version=0.26.6 | ||||||
|  | exposed_version=0.61.0 | ||||||
|  | plagubot_version=10.9.0 | ||||||
|  |  | ||||||
| android_minSdkVersion=21 | nmcp_version=1.2.0 | ||||||
| android_compileSdkVersion=31 |  | ||||||
| android_buildToolsVersion=31.0.0 |  | ||||||
| dexcount_version=3.0.0 |  | ||||||
| junit_version=4.12 |  | ||||||
| test_ext_junit_version=1.1.2 |  | ||||||
| espresso_core=3.3.0 |  | ||||||
|  |  | ||||||
| # Dokka | # Dokka | ||||||
|  |  | ||||||
| dokka_version=1.5.31 | dokka_version=2.1.0 | ||||||
|  |  | ||||||
| # Project data | # Project data | ||||||
|  |  | ||||||
| group=dev.inmo | group=dev.inmo | ||||||
| version=0.0.13 | version=0.27.0 | ||||||
| android_code_version=12 |  | ||||||
|   | |||||||
							
								
								
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							| @@ -1,5 +1,7 @@ | |||||||
| distributionBase=GRADLE_USER_HOME | distributionBase=GRADLE_USER_HOME | ||||||
| distributionPath=wrapper/dists | distributionPath=wrapper/dists | ||||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip | ||||||
|  | networkTimeout=10000 | ||||||
|  | validateDistributionUrl=true | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
|   | |||||||
							
								
								
									
										295
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										295
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							| @@ -1,7 +1,7 @@ | |||||||
| #!/usr/bin/env sh | #!/bin/sh | ||||||
|  |  | ||||||
| # | # | ||||||
| # Copyright 2015 the original author or authors. | # Copyright © 2015 the original authors. | ||||||
| # | # | ||||||
| # Licensed under the Apache License, Version 2.0 (the "License"); | # Licensed under the Apache License, Version 2.0 (the "License"); | ||||||
| # you may not use this file except in compliance with the License. | # you may not use this file except in compliance with the License. | ||||||
| @@ -15,81 +15,114 @@ | |||||||
| # See the License for the specific language governing permissions and | # See the License for the specific language governing permissions and | ||||||
| # limitations under the License. | # limitations under the License. | ||||||
| # | # | ||||||
|  | # SPDX-License-Identifier: Apache-2.0 | ||||||
|  | # | ||||||
|  |  | ||||||
| ############################################################################## | ############################################################################## | ||||||
| ## | # | ||||||
| ##  Gradle start up script for UN*X | #   Gradle start up script for POSIX generated by Gradle. | ||||||
| ## | # | ||||||
|  | #   Important for running: | ||||||
|  | # | ||||||
|  | #   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is | ||||||
|  | #       noncompliant, but you have some other compliant shell such as ksh or | ||||||
|  | #       bash, then to run this script, type that shell name before the whole | ||||||
|  | #       command line, like: | ||||||
|  | # | ||||||
|  | #           ksh Gradle | ||||||
|  | # | ||||||
|  | #       Busybox and similar reduced shells will NOT work, because this script | ||||||
|  | #       requires all of these POSIX shell features: | ||||||
|  | #         * functions; | ||||||
|  | #         * expansions «$var», «${var}», «${var:-default}», «${var+SET}», | ||||||
|  | #           «${var#prefix}», «${var%suffix}», and «$( cmd )»; | ||||||
|  | #         * compound commands having a testable exit status, especially «case»; | ||||||
|  | #         * various built-in commands including «command», «set», and «ulimit». | ||||||
|  | # | ||||||
|  | #   Important for patching: | ||||||
|  | # | ||||||
|  | #   (2) This script targets any POSIX shell, so it avoids extensions provided | ||||||
|  | #       by Bash, Ksh, etc; in particular arrays are avoided. | ||||||
|  | # | ||||||
|  | #       The "traditional" practice of packing multiple parameters into a | ||||||
|  | #       space-separated string is a well documented source of bugs and security | ||||||
|  | #       problems, so this is (mostly) avoided, by progressively accumulating | ||||||
|  | #       options in "$@", and eventually passing that to Java. | ||||||
|  | # | ||||||
|  | #       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, | ||||||
|  | #       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; | ||||||
|  | #       see the in-line comments for details. | ||||||
|  | # | ||||||
|  | #       There are tweaks for specific operating systems such as AIX, CygWin, | ||||||
|  | #       Darwin, MinGW, and NonStop. | ||||||
|  | # | ||||||
|  | #   (3) This script is generated from the Groovy template | ||||||
|  | #       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt | ||||||
|  | #       within the Gradle project. | ||||||
|  | # | ||||||
|  | #       You can find Gradle at https://github.com/gradle/gradle/. | ||||||
|  | # | ||||||
| ############################################################################## | ############################################################################## | ||||||
|  |  | ||||||
| # Attempt to set APP_HOME | # Attempt to set APP_HOME | ||||||
|  |  | ||||||
| # Resolve links: $0 may be a link | # Resolve links: $0 may be a link | ||||||
| PRG="$0" | app_path=$0 | ||||||
| # Need this for relative symlinks. |  | ||||||
| while [ -h "$PRG" ] ; do | # Need this for daisy-chained symlinks. | ||||||
|     ls=`ls -ld "$PRG"` | while | ||||||
|     link=`expr "$ls" : '.*-> \(.*\)$'` |     APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path | ||||||
|     if expr "$link" : '/.*' > /dev/null; then |     [ -h "$app_path" ] | ||||||
|         PRG="$link" | do | ||||||
|     else |     ls=$( ls -ld "$app_path" ) | ||||||
|         PRG=`dirname "$PRG"`"/$link" |     link=${ls#*' -> '} | ||||||
|     fi |     case $link in             #( | ||||||
|  |       /*)   app_path=$link ;; #( | ||||||
|  |       *)    app_path=$APP_HOME$link ;; | ||||||
|  |     esac | ||||||
| done | done | ||||||
| SAVED="`pwd`" |  | ||||||
| cd "`dirname \"$PRG\"`/" >/dev/null |  | ||||||
| APP_HOME="`pwd -P`" |  | ||||||
| cd "$SAVED" >/dev/null |  | ||||||
|  |  | ||||||
| APP_NAME="Gradle" | # This is normally unused | ||||||
| APP_BASE_NAME=`basename "$0"` | # shellcheck disable=SC2034 | ||||||
|  | APP_BASE_NAME=${0##*/} | ||||||
| # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) | ||||||
| DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' | APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit | ||||||
|  |  | ||||||
| # Use the maximum available, or set MAX_FD != -1 to use that value. | # Use the maximum available, or set MAX_FD != -1 to use that value. | ||||||
| MAX_FD="maximum" | MAX_FD=maximum | ||||||
|  |  | ||||||
| warn () { | warn () { | ||||||
|     echo "$*" |     echo "$*" | ||||||
| } | } >&2 | ||||||
|  |  | ||||||
| die () { | die () { | ||||||
|     echo |     echo | ||||||
|     echo "$*" |     echo "$*" | ||||||
|     echo |     echo | ||||||
|     exit 1 |     exit 1 | ||||||
| } | } >&2 | ||||||
|  |  | ||||||
| # OS specific support (must be 'true' or 'false'). | # OS specific support (must be 'true' or 'false'). | ||||||
| cygwin=false | cygwin=false | ||||||
| msys=false | msys=false | ||||||
| darwin=false | darwin=false | ||||||
| nonstop=false | nonstop=false | ||||||
| case "`uname`" in | case "$( uname )" in                #( | ||||||
|   CYGWIN* ) |   CYGWIN* )         cygwin=true  ;; #( | ||||||
|     cygwin=true |   Darwin* )         darwin=true  ;; #( | ||||||
|     ;; |   MSYS* | MINGW* )  msys=true    ;; #( | ||||||
|   Darwin* ) |   NONSTOP* )        nonstop=true ;; | ||||||
|     darwin=true |  | ||||||
|     ;; |  | ||||||
|   MINGW* ) |  | ||||||
|     msys=true |  | ||||||
|     ;; |  | ||||||
|   NONSTOP* ) |  | ||||||
|     nonstop=true |  | ||||||
|     ;; |  | ||||||
| esac | esac | ||||||
|  |  | ||||||
| CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar |  | ||||||
|  |  | ||||||
|  |  | ||||||
| # Determine the Java command to use to start the JVM. | # Determine the Java command to use to start the JVM. | ||||||
| if [ -n "$JAVA_HOME" ] ; then | if [ -n "$JAVA_HOME" ] ; then | ||||||
|     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then |     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then | ||||||
|         # IBM's JDK on AIX uses strange locations for the executables |         # IBM's JDK on AIX uses strange locations for the executables | ||||||
|         JAVACMD="$JAVA_HOME/jre/sh/java" |         JAVACMD=$JAVA_HOME/jre/sh/java | ||||||
|     else |     else | ||||||
|         JAVACMD="$JAVA_HOME/bin/java" |         JAVACMD=$JAVA_HOME/bin/java | ||||||
|     fi |     fi | ||||||
|     if [ ! -x "$JAVACMD" ] ; then |     if [ ! -x "$JAVACMD" ] ; then | ||||||
|         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME |         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME | ||||||
| @@ -98,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the | |||||||
| location of your Java installation." | location of your Java installation." | ||||||
|     fi |     fi | ||||||
| else | else | ||||||
|     JAVACMD="java" |     JAVACMD=java | ||||||
|     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. |     if ! command -v java >/dev/null 2>&1 | ||||||
|  |     then | ||||||
|  |         die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | ||||||
|  |  | ||||||
| Please set the JAVA_HOME variable in your environment to match the | Please set the JAVA_HOME variable in your environment to match the | ||||||
| location of your Java installation." | location of your Java installation." | ||||||
|  |     fi | ||||||
| fi | fi | ||||||
|  |  | ||||||
| # Increase the maximum file descriptors if we can. | # Increase the maximum file descriptors if we can. | ||||||
| if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then | if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then | ||||||
|     MAX_FD_LIMIT=`ulimit -H -n` |     case $MAX_FD in #( | ||||||
|     if [ $? -eq 0 ] ; then |       max*) | ||||||
|         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then |         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. | ||||||
|             MAX_FD="$MAX_FD_LIMIT" |         # shellcheck disable=SC2039,SC3045 | ||||||
|         fi |         MAX_FD=$( ulimit -H -n ) || | ||||||
|         ulimit -n $MAX_FD |             warn "Could not query maximum file descriptor limit" | ||||||
|         if [ $? -ne 0 ] ; then |     esac | ||||||
|             warn "Could not set maximum file descriptor limit: $MAX_FD" |     case $MAX_FD in  #( | ||||||
|         fi |       '' | soft) :;; #( | ||||||
|     else |       *) | ||||||
|         warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" |         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. | ||||||
|     fi |         # shellcheck disable=SC2039,SC3045 | ||||||
| fi |         ulimit -n "$MAX_FD" || | ||||||
|  |             warn "Could not set maximum file descriptor limit to $MAX_FD" | ||||||
| # For Darwin, add options to specify how the application appears in the dock |  | ||||||
| if $darwin; then |  | ||||||
|     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" |  | ||||||
| fi |  | ||||||
|  |  | ||||||
| # For Cygwin or MSYS, switch paths to Windows format before running java |  | ||||||
| if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then |  | ||||||
|     APP_HOME=`cygpath --path --mixed "$APP_HOME"` |  | ||||||
|     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` |  | ||||||
|  |  | ||||||
|     JAVACMD=`cygpath --unix "$JAVACMD"` |  | ||||||
|  |  | ||||||
|     # We build the pattern for arguments to be converted via cygpath |  | ||||||
|     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` |  | ||||||
|     SEP="" |  | ||||||
|     for dir in $ROOTDIRSRAW ; do |  | ||||||
|         ROOTDIRS="$ROOTDIRS$SEP$dir" |  | ||||||
|         SEP="|" |  | ||||||
|     done |  | ||||||
|     OURCYGPATTERN="(^($ROOTDIRS))" |  | ||||||
|     # Add a user-defined pattern to the cygpath arguments |  | ||||||
|     if [ "$GRADLE_CYGPATTERN" != "" ] ; then |  | ||||||
|         OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" |  | ||||||
|     fi |  | ||||||
|     # Now convert the arguments - kludge to limit ourselves to /bin/sh |  | ||||||
|     i=0 |  | ||||||
|     for arg in "$@" ; do |  | ||||||
|         CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` |  | ||||||
|         CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option |  | ||||||
|  |  | ||||||
|         if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition |  | ||||||
|             eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` |  | ||||||
|         else |  | ||||||
|             eval `echo args$i`="\"$arg\"" |  | ||||||
|         fi |  | ||||||
|         i=`expr $i + 1` |  | ||||||
|     done |  | ||||||
|     case $i in |  | ||||||
|         0) set -- ;; |  | ||||||
|         1) set -- "$args0" ;; |  | ||||||
|         2) set -- "$args0" "$args1" ;; |  | ||||||
|         3) set -- "$args0" "$args1" "$args2" ;; |  | ||||||
|         4) set -- "$args0" "$args1" "$args2" "$args3" ;; |  | ||||||
|         5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; |  | ||||||
|         6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; |  | ||||||
|         7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; |  | ||||||
|         8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; |  | ||||||
|         9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; |  | ||||||
|     esac |     esac | ||||||
| fi | fi | ||||||
|  |  | ||||||
| # Escape application args | # Collect all arguments for the java command, stacking in reverse order: | ||||||
| save () { | #   * args from the command line | ||||||
|     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done | #   * the main class name | ||||||
|     echo " " | #   * -classpath | ||||||
| } | #   * -D...appname settings | ||||||
| APP_ARGS=`save "$@"` | #   * --module-path (only if needed) | ||||||
|  | #   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. | ||||||
|  |  | ||||||
| # Collect all arguments for the java command, following the shell quoting and substitution rules | # For Cygwin or MSYS, switch paths to Windows format before running java | ||||||
| eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" | if "$cygwin" || "$msys" ; then | ||||||
|  |     APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) | ||||||
|  |  | ||||||
|  |     JAVACMD=$( cygpath --unix "$JAVACMD" ) | ||||||
|  |  | ||||||
|  |     # Now convert the arguments - kludge to limit ourselves to /bin/sh | ||||||
|  |     for arg do | ||||||
|  |         if | ||||||
|  |             case $arg in                                #( | ||||||
|  |               -*)   false ;;                            # don't mess with options #( | ||||||
|  |               /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath | ||||||
|  |                     [ -e "$t" ] ;;                      #( | ||||||
|  |               *)    false ;; | ||||||
|  |             esac | ||||||
|  |         then | ||||||
|  |             arg=$( cygpath --path --ignore --mixed "$arg" ) | ||||||
|  |         fi | ||||||
|  |         # Roll the args list around exactly as many times as the number of | ||||||
|  |         # args, so each arg winds up back in the position where it started, but | ||||||
|  |         # possibly modified. | ||||||
|  |         # | ||||||
|  |         # NB: a `for` loop captures its iteration list before it begins, so | ||||||
|  |         # changing the positional parameters here affects neither the number of | ||||||
|  |         # iterations, nor the values presented in `arg`. | ||||||
|  |         shift                   # remove old arg | ||||||
|  |         set -- "$@" "$arg"      # push replacement arg | ||||||
|  |     done | ||||||
|  | fi | ||||||
|  |  | ||||||
|  |  | ||||||
|  | # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | ||||||
|  | DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' | ||||||
|  |  | ||||||
|  | # Collect all arguments for the java command: | ||||||
|  | #   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, | ||||||
|  | #     and any embedded shellness will be escaped. | ||||||
|  | #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be | ||||||
|  | #     treated as '${Hostname}' itself on the command line. | ||||||
|  |  | ||||||
|  | set -- \ | ||||||
|  |         "-Dorg.gradle.appname=$APP_BASE_NAME" \ | ||||||
|  |         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ | ||||||
|  |         "$@" | ||||||
|  |  | ||||||
|  | # Stop when "xargs" is not available. | ||||||
|  | if ! command -v xargs >/dev/null 2>&1 | ||||||
|  | then | ||||||
|  |     die "xargs is not available" | ||||||
|  | fi | ||||||
|  |  | ||||||
|  | # Use "xargs" to parse quoted args. | ||||||
|  | # | ||||||
|  | # With -n1 it outputs one arg per line, with the quotes and backslashes removed. | ||||||
|  | # | ||||||
|  | # In Bash we could simply go: | ||||||
|  | # | ||||||
|  | #   readarray ARGS < <( xargs -n1 <<<"$var" ) && | ||||||
|  | #   set -- "${ARGS[@]}" "$@" | ||||||
|  | # | ||||||
|  | # but POSIX shell has neither arrays nor command substitution, so instead we | ||||||
|  | # post-process each arg (as a line of input to sed) to backslash-escape any | ||||||
|  | # character that might be a shell metacharacter, then use eval to reverse | ||||||
|  | # that process (while maintaining the separation between arguments), and wrap | ||||||
|  | # the whole thing up as a single "set" statement. | ||||||
|  | # | ||||||
|  | # This will of course break if any of these variables contains a newline or | ||||||
|  | # an unmatched quote. | ||||||
|  | # | ||||||
|  |  | ||||||
|  | eval "set -- $( | ||||||
|  |         printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | | ||||||
|  |         xargs -n1 | | ||||||
|  |         sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | | ||||||
|  |         tr '\n' ' ' | ||||||
|  |     )" '"$@"' | ||||||
|  |  | ||||||
| exec "$JAVACMD" "$@" | exec "$JAVACMD" "$@" | ||||||
|   | |||||||
							
								
								
									
										40
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										40
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							| @@ -13,8 +13,10 @@ | |||||||
| @rem See the License for the specific language governing permissions and | @rem See the License for the specific language governing permissions and | ||||||
| @rem limitations under the License. | @rem limitations under the License. | ||||||
| @rem | @rem | ||||||
|  | @rem SPDX-License-Identifier: Apache-2.0 | ||||||
|  | @rem | ||||||
|  |  | ||||||
| @if "%DEBUG%" == "" @echo off | @if "%DEBUG%"=="" @echo off | ||||||
| @rem ########################################################################## | @rem ########################################################################## | ||||||
| @rem | @rem | ||||||
| @rem  Gradle startup script for Windows | @rem  Gradle startup script for Windows | ||||||
| @@ -25,7 +27,8 @@ | |||||||
| if "%OS%"=="Windows_NT" setlocal | if "%OS%"=="Windows_NT" setlocal | ||||||
|  |  | ||||||
| set DIRNAME=%~dp0 | set DIRNAME=%~dp0 | ||||||
| if "%DIRNAME%" == "" set DIRNAME=. | if "%DIRNAME%"=="" set DIRNAME=. | ||||||
|  | @rem This is normally unused | ||||||
| set APP_BASE_NAME=%~n0 | set APP_BASE_NAME=%~n0 | ||||||
| set APP_HOME=%DIRNAME% | set APP_HOME=%DIRNAME% | ||||||
|  |  | ||||||
| @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome | |||||||
|  |  | ||||||
| set JAVA_EXE=java.exe | set JAVA_EXE=java.exe | ||||||
| %JAVA_EXE% -version >NUL 2>&1 | %JAVA_EXE% -version >NUL 2>&1 | ||||||
| if "%ERRORLEVEL%" == "0" goto execute | if %ERRORLEVEL% equ 0 goto execute | ||||||
|  |  | ||||||
| echo. | echo. 1>&2 | ||||||
| echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 | ||||||
| echo. | echo. 1>&2 | ||||||
| echo Please set the JAVA_HOME variable in your environment to match the | echo Please set the JAVA_HOME variable in your environment to match the 1>&2 | ||||||
| echo location of your Java installation. | echo location of your Java installation. 1>&2 | ||||||
|  |  | ||||||
| goto fail | goto fail | ||||||
|  |  | ||||||
| @@ -56,32 +59,33 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe | |||||||
|  |  | ||||||
| if exist "%JAVA_EXE%" goto execute | if exist "%JAVA_EXE%" goto execute | ||||||
|  |  | ||||||
| echo. | echo. 1>&2 | ||||||
| echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% | echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 | ||||||
| echo. | echo. 1>&2 | ||||||
| echo Please set the JAVA_HOME variable in your environment to match the | echo Please set the JAVA_HOME variable in your environment to match the 1>&2 | ||||||
| echo location of your Java installation. | echo location of your Java installation. 1>&2 | ||||||
|  |  | ||||||
| goto fail | goto fail | ||||||
|  |  | ||||||
| :execute | :execute | ||||||
| @rem Setup the command line | @rem Setup the command line | ||||||
|  |  | ||||||
| set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar |  | ||||||
|  |  | ||||||
|  |  | ||||||
| @rem Execute Gradle | @rem Execute Gradle | ||||||
| "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* | "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* | ||||||
|  |  | ||||||
| :end | :end | ||||||
| @rem End local scope for the variables with windows NT shell | @rem End local scope for the variables with windows NT shell | ||||||
| if "%ERRORLEVEL%"=="0" goto mainEnd | if %ERRORLEVEL% equ 0 goto mainEnd | ||||||
|  |  | ||||||
| :fail | :fail | ||||||
| rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of | rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of | ||||||
| rem the _cmd.exe /c_ return code! | rem the _cmd.exe /c_ return code! | ||||||
| if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 | set EXIT_CODE=%ERRORLEVEL% | ||||||
| exit /b 1 | if %EXIT_CODE% equ 0 set EXIT_CODE=1 | ||||||
|  | if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% | ||||||
|  | exit /b %EXIT_CODE% | ||||||
|  |  | ||||||
| :mainEnd | :mainEnd | ||||||
| if "%OS%"=="Windows_NT" endlocal | if "%OS%"=="Windows_NT" endlocal | ||||||
|   | |||||||
| @@ -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,36 +0,0 @@ | |||||||
| project.version = "$version" |  | ||||||
| project.group = "$group" |  | ||||||
|  |  | ||||||
| apply from: "$publishGradlePath" |  | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main.kotlinOptions.useIR = true |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     toolchain { |  | ||||||
|         languageVersion = JavaLanguageVersion.of(8) |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -4,14 +4,17 @@ project.group = "$group" | |||||||
| apply from: "$publishGradlePath" | apply from: "$publishGradlePath" | ||||||
| 
 | 
 | ||||||
| kotlin { | kotlin { | ||||||
|     jvm() |     jvm { | ||||||
|  |         compilations.main { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "17" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|     js (IR) { |     js (IR) { | ||||||
|         browser() |         browser() | ||||||
|         nodejs() |         nodejs() | ||||||
|     } |     } | ||||||
|     android { |  | ||||||
|         publishAllLibraryVariants() |  | ||||||
|     } |  | ||||||
| 
 | 
 | ||||||
|     sourceSets { |     sourceSets { | ||||||
|         commonMain { |         commonMain { | ||||||
| @@ -34,23 +37,12 @@ kotlin { | |||||||
|         jsTest { |         jsTest { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('test-js') |                 implementation kotlin('test-js') | ||||||
|                 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" |  | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| java { | java { | ||||||
|     toolchain { |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|         languageVersion = JavaLanguageVersion.of(8) |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
|     } |  | ||||||
| } | } | ||||||
| 
 |  | ||||||
| apply from: "$defaultAndroidSettingsPresetPath" |  | ||||||
| @@ -1,7 +1,7 @@ | |||||||
| apply plugin: 'maven-publish' | apply plugin: 'maven-publish' | ||||||
|  |  | ||||||
| task javadocsJar(type: Jar) { | task javadocsJar(type: Jar) { | ||||||
|     classifier = 'javadoc' |     archiveClassifier = 'javadoc' | ||||||
| } | } | ||||||
|  |  | ||||||
| publishing { | publishing { | ||||||
| @@ -38,14 +38,81 @@ publishing { | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         repositories { |         repositories { | ||||||
|             maven { |             if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) { | ||||||
|                 name = "GithubPackages" |                 maven { | ||||||
|                 url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries") |                     name = "GithubPackages" | ||||||
|                 credentials { |                     url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries") | ||||||
|                     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') |                     credentials { | ||||||
|  |                         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') | ||||||
|  |                     } | ||||||
|  |              | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) { | ||||||
|  |                 maven { | ||||||
|  |                     name = "InmoNexus" | ||||||
|  |                     url = uri("https://nexus.inmo.dev/repository/maven-releases/") | ||||||
|  |              | ||||||
|  |                     credentials { | ||||||
|  |                         username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER') | ||||||
|  |                         password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD') | ||||||
|  |                     } | ||||||
|  |              | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { | ||||||
|  |                 maven { | ||||||
|  |                     name = "sonatype" | ||||||
|  |                     url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") | ||||||
|  |              | ||||||
|  |                     credentials { | ||||||
|  |                         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') | ||||||
|  |                     } | ||||||
|  |              | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |      | ||||||
|  | if (project.hasProperty("signing.gnupg.keyName")) { | ||||||
|  |     apply plugin: 'signing' | ||||||
|  |      | ||||||
|  |     signing { | ||||||
|  |         useGpgCmd() | ||||||
|  |      | ||||||
|  |         sign publishing.publications | ||||||
|  |     } | ||||||
|  |      | ||||||
|  |     task signAll { | ||||||
|  |         tasks.withType(Sign).forEach { | ||||||
|  |             dependsOn(it) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     // Workaround to make android sign operations depend on signing tasks | ||||||
|  |     project.getTasks().withType(AbstractPublishToMaven.class).configureEach { | ||||||
|  |         def signingTasks = project.getTasks().withType(Sign.class) | ||||||
|  |         mustRunAfter(signingTasks) | ||||||
|  |     } | ||||||
|  |     // Workaround to make test tasks use sign | ||||||
|  |     project.getTasks().withType(Sign.class).configureEach { signTask -> | ||||||
|  |         def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name) | ||||||
|  |         def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign | ||||||
|  |         // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets | ||||||
|  |  | ||||||
|  |         // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency | ||||||
|  |         def debugTestTask = tasks.findByName("linkDebugTest$pubName") | ||||||
|  |         if (debugTestTask != null) { | ||||||
|  |             signTask.mustRunAfter(debugTestTask) | ||||||
|  |         } | ||||||
|  |         // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency | ||||||
|  |         def testTask = tasks.findByName("compileTestKotlin$pubName") | ||||||
|  |         if (testTask != null) { | ||||||
|  |             signTask.mustRunAfter(testTask) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								publish.kpsb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								publish.kpsb
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +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":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}} | ||||||
| @@ -1 +0,0 @@ | |||||||
| {"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","includeGpgSigning":false,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"}]}} |  | ||||||
							
								
								
									
										6
									
								
								renovate.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								renovate.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | |||||||
|  | { | ||||||
|  |   "$schema": "https://docs.renovatebot.com/renovate-schema.json", | ||||||
|  |   "extends": [ | ||||||
|  |     "config:recommended" | ||||||
|  |   ] | ||||||
|  | } | ||||||
							
								
								
									
										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" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
							
								
								
									
										36
									
								
								resender/src/commonMain/kotlin/MessageMetaInfo.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								resender/src/commonMain/kotlin/MessageMetaInfo.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,36 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.resender | ||||||
|  |  | ||||||
|  | import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer | ||||||
|  | import dev.inmo.tgbotapi.types.IdChatIdentifier | ||||||
|  | import dev.inmo.tgbotapi.types.MediaGroupId | ||||||
|  | import dev.inmo.tgbotapi.types.MessageId | ||||||
|  | import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage | ||||||
|  | import dev.inmo.tgbotapi.types.message.abstracts.Message | ||||||
|  | import dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage | ||||||
|  | import dev.inmo.tgbotapi.types.message.content.MediaGroupContent | ||||||
|  | import kotlinx.serialization.Serializable | ||||||
|  |  | ||||||
|  | @Serializable | ||||||
|  | data class MessageMetaInfo( | ||||||
|  |     @Serializable(FullChatIdentifierSerializer::class) | ||||||
|  |     val chatId: IdChatIdentifier, | ||||||
|  |     val messageId: MessageId, | ||||||
|  |     val group: MediaGroupId? = null | ||||||
|  | ) { | ||||||
|  |     val metaInfo: Message.MetaInfo | ||||||
|  |         get() = Message.MetaInfo(chatId, messageId) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Message.asMessageMetaInfos(): List<MessageMetaInfo> { | ||||||
|  |     return if (this is ContentMessage<*>) { | ||||||
|  |         (content as? MediaGroupContent<*>) ?.group ?.map { | ||||||
|  |             MessageMetaInfo(it.sourceMessage.chat.id, it.sourceMessage.messageId, it.sourceMessage.mediaGroupId) | ||||||
|  |         } | ||||||
|  |     } else { | ||||||
|  |         null | ||||||
|  |     } ?: listOf(MessageMetaInfo(chat.id, messageId, (this as? PossiblyMediaGroupMessage<*>) ?.mediaGroupId)) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | operator fun MessageMetaInfo.Companion.invoke( | ||||||
|  |     message: Message | ||||||
|  | ) = MessageMetaInfo(message.chat.id, message.messageId, (message as? PossiblyMediaGroupMessage<*>) ?.mediaGroupId) | ||||||
							
								
								
									
										160
									
								
								resender/src/commonMain/kotlin/MessagesResender.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										160
									
								
								resender/src/commonMain/kotlin/MessagesResender.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,160 @@ | |||||||
|  | package dev.inmo.tgbotapi.libraries.resender | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.applyDiff | ||||||
|  | import dev.inmo.tgbotapi.bot.TelegramBot | ||||||
|  | import dev.inmo.tgbotapi.requests.ForwardMessage | ||||||
|  | import dev.inmo.tgbotapi.requests.ForwardMessages | ||||||
|  | import dev.inmo.tgbotapi.requests.send.CopyMessage | ||||||
|  | import dev.inmo.tgbotapi.requests.send.CopyMessages | ||||||
|  | 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>, | ||||||
|  |         onBetweenMessages: suspend (sent: List<MessageMetaInfo>, toBeSent: List<MessageMetaInfo>) -> Unit | ||||||
|  |     ): 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 } | ||||||
|  |  | ||||||
|  |         val sent = mutableListOf<MessageMetaInfo>() | ||||||
|  |         val leftToSend = ordersWithMessagesGroups.map { it.second }.toMutableList() | ||||||
|  |  | ||||||
|  |         return ordersWithMessagesGroups.flatMap { (_, contents) -> | ||||||
|  |             val sourceMessagesToSentMessages = mutableListOf<Pair<MessageMetaInfo, MessageMetaInfo>>() | ||||||
|  |  | ||||||
|  |             onBetweenMessages(sent.toList(), leftToSend.flatten()) | ||||||
|  |  | ||||||
|  |             when { | ||||||
|  |                 contents.size == 1 -> { | ||||||
|  |                     val messageInfo = contents.first() | ||||||
|  |                     runCatching { | ||||||
|  |                         MessageMetaInfo( | ||||||
|  |                             targetChatId, | ||||||
|  |                             bot.execute( | ||||||
|  |                                 CopyMessage( | ||||||
|  |                                     toChatId = 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( | ||||||
|  |                                         toChatId = 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( | ||||||
|  |                                             toChatId = 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( | ||||||
|  |                                         toChatId = targetChatId, | ||||||
|  |                                         fromChatId = it.chat.id, | ||||||
|  |                                         messageId = 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 | ||||||
|  |                                     ) | ||||||
|  |                                 ) | ||||||
|  |                             } | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             leftToSend.takeIf { it.isNotEmpty() } ?.removeAt(0) ?.also { | ||||||
|  |                 sent.addAll(it) | ||||||
|  |             } | ||||||
|  |             sourceMessagesToSentMessages.toList() | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     suspend fun resend( | ||||||
|  |         targetChatId: IdChatIdentifier, | ||||||
|  |         messagesInfo: List<MessageMetaInfo> | ||||||
|  |     ): List<Pair<MessageMetaInfo, MessageMetaInfo>> = resend(targetChatId, messagesInfo) { _, _ -> } | ||||||
|  | } | ||||||
| @@ -4,13 +4,17 @@ String[] includes = [ | |||||||
|     ":cache:admins:common", |     ":cache:admins:common", | ||||||
|     ":cache:admins:micro_utils", |     ":cache:admins:micro_utils", | ||||||
|     ":cache:admins:plagubot", |     ":cache:admins:plagubot", | ||||||
|     ":cache:media" |  | ||||||
|  |     ":cache:content:common", | ||||||
|  |     ":cache:content:micro_utils", | ||||||
|  |  | ||||||
|  |     ":resender", | ||||||
| ] | ] | ||||||
|  |  | ||||||
|  |  | ||||||
| includes.each { originalName -> | includes.each { originalName -> | ||||||
|     String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replaceAll(":", File.separator)}" |     String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replace(":", File.separator)}" | ||||||
|     String projectName = "${rootProject.name}${originalName.replaceAll(":", ".")}" |     String projectName = "${rootProject.name}${originalName.replace(":", ".")}" | ||||||
|     String projectIdentifier = ":${projectName}" |     String projectIdentifier = ":${projectName}" | ||||||
|     include projectIdentifier |     include projectIdentifier | ||||||
|     ProjectDescriptor project = project(projectIdentifier) |     ProjectDescriptor project = project(projectIdentifier) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user