Merge pull request #202 from InsanusMokrassar/7.0.2

7.0.2

.github/workflows/build.yml

@@ -8,6 +8,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          sudo apt install -y libcurl4-openssl-dev
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:

README.md

@@ -4,6 +4,8 @@ This repository contains several examples of simple bots which are using Telegra
 
 ## How to use this repository
 
+***TO RUN NATIVE TARGETS ON LINUX YOU SHOULD INSTALL CURL LIBRARY. FOR EXAMPLE: `sudo apt install libcurl4-gnutls-dev`***
+
 This repository contains several important things:
 
 * Example subprojects

RandomFileSenderBot/build.gradle

@@ -8,14 +8,45 @@ buildscript {
     }
 }
 
-apply plugin: 'kotlin'
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+}
+
 apply plugin: 'application'
 
 mainClassName="RandomFileSenderBotKt"
 
 
-dependencies {
+kotlin {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    def hostOs = System.getProperty("os.name")
+    def isMingwX64 = hostOs.startsWith("Windows")
+    def nativeTarget
+    if (hostOs == "Linux") nativeTarget = linuxX64("native") { binaries { executable() } }
+    else if (isMingwX64) nativeTarget = mingwX64("native") { binaries { executable() } }
+    else throw new GradleException("Host OS is not supported in Kotlin/Native.")
 
-    implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
+    jvm()
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+
+                api "dev.inmo:tgbotapi:$telegram_bot_api_version"
+            }
+        }
+
+        nativeMain {
+            dependencies {
+                def engine
+
+                if (hostOs == "Linux") engine = "curl"
+                else if (isMingwX64) engine = "winhttp"
+                else throw new GradleException("Host OS is not supported in Kotlin/Native.")
+
+                api "io.ktor:ktor-client-$engine:$ktor_version"
+            }
+        }
+    }
 }
+

RandomFileSenderBot/src/commonMain/kotlin/Bot.kt

@@ -1,23 +1,25 @@
+import dev.inmo.micro_utils.common.MPPFile
 import dev.inmo.micro_utils.common.filesize
-import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
-import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.api.send.media.sendDocument
 import dev.inmo.tgbotapi.extensions.api.send.media.sendDocumentsGroup
+import dev.inmo.tgbotapi.extensions.api.send.reply
+import dev.inmo.tgbotapi.extensions.api.send.withUploadDocumentAction
+import dev.inmo.tgbotapi.extensions.api.telegramBot
 import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviourWithLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommandWithArgs
 import dev.inmo.tgbotapi.requests.abstracts.asMultipartFile
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.files.DocumentFile
 import dev.inmo.tgbotapi.types.media.TelegramMediaDocument
 import dev.inmo.tgbotapi.types.mediaCountInMediaGroup
-import java.io.File
 
 private const val command = "send_file"
 
+expect fun pickFile(currentRoot: MPPFile): MPPFile?
+
 /**
  * This bot will send files inside of working directory OR from directory in the second argument.
  * You may send /send_file command to this bot to get random file from the directory OR
@@ -25,19 +27,10 @@ private const val command = "send_file"
  * /send_file and `/send_file 1` will have the same effect - bot will send one random file.
  * But if you will send `/send_file 5` it will choose 5 random files and send them as group
  */
