Compare commits

...

15 Commits

7 changed files with 21 additions and 21 deletions

1
.gitignore vendored
View File

@@ -1,4 +1,5 @@
.idea .idea
.kotlin
out/* out/*
*.iml *.iml
target target

View File

@@ -4,6 +4,7 @@ import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedKeyValuesRepo 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.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.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepoImpl 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
@@ -44,7 +45,7 @@ class AdminsPlugin : Plugin {
return flow.filterNotNull().first() return flow.filterNotNull().first()
} }
override fun Module.setupDI(database: Database, params: JsonObject) { override fun Module.setupDI(config: JsonObject) {
single { this@AdminsPlugin } single { this@AdminsPlugin }
val scopeQualifier = named("admins plugin scope") val scopeQualifier = named("admins plugin scope")
single(scopeQualifier) { CoroutineScope(Dispatchers.IO + SupervisorJob()) } single(scopeQualifier) { CoroutineScope(Dispatchers.IO + SupervisorJob()) }

View File

@@ -3,8 +3,7 @@ package dev.inmo.tgbotapi.libraries.cache.media.common
import dev.inmo.tgbotapi.requests.abstracts.MultipartFile import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
import io.ktor.utils.io.core.Input import io.ktor.utils.io.core.Input
import io.ktor.utils.io.core.copyTo import io.ktor.utils.io.core.copyTo
import io.ktor.utils.io.streams.asInput import io.ktor.utils.io.streams.*
import io.ktor.utils.io.streams.asOutput
import java.io.File import java.io.File
class InFilesMessagesFilesCache<K>( class InFilesMessagesFilesCache<K>(
@@ -39,8 +38,8 @@ class InFilesMessagesFilesCache<K>(
val file = File(folderFile, fullFileName).apply { val file = File(folderFile, fullFileName).apply {
delete() delete()
} }
inputAllocator().use { input -> inputAllocator().inputStream().use { input ->
file.outputStream().asOutput().use { output -> file.outputStream().use { output ->
input.copyTo(output) input.copyTo(output)
} }
} }

View File

@@ -6,15 +6,15 @@ kotlin.incremental=true
kotlin.incremental.js=true kotlin.incremental.js=true
kotlin_version=1.9.23 kotlin_version=2.0.21
kotlin_serialisation_core_version=1.6.3 kotlin_serialisation_core_version=1.7.3
github_release_plugin_version=2.5.2 github_release_plugin_version=2.5.2
tgbotapi_version=15.2.0 tgbotapi_version=20.0.1
micro_utils_version=0.21.4 micro_utils_version=0.23.0
exposed_version=0.50.1 exposed_version=0.55.0
plagubot_version=8.5.1 plagubot_version=10.1.1
# Dokka # Dokka
@@ -23,4 +23,4 @@ dokka_version=1.9.20
# Project data # Project data
group=dev.inmo group=dev.inmo
version=0.21.1 version=0.26.1

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@@ -37,7 +37,6 @@ kotlin {
jsTest { jsTest {
dependencies { dependencies {
implementation kotlin('test-js') implementation kotlin('test-js')
implementation kotlin('test-junit')
} }
} }
} }

View File

@@ -49,9 +49,9 @@ class MessagesResender(
targetChatId, targetChatId,
bot.execute( bot.execute(
CopyMessage( CopyMessage(
targetChatId, toChatId = targetChatId,
fromChatId = messageInfo.chatId, fromChatId = messageInfo.chatId,
messageId = messageInfo.messageId messageId = messageInfo.messageId,
) )
) )
) )
@@ -69,7 +69,7 @@ class MessagesResender(
targetChatId, targetChatId,
bot.execute( bot.execute(
CopyMessage( CopyMessage(
targetChatId, toChatId = targetChatId,
fromChatId = it.chat.id, fromChatId = it.chat.id,
messageId = it.messageId messageId = it.messageId
) )
@@ -102,7 +102,7 @@ class MessagesResender(
targetChatId, targetChatId,
bot.execute( bot.execute(
CopyMessage( CopyMessage(
targetChatId, toChatId = targetChatId,
fromChatId = forwardedMessage.chat.id, fromChatId = forwardedMessage.chat.id,
messageId = forwardedMessage.messageId messageId = forwardedMessage.messageId
) )
@@ -118,9 +118,9 @@ class MessagesResender(
targetChatId, targetChatId,
bot.execute( bot.execute(
CopyMessage( CopyMessage(
targetChatId, toChatId = targetChatId,
it.chat.id, fromChatId = it.chat.id,
it.messageId messageId = it.messageId
) )
) )
) )