mirror of
https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git
synced 2025-10-26 09:40:12 +00:00
Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d5ae880e77 | |||
| 570568cd26 | |||
| 6327366720 | |||
| 0f05779e0d | |||
| be1b13debb | |||
| 043948401d | |||
| cde0a11c1b | |||
| 7e37a43904 | |||
| 5305438686 | |||
| f423d31423 | |||
| 6591c8ffa8 | |||
| 5d6d4a0ade | |||
| 5a31a5566c | |||
| fecbfc4130 | |||
| bf3c4bc11f | |||
| 2ef2d60213 | |||
| a1c2e48622 | |||
| ffdf808a89 | |||
| ef8bc50bd9 | |||
| df5dea4915 | |||
| 989f3af9db | |||
| 4c0cdc8d1e |
6
.github/workflows/commit-publish.yml
vendored
6
.github/workflows/commit-publish.yml
vendored
@@ -7,10 +7,10 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: 1.8
|
||||
- name: Fix android 31.0.0 dx
|
||||
java-version: 11
|
||||
- name: Fix android 32.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
|
||||
run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib && mv d8.jar dx.jar
|
||||
- name: Update version
|
||||
run: |
|
||||
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -11,5 +11,6 @@ out/
|
||||
|
||||
secret.gradle
|
||||
local.properties
|
||||
kotlin-js-store/
|
||||
|
||||
publishing.sh
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
google()
|
||||
mavenCentral()
|
||||
mavenLocal()
|
||||
@@ -8,7 +7,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:4.2.2'
|
||||
classpath 'com.android.tools.build:gradle:7.0.4'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
|
||||
classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
|
||||
@@ -19,10 +18,8 @@ buildscript {
|
||||
allprojects {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
google()
|
||||
maven { url "https://kotlin.bintray.com/kotlinx" }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,3 +6,13 @@ plugins {
|
||||
|
||||
apply from: "$mppProjectWithSerializationPresetPath"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
commonMain {
|
||||
dependencies {
|
||||
api "dev.inmo:tgbotapi.core:$tgbotapi_version"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
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.ChatId
|
||||
import dev.inmo.tgbotapi.types.InputMedia.*
|
||||
import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
|
||||
import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
|
||||
import dev.inmo.tgbotapi.utils.asInput
|
||||
import io.ktor.utils.io.core.Input
|
||||
|
||||
class DefaultMessageContentCache<K>(
|
||||
private val bot: TelegramBot,
|
||||
private val filesRefreshingChatId: ChatId,
|
||||
private val simpleMessageContentCache: MessagesSimpleCache<K>,
|
||||
private val mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
|
||||
MediaFileActualityChecker.Default(filesRefreshingChatId)
|
||||
),
|
||||
private val messagesFilesCache: MessagesFilesCache<K> = InMemoryMessagesFilesCache()
|
||||
) : MessageContentCache<K> {
|
||||
override suspend fun save(content: MessageContent): K {
|
||||
return when (content) {
|
||||
is MediaContent -> {
|
||||
val extendedInfo = bot.execute(
|
||||
GetFile(content.media.fileId)
|
||||
)
|
||||
val allocator = bot.execute(
|
||||
DownloadFileStream(
|
||||
extendedInfo.filePath
|
||||
)
|
||||
)
|
||||
|
||||
save(content, extendedInfo.fileName) {
|
||||
allocator.invoke().asInput()
|
||||
}
|
||||
}
|
||||
else -> simpleMessageContentCache.add(content)
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun save(
|
||||
content: MediaContent,
|
||||
filename: String,
|
||||
inputAllocator: suspend () -> Input
|
||||
): K {
|
||||
val key = simpleMessageContentCache.add(content)
|
||||
runCatching {
|
||||
messagesFilesCache.set(key, filename, inputAllocator)
|
||||
}.onFailure {
|
||||
simpleMessageContentCache.remove(key)
|
||||
}.onSuccess {
|
||||
with(mediaFileActualityChecker) {
|
||||
bot.saved(content)
|
||||
}
|
||||
}
|
||||
|
||||
return key
|
||||
}
|
||||
|
||||
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.asInputMedia()) {
|
||||
is InputMediaAnimation -> SendAnimation(
|
||||
filesRefreshingChatId,
|
||||
MultipartFile(
|
||||
savedFileContentAllocator
|
||||
),
|
||||
disableNotification = true
|
||||
)
|
||||
is InputMediaAudio -> SendAudio(
|
||||
filesRefreshingChatId,
|
||||
MultipartFile(
|
||||
savedFileContentAllocator
|
||||
),
|
||||
disableNotification = true
|
||||
)
|
||||
is InputMediaVideo -> SendVideo(
|
||||
filesRefreshingChatId,
|
||||
MultipartFile(
|
||||
savedFileContentAllocator
|
||||
),
|
||||
disableNotification = true
|
||||
)
|
||||
is InputMediaDocument -> SendDocument(
|
||||
filesRefreshingChatId,
|
||||
MultipartFile(
|
||||
savedFileContentAllocator
|
||||
),
|
||||
disableNotification = true
|
||||
)
|
||||
is InputMediaPhoto -> SendPhoto(
|
||||
filesRefreshingChatId,
|
||||
MultipartFile(
|
||||
savedFileContentAllocator
|
||||
),
|
||||
disableNotification = true
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
simpleMessageContentCache.update(k, newContent.content)
|
||||
return newContent.content
|
||||
}
|
||||
return savedSimpleContent
|
||||
}
|
||||
|
||||
override suspend fun contains(k: K): Boolean {
|
||||
return simpleMessageContentCache.contains(k)
|
||||
}
|
||||
|
||||
override suspend fun remove(k: K) {
|
||||
simpleMessageContentCache.remove(k)
|
||||
messagesFilesCache.remove(k)
|
||||
}
|
||||
|
||||
companion object {
|
||||
operator fun invoke(
|
||||
bot: TelegramBot,
|
||||
filesRefreshingChatId: ChatId,
|
||||
simpleMessageContentCache: MessagesSimpleCache<String> = InMemoryMessagesSimpleCache(),
|
||||
mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
|
||||
MediaFileActualityChecker.Default(filesRefreshingChatId)
|
||||
),
|
||||
messagesFilesCache: MessagesFilesCache<String> = InMemoryMessagesFilesCache()
|
||||
) = DefaultMessageContentCache(bot, filesRefreshingChatId, simpleMessageContentCache, mediaFileActualityChecker, messagesFilesCache)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
package dev.inmo.tgbotapi.libraries.cache.media.common
|
||||
|
||||
import com.soywiz.klock.DateTime
|
||||
import com.soywiz.klock.milliseconds
|
||||
import dev.inmo.tgbotapi.bot.TelegramBot
|
||||
import dev.inmo.tgbotapi.requests.DeleteMessage
|
||||
import dev.inmo.tgbotapi.requests.abstracts.FileId
|
||||
import dev.inmo.tgbotapi.types.ChatId
|
||||
import dev.inmo.tgbotapi.types.MilliSeconds
|
||||
import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
|
||||
|
||||
fun interface MediaFileActualityChecker {
|
||||
suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean
|
||||
suspend fun TelegramBot.saved(mediaContent: MediaContent) {}
|
||||
|
||||
class Default(
|
||||
private val checkingChatId: ChatId
|
||||
) : MediaFileActualityChecker {
|
||||
override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean {
|
||||
return runCatching {
|
||||
execute(mediaContent.createResend(checkingChatId)).also { sentMessage ->
|
||||
execute(DeleteMessage(sentMessage.chat.id, sentMessage.messageId))
|
||||
}
|
||||
}.isSuccess
|
||||
}
|
||||
}
|
||||
|
||||
class WithDelay(
|
||||
private val underhoodChecker: MediaFileActualityChecker,
|
||||
private val checkingDelay: MilliSeconds = 24 * 60 * 60 * 1000L // one day
|
||||
) : MediaFileActualityChecker {
|
||||
private val fileIdChecksMap = mutableMapOf<FileId, DateTime>()
|
||||
private val checkingDelayTimeSpan = checkingDelay.milliseconds
|
||||
|
||||
override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean {
|
||||
val now = DateTime.now()
|
||||
val lastCheck = fileIdChecksMap[mediaContent.media.fileId]
|
||||
return if (lastCheck == null || now - lastCheck > checkingDelayTimeSpan) {
|
||||
with(underhoodChecker) {
|
||||
isActual(mediaContent)
|
||||
}.also {
|
||||
if (it) {
|
||||
fileIdChecksMap[mediaContent.media.fileId] = now
|
||||
}
|
||||
}
|
||||
} else {
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun TelegramBot.saved(mediaContent: MediaContent) {
|
||||
fileIdChecksMap[mediaContent.media.fileId] = DateTime.now()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package dev.inmo.tgbotapi.libraries.cache.media.common
|
||||
|
||||
import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
|
||||
import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
|
||||
import io.ktor.utils.io.core.Input
|
||||
|
||||
interface MessageContentCache<K> {
|
||||
suspend fun save(content: MessageContent): K
|
||||
suspend fun save(
|
||||
content: MediaContent,
|
||||
filename: String,
|
||||
inputAllocator: suspend () -> Input
|
||||
): K
|
||||
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.types.ChatId
|
||||
import dev.inmo.tgbotapi.types.MessageIdentifier
|
||||
import dev.inmo.tgbotapi.utils.StorageFile
|
||||
import io.ktor.utils.io.core.*
|
||||
|
||||
interface MessagesFilesCache<K> {
|
||||
suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input)
|
||||
suspend fun get(k: K): StorageFile?
|
||||
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, StorageFile>()
|
||||
|
||||
override suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) {
|
||||
map[k] = StorageFile(
|
||||
filename,
|
||||
inputAllocator().readBytes()
|
||||
)
|
||||
}
|
||||
|
||||
override suspend fun get(k: K): StorageFile? {
|
||||
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,63 @@
|
||||
package dev.inmo.tgbotapi.libraries.cache.media.common
|
||||
|
||||
import com.benasher44.uuid.uuid4
|
||||
import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
|
||||
|
||||
interface MessagesSimpleCache<K> {
|
||||
suspend fun add(content: MessageContent): K
|
||||
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>(
|
||||
private val keyGenerator: () -> K
|
||||
) : MessagesSimpleCache<K> {
|
||||
private val map = mutableMapOf<K, MessageContent>()
|
||||
|
||||
override suspend fun add(
|
||||
content: MessageContent
|
||||
): K {
|
||||
val key = keyGenerator()
|
||||
map[key] = content
|
||||
return key
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
companion object {
|
||||
operator fun invoke() = InMemoryMessagesSimpleCache {
|
||||
uuid4().toString()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
package dev.inmo.tgbotapi.libraries.cache.media.common
|
||||
|
||||
import dev.inmo.tgbotapi.utils.*
|
||||
import io.ktor.utils.io.core.Input
|
||||
import io.ktor.utils.io.core.copyTo
|
||||
import io.ktor.utils.io.streams.asInput
|
||||
import io.ktor.utils.io.streams.asOutput
|
||||
import java.io.File
|
||||
|
||||
class InFilesMessagesFilesCache<K>(
|
||||
private val folderFile: File,
|
||||
private val filePrefixBuilder: (K) -> String
|
||||
) : MessagesFilesCache<K> {
|
||||
private val K.storageFile: StorageFile?
|
||||
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 StorageFile(
|
||||
StorageFileInfo(storageFileFilename)
|
||||
) {
|
||||
file.inputStream().asInput()
|
||||
}
|
||||
}
|
||||
|
||||
init {
|
||||
require(!folderFile.isFile) { "Folder of messages files cache can't be file, but was $folderFile" }
|
||||
folderFile.mkdirs()
|
||||
}
|
||||
|
||||
private fun filePrefix(k: K): String = filePrefixBuilder(k)
|
||||
|
||||
private fun fileName(k: K, filename: String): String {
|
||||
return "${filePrefix(k)} $filename"
|
||||
}
|
||||
|
||||
override suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) {
|
||||
val fullFileName = fileName(k, filename)
|
||||
val file = File(folderFile, fullFileName).apply {
|
||||
delete()
|
||||
}
|
||||
inputAllocator().use { input ->
|
||||
file.outputStream().asOutput().use { output ->
|
||||
input.copyTo(output)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun get(k: K): StorageFile? {
|
||||
return k.storageFile
|
||||
}
|
||||
|
||||
override suspend fun remove(k: K) {
|
||||
val prefix = filePrefix(k)
|
||||
folderFile.listFiles() ?.forEach {
|
||||
if (it.name.startsWith(prefix)) {
|
||||
it.delete()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun contains(k: K): Boolean {
|
||||
val prefix = filePrefix(k)
|
||||
return folderFile.list() ?.any { it.startsWith(prefix) } == true
|
||||
}
|
||||
|
||||
companion object {
|
||||
operator fun invoke(folderFile: File) = InFilesMessagesFilesCache<String>(
|
||||
folderFile
|
||||
) { it }
|
||||
}
|
||||
}
|
||||
1
cache/content/common/src/main/AndroidManifest.xml
vendored
Normal file
1
cache/content/common/src/main/AndroidManifest.xml
vendored
Normal file
@@ -0,0 +1 @@
|
||||
<manifest package="dev.inmo.tgbotapi.libraries.cache.content.common"/>
|
||||
19
cache/content/micro_utils/build.gradle
vendored
Normal file
19
cache/content/micro_utils/build.gradle
vendored
Normal file
@@ -0,0 +1,19 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.multiplatform"
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppProjectWithSerializationPresetPath"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
commonMain {
|
||||
dependencies {
|
||||
api "dev.inmo:micro_utils.repos.common:$micro_utils_version"
|
||||
api project(":tgbotapi.libraries.cache.content.common")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
package dev.inmo.tgbotapi.libraries.cache.media.micro_utils
|
||||
|
||||
import com.benasher44.uuid.uuid4
|
||||
import dev.inmo.micro_utils.repos.*
|
||||
import dev.inmo.micro_utils.repos.mappers.withMapper
|
||||
import dev.inmo.tgbotapi.libraries.cache.media.common.MessagesSimpleCache
|
||||
import dev.inmo.tgbotapi.types.ChatId
|
||||
import dev.inmo.tgbotapi.types.MessageIdentifier
|
||||
import dev.inmo.tgbotapi.types.message.content.abstracts.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>,
|
||||
private val keyGenerator: () -> K
|
||||
) : MessagesSimpleCache<K> {
|
||||
override suspend fun add(content: MessageContent): K {
|
||||
val key = keyGenerator()
|
||||
keyValueRepo.set(key, content)
|
||||
|
||||
return key
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
companion object {
|
||||
operator fun invoke(
|
||||
keyValueRepo: KeyValueRepo<String, MessageContent>
|
||||
) = SimpleKeyValueMessageContentCache(keyValueRepo) { uuid4().toString() }
|
||||
}
|
||||
}
|
||||
|
||||
val chatIdToMessageIdentifierSerializer = PairSerializer(
|
||||
ChatId.serializer(),
|
||||
MessageIdentifier.serializer()
|
||||
)
|
||||
|
||||
val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class)
|
||||
|
||||
inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
||||
serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } }
|
||||
): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
|
||||
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
||||
return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, String, String>(
|
||||
{ serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) },
|
||||
{ serialFormat.encodeToString(messageContentSerializer, this) },
|
||||
{ serialFormat.decodeFromString(chatIdToMessageIdentifierSerializer, this) },
|
||||
{ serialFormat.decodeFromString(messageContentSerializer, this) },
|
||||
)
|
||||
}
|
||||
|
||||
@JvmName("stringsKeyValueAsHexMessageContentCache")
|
||||
@JsName("stringsKeyValueAsHexMessageContentCache")
|
||||
inline fun KeyValueRepo<String, String>.asMessageContentCache(
|
||||
serialFormatCreator: (SerializersModule) -> BinaryFormat
|
||||
): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
|
||||
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
||||
return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, String, String>(
|
||||
{ serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) },
|
||||
{ serialFormat.encodeToHexString(messageContentSerializer, this) },
|
||||
{ serialFormat.decodeFromHexString(chatIdToMessageIdentifierSerializer, this) },
|
||||
{ serialFormat.decodeFromHexString(messageContentSerializer, this) },
|
||||
)
|
||||
}
|
||||
|
||||
@JvmName("bytesKeyValueAsMessageContentCache")
|
||||
@JsName("bytesKeyValueAsMessageContentCache")
|
||||
inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache(
|
||||
serialFormatCreator: (SerializersModule) -> BinaryFormat
|
||||
): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
|
||||
val serialFormat = serialFormatCreator(MessageContent.serializationModule())
|
||||
return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, ByteArray, ByteArray>(
|
||||
{ serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) },
|
||||
{ serialFormat.encodeToByteArray(messageContentSerializer, this) },
|
||||
{ serialFormat.decodeFromByteArray(chatIdToMessageIdentifierSerializer, this) },
|
||||
{ serialFormat.decodeFromByteArray(messageContentSerializer, this) },
|
||||
)
|
||||
}
|
||||
1
cache/content/micro_utils/src/main/AndroidManifest.xml
vendored
Normal file
1
cache/content/micro_utils/src/main/AndroidManifest.xml
vendored
Normal file
@@ -0,0 +1 @@
|
||||
<manifest package="dev.inmo.tgbotapi.libraries.cache.content.micro_utils"/>
|
||||
1
cache/media/src/main/AndroidManifest.xml
vendored
1
cache/media/src/main/AndroidManifest.xml
vendored
@@ -1 +0,0 @@
|
||||
<manifest package="dev.inmo.tgbotapi.libraries.cache.media"/>
|
||||
@@ -6,32 +6,32 @@ kotlin.incremental.js=true
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
|
||||
kotlin_version=1.5.31
|
||||
kotlin_serialisation_core_version=1.3.1
|
||||
kotlin_version=1.6.10
|
||||
kotlin_serialisation_core_version=1.3.2
|
||||
|
||||
github_release_plugin_version=2.2.12
|
||||
|
||||
tgbotapi_version=0.37.0
|
||||
micro_utils_version=0.8.2
|
||||
exposed_version=0.36.1
|
||||
plagubot_version=0.4.1
|
||||
tgbotapi_version=0.38.12
|
||||
micro_utils_version=0.9.20
|
||||
exposed_version=0.37.3
|
||||
plagubot_version=0.5.1
|
||||
|
||||
# ANDROID
|
||||
|
||||
android_minSdkVersion=21
|
||||
android_compileSdkVersion=31
|
||||
android_buildToolsVersion=31.0.0
|
||||
dexcount_version=3.0.0
|
||||
android_compileSdkVersion=32
|
||||
android_buildToolsVersion=32.0.0
|
||||
dexcount_version=3.0.1
|
||||
junit_version=4.12
|
||||
test_ext_junit_version=1.1.2
|
||||
espresso_core=3.3.0
|
||||
|
||||
# Dokka
|
||||
|
||||
dokka_version=1.5.31
|
||||
dokka_version=1.6.10
|
||||
|
||||
# Project data
|
||||
|
||||
group=dev.inmo
|
||||
version=0.0.14
|
||||
android_code_version=13
|
||||
version=0.0.17
|
||||
android_code_version=17
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
apply plugin: 'maven-publish'
|
||||
apply plugin: 'signing'
|
||||
|
||||
task javadocsJar(type: Jar) {
|
||||
classifier = 'javadoc'
|
||||
@@ -62,8 +61,19 @@ publishing {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
signing {
|
||||
useGpgCmd()
|
||||
sign publishing.publications
|
||||
|
||||
if (project.hasProperty("signing.gnupg.keyName")) {
|
||||
apply plugin: 'signing'
|
||||
|
||||
signing {
|
||||
useGpgCmd()
|
||||
|
||||
sign publishing.publications
|
||||
}
|
||||
|
||||
task signAll {
|
||||
tasks.withType(Sign).forEach {
|
||||
dependsOn(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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":"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":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}
|
||||
@@ -4,13 +4,15 @@ String[] includes = [
|
||||
":cache:admins:common",
|
||||
":cache:admins:micro_utils",
|
||||
":cache:admins:plagubot",
|
||||
":cache:media"
|
||||
|
||||
":cache:content:common",
|
||||
":cache:content:micro_utils",
|
||||
]
|
||||
|
||||
|
||||
includes.each { originalName ->
|
||||
String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replaceAll(":", File.separator)}"
|
||||
String projectName = "${rootProject.name}${originalName.replaceAll(":", ".")}"
|
||||
String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replace(":", File.separator)}"
|
||||
String projectName = "${rootProject.name}${originalName.replace(":", ".")}"
|
||||
String projectIdentifier = ":${projectName}"
|
||||
include projectIdentifier
|
||||
ProjectDescriptor project = project(projectIdentifier)
|
||||
|
||||
Reference in New Issue
Block a user