Skip to content

Commit 56e072a

Browse files
InsanusMokrassarInsanusMokrassar
authored
Merge pull request #332 from InsanusMokrassar/25.0.0
25.0.0
2 parents f87a9c5 + 73f05bb commit 56e072a

13 files changed

Lines changed: 650 additions & 131 deletions

File tree

‎BusinessConnectionsBot/src/main/kotlin/BusinessConnectionsBot.kt‎

Lines changed: 375 additions & 2 deletions
Large diffs are not rendered by default.

‎CustomBot/src/main/kotlin/CustomBot.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import dev.inmo.kslog.common.defaultMessageFormatter
44
import dev.inmo.kslog.common.setDefaultKSLog
55
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
66
import dev.inmo.tgbotapi.extensions.api.bot.getMe
7+
import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
78
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextData
89
import dev.inmo.tgbotapi.extensions.behaviour_builder.buildSubcontextInitialAction
910
import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
@@ -65,6 +66,7 @@ suspend fun main(vararg args: String) {
6566
onCommand("start") {
6667
println(data.update)
6768
println(data.commonMessage)
69+
println(getChat(it.chat))
6870
}
6971

7072
onCommand(

‎InlineQueriesBot/build.gradle‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,26 @@ plugins {
1212
id "org.jetbrains.kotlin.multiplatform"
1313
}
1414

15-
apply plugin: 'application'
16-
17-
mainClassName="InlineQueriesBotKt"
18-
1915
apply from: "$nativePartTemplate"
2016

2117
kotlin {
22-
jvm()
18+
jvm {
19+
binaries {
20+
executable {
21+
mainClass.set("InlineQueriesBotKt")
22+
}
23+
}
24+
}
2325

2426
sourceSets {
2527
commonMain {
2628
dependencies {
2729
implementation kotlin('stdlib')
2830

2931
api "dev.inmo:tgbotapi:$telegram_bot_api_version"
32+
api "io.ktor:ktor-client-logging:$ktor_version"
3033
}
3134
}
3235
}
3336
}
3437

35-
dependencies {
36-
implementation 'io.ktor:ktor-client-logging-jvm:3.1.0'
37-
}
38-

‎InlineQueriesBot/src/commonMain/kotlin/Bot.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
1+
import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
22
import dev.inmo.tgbotapi.extensions.api.answers.answer
33
import dev.inmo.tgbotapi.extensions.api.bot.getMe
44
import dev.inmo.tgbotapi.extensions.api.send.reply
@@ -59,7 +59,7 @@ suspend fun doInlineQueriesBot(token: String) {
5959
reply(message, deepLink)
6060
}
6161

62-
allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
62+
allUpdatesFlow.subscribeLoggingDropExceptions(scope = this) {
6363
println(it)
6464
}
6565

‎KeyboardsBot/KeyboardsBotLib/src/commonMain/kotlin/KeyboardsBot.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
1+
import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
22
import dev.inmo.tgbotapi.bot.ktor.telegramBot
33
import dev.inmo.tgbotapi.extensions.api.answers.answer
44
import dev.inmo.tgbotapi.extensions.api.bot.getMe
@@ -89,7 +89,7 @@ suspend fun activateKeyboardsBot(
8989
onCommandWithArgs("inline") { message, args ->
9090
val numberArgs = args.mapNotNull { it.toIntOrNull() }
9191
val numberOfPages = numberArgs.getOrNull(1) ?: numberArgs.firstOrNull() ?: 10
92-
val page = numberArgs.firstOrNull() ?.takeIf { numberArgs.size > 1 } ?.coerceAtLeast(1) ?: 1
92+
val page = numberArgs.firstOrNull()?.takeIf { numberArgs.size > 1 }?.coerceAtLeast(1) ?: 1
9393
reply(
9494
message,
9595
replyMarkup = inlineKeyboard {
@@ -138,7 +138,8 @@ suspend fun activateKeyboardsBot(
138138

139139
onBaseInlineQuery {
140140
val page = it.query.takeWhile { it.isDigit() }.toIntOrNull() ?: return@onBaseInlineQuery
141-
val count = it.query.removePrefix(page.toString()).dropWhile { !it.isDigit() }.takeWhile { it.isDigit() }.toIntOrNull() ?: return@onBaseInlineQuery
141+
val count = it.query.removePrefix(page.toString()).dropWhile { !it.isDigit() }.takeWhile { it.isDigit() }
142+
.toIntOrNull() ?: return@onBaseInlineQuery
142143

143144
answer(
144145
it,
@@ -170,7 +171,7 @@ suspend fun activateKeyboardsBot(
170171

171172
setMyCommands(BotCommand("inline", "Creates message with pagination inline keyboard"))
172173

173-
allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
174+
allUpdatesFlow.subscribeLoggingDropExceptions(scope = this) {
174175
println(it)
175176
}
176177
}.join()

‎RandomFileSenderBot/build.gradle‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ plugins {
1212
id "org.jetbrains.kotlin.multiplatform"
1313
}
1414

15-
apply plugin: 'application'
16-
17-
mainClassName="RandomFileSenderBotKt"
18-
1915
kotlin {
20-
jvm()
16+
jvm {
17+
binaries {
18+
executable {
19+
mainClass.set("RandomFileSenderBotKt")
20+
}
21+
}
22+
}
2123

2224
sourceSets {
2325
commonMain {

‎ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
1+
import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
22
import dev.inmo.tgbotapi.extensions.api.bot.getMe
33
import dev.inmo.tgbotapi.extensions.api.send.withTypingAction
44
import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
@@ -31,15 +31,15 @@ suspend fun activateResenderBot(
3131
it.content.createResend(
3232
chat.id,
3333
messageThreadId = it.threadIdOrNull,
34-
replyParameters = it.replyInfo ?.messageMeta ?.let { meta ->
35-
val quote = it.withContentOrNull<TextContent>() ?.content ?.quote
34+
replyParameters = it.replyInfo?.messageMeta?.let { meta ->
35+
val quote = it.withContentOrNull<TextContent>()?.content?.quote
3636
ReplyParameters(
3737
meta,
38-
entities = quote ?.textSources ?: emptyList(),
39-
quotePosition = quote ?.position
38+
entities = quote?.textSources ?: emptyList(),
39+
quotePosition = quote?.position
4040
)
4141
},
42-
effectId = it.possiblyWithEffectMessageOrNull() ?.effectId
42+
effectId = it.possiblyWithEffectMessageOrNull()?.effectId
4343
)
4444
) {
4545
it.forEach(print)
@@ -49,7 +49,7 @@ suspend fun activateResenderBot(
4949
println("Answer info: $answer")
5050
}
5151

52-
allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
52+
allUpdatesFlow.subscribeLoggingDropExceptions(scope = this) {
5353
println(it)
5454
}
5555
print(bot.getMe())

‎StickerInfoBot/StickerInfoBotLib/src/commonMain/kotlin/StickerInfoBot.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import dev.inmo.micro_utils.coroutines.defaultSafelyWithoutExceptionHandler
2-
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
2+
import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
33
import dev.inmo.tgbotapi.bot.ktor.telegramBot
44
import dev.inmo.tgbotapi.extensions.api.bot.getMe
55
import dev.inmo.tgbotapi.extensions.api.get.getCustomEmojiStickerOrNull
@@ -55,7 +55,7 @@ suspend fun activateStickerInfoBot(
5555
withTypingAction(it.chat) {
5656
it.content.textSources.mapNotNull {
5757
if (it is CustomEmojiTextSource) {
58-
getCustomEmojiStickerOrNull(it.customEmojiId) ?.stickerSetName
58+
getCustomEmojiStickerOrNull(it.customEmojiId)?.stickerSetName
5959
} else {
6060
null
6161
}
@@ -76,7 +76,7 @@ suspend fun activateStickerInfoBot(
7676
)
7777
}
7878

79-
allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
79+
allUpdatesFlow.subscribeLoggingDropExceptions(scope = this) {
8080
println(it)
8181
}
8282
}.join()

‎WebApp/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ plugins {
1616
id "org.jetbrains.compose" version "$compose_version"
1717
}
1818

19-
apply plugin: 'application'
20-
2119
kotlin {
22-
jvm()
20+
jvm {
21+
binaries {
22+
executable {
23+
mainClass.set("WebAppServerKt")
24+
}
25+
}
26+
}
2327
js(IR) {
2428
browser()
2529
binaries.executable()
@@ -53,10 +57,6 @@ kotlin {
5357
}
5458
}
5559

56-
application {
57-
mainClassName = "WebAppServerKt"
58-
}
59-
6060
tasks.getByName("compileKotlinJvm")
6161
.dependsOn(jsBrowserDistribution)
6262
tasks.getByName("compileKotlinJvm").configure {

0 commit comments

Comments
 (0)