Compare commits

...

15 Commits

7 changed files with 21 additions and 21 deletions

1
.gitignore vendored
View File

@@ -1,4 +1,5 @@
.idea
.kotlin
out/*
*.iml
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.mappers.withMapper
import dev.inmo.plagubot.Plugin
import dev.inmo.plagubot.database
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.DynamicAdminsCacheSettingsAPI
@@ -44,7 +45,7 @@ class AdminsPlugin : Plugin {
return flow.filterNotNull().first()
}
override fun Module.setupDI(database: Database, params: JsonObject) {
override fun Module.setupDI(config: JsonObject) {
single { this@AdminsPlugin }
val scopeQualifier = named("admins plugin scope")
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 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 io.ktor.utils.io.streams.*
import java.io.File
class InFilesMessagesFilesCache<K>(
@@ -39,8 +38,8 @@ class InFilesMessagesFilesCache<K>(
val file = File(folderFile, fullFileName).apply {
delete()
}
inputAllocator().use { input ->
file.outputStream().asOutput().use { output ->
inputAllocator().inputStream().use { input ->
file.outputStream().use { output ->
input.copyTo(output)
}
}

View File

@@ -6,15 +6,15 @@ kotlin.incremental=true
kotlin.incremental.js=true
kotlin_version=1.9.23
kotlin_serialisation_core_version=1.6.3
kotlin_version=2.0.21
kotlin_serialisation_core_version=1.7.3
github_release_plugin_version=2.5.2
tgbotapi_version=15.1.0
micro_utils_version=0.21.2
exposed_version=0.50.1
plagubot_version=8.5.0
tgbotapi_version=20.0.0
micro_utils_version=0.23.0
exposed_version=0.55.0
plagubot_version=10.1.0
# Dokka
@@ -23,4 +23,4 @@ dokka_version=1.9.20
# Project data
group=dev.inmo
version=0.21.0
version=0.26.0

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists

View File

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

View File

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