-suspend fun main(args: Array<String>) {
+suspend fun doRandomFileSenderBot(token: String, folder: MPPFile) {
-    val botToken = args.first()
+    val bot = telegramBot(token)
-    val directoryOrFile = args.getOrNull(1) ?.let { File(it) } ?: File("")
 
-    fun pickFile(currentRoot: File = directoryOrFile): File? {
+    suspend fun TelegramBot.sendFiles(chat: Chat, files: List<MPPFile>) {
-        if (currentRoot.isFile) {
-            return currentRoot
-        } else {
-            return pickFile(currentRoot.listFiles() ?.takeIf { it.isNotEmpty() } ?.random() ?: return null)
-        }
-    }
-
-    suspend fun TelegramBot.sendFiles(chat: Chat, files: List<File>) {
         when (files.size) {
             1 -> sendDocument(
                 chat.id,
@@ -52,8 +45,6 @@ suspend fun main(args: Array<String>) {
         }
     }
 
-    val bot = telegramBot(botToken)
-
     bot.buildBehaviourWithLongPolling (defaultExceptionsHandler = { it.printStackTrace() }) {
         onCommandWithArgs(command) { message, args ->
 
@@ -62,10 +53,10 @@ suspend fun main(args: Array<String>) {
                 var sent = false
 
                 var left = count
-                val chosen = mutableListOf<File>()
+                val chosen = mutableListOf<MPPFile>()
 
                 while (left > 0) {
-                    val picked = pickFile() ?.takeIf { it.filesize > 0 } ?: continue
+                    val picked = pickFile(folder) ?.takeIf { it.filesize > 0 } ?: continue
                     chosen.add(picked)
                     left--
                     if (chosen.size >= mediaCountInMediaGroup.last) {

RandomFileSenderBot/src/jvmMain/kotlin/ActualPickFile.kt

@@ -0,0 +1,10 @@
+import dev.inmo.micro_utils.common.MPPFile
+import java.io.File
+
+actual fun pickFile(currentRoot: MPPFile): File? {
+    if (currentRoot.isFile) {
+        return currentRoot
+    } else {
+        return pickFile(currentRoot.listFiles() ?.takeIf { it.isNotEmpty() } ?.random() ?: return null)
+    }
+}

RandomFileSenderBot/src/jvmMain/kotlin/RandomFileSenderBot.kt

@@ -0,0 +1,5 @@
+import dev.inmo.micro_utils.common.MPPFile
+
+suspend fun main(args: Array<String>) {
+    doRandomFileSenderBot(args.first(), MPPFile(args.getOrNull(1) ?: ""))
+}

RandomFileSenderBot/src/nativeMain/kotlin/ActualPickFile.kt

@@ -0,0 +1,10 @@
+import dev.inmo.micro_utils.common.MPPFile
+import okio.FileSystem
+
+actual fun pickFile(currentRoot: MPPFile): MPPFile? {
+    if (FileSystem.SYSTEM.exists(currentRoot) && FileSystem.SYSTEM.listOrNull(currentRoot) == null) {
+        return currentRoot
+    } else {
+        return pickFile(FileSystem.SYSTEM.list(currentRoot).takeIf { it.isNotEmpty() } ?.random() ?: return null)
+    }
+}

RandomFileSenderBot/src/nativeMain/kotlin/RandomFileSenderBot.kt

@@ -0,0 +1,8 @@
+import kotlinx.coroutines.runBlocking
+import okio.Path.Companion.toPath
+
+fun main(args: Array<String>) {
+    runBlocking {
+        doRandomFileSenderBot(args.first(), args.getOrNull(1) ?.toPath() ?: "".toPath())
+    }
+}

ResenderBot/ResenderBotLib/build.gradle

@@ -20,6 +20,8 @@ kotlin {
         browser()
         binaries.executable()
     }
+    linuxX64()
+    mingwX64()
 
     sourceSets {
         commonMain {

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

@@ -15,11 +15,7 @@ suspend fun activateResenderBot(
     token: String,
     print: (Any) -> Unit
 ) {
-    val bot = telegramBot(token)
+    telegramBotWithBehaviourAndLongPolling(token, scope = CoroutineScope(currentCoroutineContext() + SupervisorJob())) {
-
-    print(bot.getMe())
-
-    bot.buildBehaviourWithLongPolling(CoroutineScope(currentCoroutineContext() + SupervisorJob())) {
         onContentMessage(
             subcontextUpdatesFilter = MessageFilterByChat,
         ) {
@@ -43,5 +39,6 @@ suspend fun activateResenderBot(
         allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
             println(it)
         }
-    }.join()
+        print(bot.getMe())
+    }.second.join()
 }

ResenderBot/native_launcher/build.gradle

@@ -0,0 +1,46 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+}
+
+
+kotlin {
+    def hostOs = System.getProperty("os.name")
+    def isMingwX64 = hostOs.startsWith("Windows")
+    def nativeTarget
+    if (hostOs == "Linux") nativeTarget = linuxX64("native") { binaries { executable() } }
+    else if (isMingwX64) nativeTarget = mingwX64("native") { binaries { executable() } }
+    else throw new GradleException("Host OS is not supported in Kotlin/Native.")
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+
+                api project(":ResenderBot:ResenderBotLib")
+            }
+        }
+
+        nativeMain {
+            dependencies {
+                def engine
+
+                if (hostOs == "Linux") engine = "curl"
+                else if (isMingwX64) engine = "winhttp"
+                else throw new GradleException("Host OS is not supported in Kotlin/Native.")
+
+                api "io.ktor:ktor-client-$engine:$ktor_version"
+            }
+        }
+    }
+}
+

ResenderBot/native_launcher/src/nativeMain/kotlin/ResenderBot.kt

@@ -0,0 +1,9 @@
+import kotlinx.coroutines.runBlocking
+
+fun main(vararg args: String) {
+    runBlocking {
+        activateResenderBot(args.first()) {
+            println(it)
+        }
+    }
+}

WebApp/src/jvmMain/kotlin/WebAppServer.kt

@@ -43,14 +43,13 @@ suspend fun main(vararg args: String) {
     val bot = telegramBot(telegramBotAPIUrlsKeeper)
     createKtorServer(
         "0.0.0.0",
-        8080,
+        args.getOrNull(2) ?.toIntOrNull() ?: 8080,
         additionalEngineEnvironmentConfigurator = {
             parentCoroutineContext += Dispatchers.IO
         }
     ) {
         routing {
-            static {
+            staticFiles("", File("WebApp/build/distributions")) {
-                files(File("WebApp/build/distributions"))
                 default("WebApp/build/distributions/index.html")
             }
             post("inline") {

gradle.properties

@@ -1,11 +1,11 @@
 kotlin.code.style=official
 org.gradle.parallel=true
 # Due to parallel compilation project require next amount of memory on full build
-org.gradle.jvmargs=-Xmx1g
+org.gradle.jvmargs=-Xmx2g
 
 
-kotlin_version=1.8.10
+kotlin_version=1.8.20
-telegram_bot_api_version=7.0.1
+telegram_bot_api_version=7.0.2
-micro_utils_version=0.17.5
+micro_utils_version=0.17.8
 serialization_version=1.5.0
-ktor_version=2.2.4
+ktor_version=2.3.0

settings.gradle

@@ -12,6 +12,7 @@ include ":FilesLoaderBot"
 
 include ":ResenderBot:ResenderBotLib"
 include ":ResenderBot:jvm_launcher"
+include ":ResenderBot:native_launcher"
 
 include ":KeyboardsBot:KeyboardsBotLib"
 include ":KeyboardsBot:jvm_launcher"