Format code

.mise.toml

@@ -4,3 +4,7 @@ java = "temurin-17"
 [tasks.release]
 description = 'Build and push docker image'
 run = './gradlew build && ./gradlew jib --image=cr.yandex/crph26nr2d2ds65t2m7b/memes-tv:0.0.1-SNAPSHOT'
+
+[tasks.fmt]
+description = 'Fourmat source code'
+run = './gradlew :spotlessApply'

build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     id("org.springframework.boot") version "3.4.4"
     id("io.spring.dependency-management") version "1.1.7"
     id("com.google.cloud.tools.jib") version "3.4.5"
+    id("com.diffplug.spotless") version "7.0.3"
 }
 
 group = "com.pischule"
@@ -48,3 +49,9 @@ kotlin {
 tasks.withType<Test> {
     useJUnitPlatform()
 }
+
+spotless {
+  kotlin {
+    ktfmt("0.54").kotlinlangStyle()
+  }
+}

src/main/kotlin/com/pischule/memestv/BotProps.kt

@@ -2,8 +2,4 @@ package com.pischule.memestv
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 
-@ConfigurationProperties("bot")
+@ConfigurationProperties("bot") data class BotProps(val token: String, val destinationChatId: Long)
-data class BotProps(
-    val token: String,
-    val destinationChatId: Long,
-)

src/main/kotlin/com/pischule/memestv/BotService.kt

@@ -33,12 +33,12 @@ class BotService(
                 message {
                     try {
                         val chatId = message.chat.id
-                        val replyToPhotos = message.replyToMessage
+                        val replyToPhotos =
-                            ?.photo
+                            message.replyToMessage?.photo?.takeIf { it.isNotEmpty() }
-                            ?.takeIf { it.isNotEmpty() }
+                        if (
-                        if (chatId == botProps.destinationChatId
+                            chatId == botProps.destinationChatId &&
-                            && message.text?.lowercase() == "this"
+                                message.text?.lowercase() == "this" &&
-                            && replyToPhotos != null
+                                replyToPhotos != null
                         ) {
                             val maxResPhoto = replyToPhotos.last().fileId
                             val fileBytes = bot.downloadFileBytes(maxResPhoto)
@@ -47,12 +47,13 @@ class BotService(
                                 fileUploaderService.uploadFile(it)
                                 log.info { "Uploaded a file $maxResPhoto to s3" }
                                 bot.setMessageReaction(
-                                    chatId = ChatId.fromId(message.chat.id),
+                                        chatId = ChatId.fromId(message.chat.id),
-                                    messageId = message.messageId,
+                                        messageId = message.messageId,
-                                    reaction = listOf(ReactionType.Emoji("👍"))
+                                        reaction = listOf(ReactionType.Emoji("👍")),
-                                ).onError { error ->
+                                    )
-                                    log.warn { "Failed to react to message: $error" }
+                                    .onError { error ->
-                                }
+                                        log.warn { "Failed to react to message: $error" }
+                                    }
                             }
                         }
                     } catch (e: Error) {
@@ -64,34 +65,27 @@ class BotService(
 
                     if (message.chat.id != botProps.destinationChatId) {
                         bot.forwardMessage(
-                            chatId = ChatId.fromId(botProps.destinationChatId),
+                                chatId = ChatId.fromId(botProps.destinationChatId),
-                            fromChatId = ChatId.fromId(message.chat.id),
+                                fromChatId = ChatId.fromId(message.chat.id),
-                            messageId = message.messageId,
+                                messageId = message.messageId,
-                        ).fold(
+                            )
-                            {
+                            .fold(
-                                log.info { "Forwarded pictures message: $it" }
+                                { log.info { "Forwarded pictures message: $it" } },
-                            },
+                                { log.error { "Failed to forward message: $it" } },
-                            {
+                            )
-                                log.error { "Failed to forward message: $it" }
-                            }
-                        )
                     }
 
                     bot.setMessageReaction(
-                        chatId = ChatId.fromId(message.chat.id),
+                            chatId = ChatId.fromId(message.chat.id),
-                        messageId = message.messageId,
+                            messageId = message.messageId,
-                        reaction = listOf(ReactionType.Emoji("👀"))
+                            reaction = listOf(ReactionType.Emoji("👀")),
-                    ).onError { error ->
+                        )
-                        log.warn { "Failed to react to message: $error" }
+                        .onError { error -> log.warn { "Failed to react to message: $error" } }
-                    }
-
                 }
             }
         }
 
-        Thread {
+        Thread { bot.startPolling() }.start()
-            bot.startPolling()
-        }.start()
 
         log.info { "Initialized bot" }
     }

src/main/kotlin/com/pischule/memestv/FileUploaderService.kt

@@ -6,16 +6,15 @@ import aws.smithy.kotlin.runtime.content.ByteStream
 import org.springframework.stereotype.Service
 
 @Service
-class FileUploaderService(
+class FileUploaderService(private val s3Client: S3Client, private val s3Props: S3Props) {
-    private val s3Client: S3Client,
-    private val s3Props: S3Props,
-) {
 
     suspend fun uploadFile(fileBytes: ByteArray) {
-        s3Client.putObject(PutObjectRequest{
+        s3Client.putObject(
-            body = ByteStream.fromBytes(fileBytes)
+            PutObjectRequest {
-            bucket = s3Props.bucket
+                body = ByteStream.fromBytes(fileBytes)
-            key = "_.jpeg"
+                bucket = s3Props.bucket
-        })
+                key = "_.jpeg"
+            }
+        )
     }
 }

src/main/kotlin/com/pischule/memestv/MemesTvApplication.kt

@@ -1,11 +1,9 @@
 package com.pischule.memestv
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.runApplication
 
-@SpringBootApplication
+@SpringBootApplication class MemesTvApplication
-class MemesTvApplication
 
 fun main(args: Array<String>) {
     runApplication<MemesTvApplication>(*args)

src/main/kotlin/com/pischule/memestv/S3Props.kt

@@ -3,8 +3,4 @@ package com.pischule.memestv
 import org.springframework.boot.context.properties.ConfigurationProperties
 
 @ConfigurationProperties("s3")
-data class S3Props(
+data class S3Props(val accessKeyId: String, val secretAccessKey: String, val bucket: String)
-    val accessKeyId: String,
-    val secretAccessKey: String,
-    val bucket: String,
-)

src/test/kotlin/com/pischule/memestv/MemesTvApplicationTests.kt

@@ -10,7 +10,5 @@ import org.springframework.test.context.ActiveProfiles
 @SpringBootTest
 class MemesTvApplicationTests {
 
-    @Test
+    @Test fun contextLoads() {}
-    fun contextLoads() {
-    }
 }