From 9af72d5d0f4f7f94446c60c4cc1d3bb475329a6a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 7 Sep 2024 22:42:13 +0600 Subject: [PATCH] fix build --- gradle/libs.versions.toml | 14 +++++++------- .../jvmMain/kotlin/exposed/ExposedPostsRepo.kt | 16 ++++++++-------- .../repos/ExposedPollsToMessagesInfoRepo.kt | 2 +- .../kotlin/repos/ExposedPollsToPostsIdsRepo.kt | 2 +- .../jvmMain/kotlin/exposed/ExposedRatingsRepo.kt | 2 +- .../src/jvmMain/kotlin/repo/ExposedTimersRepo.kt | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9d215e8..3df21b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -kotlin = "2.0.10" -kotlin-serialization = "1.7.1" +kotlin = "2.0.20" +kotlin-serialization = "1.7.2" -plagubot = "9.0.0" -tgbotapi = "16.0.0" -microutils = "0.22.0" -kslog = "1.3.5" +plagubot = "9.2.0" +tgbotapi = "18.1.0" +microutils = "0.22.2" +kslog = "1.3.6" krontab = "2.4.0" -plagubot-plugins = "0.20.0" +plagubot-plugins = "0.21.0" dokka = "1.9.20" diff --git a/posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt b/posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt index 881e745..a448f9e 100644 --- a/posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt +++ b/posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt @@ -48,7 +48,7 @@ class ExposedPostsRepo( id, DateTime(get(createdColumn)), with(contentRepo) { - select { postIdColumn.eq(id.string) }.map { + selectAll().where { postIdColumn.eq(id.string) }.map { it.asObject } } @@ -69,14 +69,14 @@ class ExposedPostsRepo( id, DateTime(get(createdColumn)), with(contentRepo) { - select { postIdColumn.eq(id.string) }.map { + selectAll().where { postIdColumn.eq(id.string) }.map { it.asObject } } ) } - override fun createAndInsertId(value: NewPost, it: InsertStatement): PostId { + override fun createAndInsertId(value: NewPost, it: UpdateBuilder): PostId { val id = PostId(uuid4().toString()) it[idColumn] = id.string return id @@ -104,7 +104,7 @@ class ExposedPostsRepo( } } - override fun insert(value: NewPost, it: InsertStatement) { + override fun insert(value: NewPost, it: UpdateBuilder) { super.insert(value, it) it[createdColumn] = DateTime.now().unixMillis } @@ -144,7 +144,7 @@ class ExposedPostsRepo( existsIds } else { existsIds.filter { - select { selectById(it) }.limit(1).none() + selectAll().where { selectById(it) }.limit(1).none() } } }.forEach { @@ -156,7 +156,7 @@ class ExposedPostsRepo( override suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageId): PostId? { return transaction(database) { with(contentRepo) { - select { + selectAll().where { chatIdColumn.eq(chatId.chatId.long) .and(chatId.threadId ?.let { threadIdColumn.eq(it.long) } ?: threadIdColumn.isNull()) .and(messageIdColumn.eq(messageId.long)) @@ -166,12 +166,12 @@ class ExposedPostsRepo( } override suspend fun getPostCreationTime(postId: PostId): DateTime? = transaction(database) { - select { selectById(postId) }.limit(1).firstOrNull() ?.get(createdColumn) ?.let(::DateTime) + selectAll().where { selectById(postId) }.limit(1).firstOrNull() ?.get(createdColumn) ?.let(::DateTime) } override suspend fun getFirstMessageInfo(postId: PostId): PostContentInfo? = transaction(database) { with(contentRepo) { - select { postIdColumn.eq(postId.string) }.limit(1).firstOrNull() ?.asObject + selectAll().where { postIdColumn.eq(postId.string) }.limit(1).firstOrNull() ?.asObject } } } diff --git a/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt b/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt index 7bd2667..d7d151a 100644 --- a/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt +++ b/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt @@ -44,7 +44,7 @@ class ExposedPollsToMessagesInfoRepo( it[messageIdColumn] = v.messageId.long } - override fun insertKey(k: PollId, v: ShortMessageInfo, it: InsertStatement) { + override fun insertKey(k: PollId, v: ShortMessageInfo, it: UpdateBuilder) { it[keyColumn] = k.string } } diff --git a/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt b/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt index e8b5b0a..2804677 100644 --- a/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt +++ b/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt @@ -27,7 +27,7 @@ class ExposedPollsToPostsIdsRepo( it[postIdColumn] = v.string } - override fun insertKey(k: PollId, v: PostId, it: InsertStatement) { + override fun insertKey(k: PollId, v: PostId, it: UpdateBuilder) { it[keyColumn] = k.string } } diff --git a/ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt b/ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt index 8a6dd5d..db39cae 100644 --- a/ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt +++ b/ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt @@ -33,7 +33,7 @@ class ExposedRatingsRepo ( it[ratingsColumn] = v.double } - override fun insertKey(k: PostId, v: Rating, it: InsertStatement) { + override fun insertKey(k: PostId, v: Rating, it: UpdateBuilder) { it[keyColumn] = k.string } diff --git a/triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt b/triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt index e8baf87..9f63e1a 100644 --- a/triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt +++ b/triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt @@ -50,7 +50,7 @@ class ExposedTimersRepo( it[dateTimeColumn] = v.unixMillisLong } - override fun insertKey(k: PostId, v: DateTime, it: InsertStatement) { + override fun insertKey(k: PostId, v: DateTime, it: UpdateBuilder) { it[keyColumn] = k.string }