WIP

JavaBy · Jan 14, 2023 · e12048c · e12048c
1 parent fff9701
commit e12048c
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 25 deletions.
diff --git a/.deploy/lambda/lib/JProfByBotStack.ts b/.deploy/lambda/lib/JProfByBotStack.ts
@@ -113,6 +113,7 @@ export class JProfByBotStack extends cdk.Stack {
             code: lambda.Code.fromAsset('../../pins/unpin/build/libs/jprof_by_bot-pins-unpin-all.jar'),
             handler: 'by.jprof.telegram.bot.pins.unpin.Handler',
             environment: {
+                'JAVA_TOOL_OPTIONS': '-Dsoftware.amazon.awssdk.http.async.service.impl=software.amazon.awssdk.http.nio.netty.NettySdkAsyncHttpService',
                 'LOG_THRESHOLD': 'INFO',
                 'TABLE_PINS': pinsTable.tableName,
                 'TOKEN_TELEGRAM_BOT': props.telegramToken,
@@ -160,10 +161,11 @@ export class JProfByBotStack extends cdk.Stack {
             timeout: lambdaWebhookTimeout,
             maxEventAge: cdk.Duration.minutes(5),
             retryAttempts: 0,
-            memorySize: 512,
+            memorySize: 768,
             code: lambda.Code.fromAsset('../../launchers/lambda/build/libs/jprof_by_bot-launchers-lambda-all.jar'),
             handler: 'by.jprof.telegram.bot.launchers.lambda.JProf',
             environment: {
+                'JAVA_TOOL_OPTIONS': '-Dsoftware.amazon.awssdk.http.async.service.impl=software.amazon.awssdk.http.nio.netty.NettySdkAsyncHttpService',
                 'LOG_THRESHOLD': 'INFO',
                 'TABLE_VOTES': votesTable.tableName,
                 'TABLE_YOUTUBE_CHANNELS_WHITELIST': youtubeChannelsWhitelistTable.tableName,
@@ -195,6 +197,7 @@ export class JProfByBotStack extends cdk.Stack {
             code: lambda.Code.fromAsset('../../english/urban-dictionary-daily/build/libs/jprof_by_bot-english-urban-dictionary-daily-all.jar'),
             handler: 'by.jprof.telegram.bot.english.urban_dictionary_daily.Handler',
             environment: {
+                'JAVA_TOOL_OPTIONS': '-Dsoftware.amazon.awssdk.http.async.service.impl=software.amazon.awssdk.http.nio.netty.NettySdkAsyncHttpService',
                 'LOG_THRESHOLD': 'INFO',
                 'TABLE_URBAN_WORDS_OF_THE_DAY': urbanWordsOfTheDayTable.tableName,
                 'TABLE_LANGUAGE_ROOMS': languageRoomsTable.tableName,

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,6 +29,9 @@ subprojects {
         withType<Jar> {
             // Workaround for https://stackoverflow.com/q/42174572/750510
             archiveBaseName.set(rootProject.name + "-" + this.project.path.removePrefix(":").replace(":", "-"))
+            manifest {
+                attributes["Multi-Release"] = true
+            }
         }
         withType<Test> {
             useJUnitPlatform {
@@ -40,6 +43,9 @@ subprojects {
         }
         withType<ShadowJar> {
             transform(Log4j2PluginsCacheFileTransformer::class.java)
+            manifest {
+                attributes["Multi-Release"] = true
+            }
         }
     }
 }
diff --git a/english/src/main/kotlin/by/jprof/telegram/bot/english/EnglishCommandUpdateProcessor.kt b/english/src/main/kotlin/by/jprof/telegram/bot/english/EnglishCommandUpdateProcessor.kt
@@ -18,9 +18,12 @@ import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
 import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 import dev.inmo.tgbotapi.types.message.MarkdownV2ParseMode
 import dev.inmo.tgbotapi.types.update.abstracts.Update
+import dev.inmo.tgbotapi.utils.PreviewFeature
+import dev.inmo.tgbotapi.utils.RiskFeature
 import io.ktor.utils.io.streams.asInput
 import org.apache.logging.log4j.LogManager
 
+@OptIn(PreviewFeature::class, RiskFeature::class)
 class EnglishCommandUpdateProcessor(
     private val languageRoomDAO: LanguageRoomDAO,
     private val bot: RequestsExecutor,
@@ -30,7 +33,7 @@ class EnglishCommandUpdateProcessor(
     }
 
     override suspend fun process(update: Update) {
-        val update = update.asBaseMessageUpdate() ?: return
+        @Suppress("NAME_SHADOWING") val update = update.asBaseMessageUpdate() ?: return
         val message = update.data.asContentMessage() ?: return
         val content = message.content.asTextContent() ?: return
         val (_, argument) = (content.textSources + null)

diff --git a/english/src/main/kotlin/by/jprof/telegram/bot/english/ExplainerUpdateProcessor.kt b/english/src/main/kotlin/by/jprof/telegram/bot/english/ExplainerUpdateProcessor.kt
@@ -26,6 +26,7 @@ import dev.inmo.tgbotapi.types.message.textsources.link
 import dev.inmo.tgbotapi.types.message.textsources.regular
 import dev.inmo.tgbotapi.types.message.textsources.underline
 import dev.inmo.tgbotapi.types.update.abstracts.Update
+import dev.inmo.tgbotapi.utils.PreviewFeature
 import java.time.Duration
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
@@ -34,6 +35,7 @@ import kotlinx.coroutines.supervisorScope
 import kotlinx.coroutines.time.withTimeoutOrNull
 import org.apache.logging.log4j.LogManager
 
+@OptIn(PreviewFeature::class)
 class ExplainerUpdateProcessor(
     private val languageRoomDAO: LanguageRoomDAO,
     private val urbanDictionaryClient: UrbanDictionaryClient,
@@ -45,7 +47,7 @@ class ExplainerUpdateProcessor(
     }
 
     override suspend fun process(update: Update) {
-        val update = update.asBaseMessageUpdate() ?: return
+        @Suppress("NAME_SHADOWING") val update = update.asBaseMessageUpdate() ?: return
         val roomId = update.data.chat.id
         val message = update.data.asContentMessage() ?: return
         val content = message.content.asTextContent() ?: return
@@ -58,7 +60,7 @@ class ExplainerUpdateProcessor(
 
         val emphasizedWords = extractEmphasizedWords(content)
 
-        logger.debug("Emphasized words: $emphasizedWords")
+        logger.info("Emphasized words: $emphasizedWords")
 
         val explanations = fetchExplanations(emphasizedWords)
 
@@ -134,7 +136,7 @@ class ExplainerUpdateProcessor(
 
     private fun StringBuilder.dictionaryDotDevExplanations(dictionaryDotDevExplanations: Collection<Word>?) {
         dictionaryDotDevExplanations?.let { definitions ->
-            definitions.take(3).forEachIndexed { index, definition ->
+            definitions.take(3).forEachIndexed { _, definition ->
                 val link = definition.sourceUrls?.firstOrNull()
 
                 if (link != null) {

diff --git a/english/src/main/kotlin/by/jprof/telegram/bot/english/MotherfuckingUpdateProcessor.kt b/english/src/main/kotlin/by/jprof/telegram/bot/english/MotherfuckingUpdateProcessor.kt
@@ -13,10 +13,12 @@ import dev.inmo.tgbotapi.extensions.utils.asContentMessage
 import dev.inmo.tgbotapi.extensions.utils.asTextContent
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
 import dev.inmo.tgbotapi.types.update.abstracts.Update
+import dev.inmo.tgbotapi.utils.PreviewFeature
 import io.ktor.utils.io.streams.asInput
 import kotlin.random.Random
 import org.apache.logging.log4j.LogManager
 
+@OptIn(PreviewFeature::class)
 class MotherfuckingUpdateProcessor(
     private val languageRoomDAO: LanguageRoomDAO,
     private val bot: RequestsExecutor,
@@ -26,7 +28,7 @@ class MotherfuckingUpdateProcessor(
     }
 
     override suspend fun process(update: Update) {
-        val update = update.asBaseMessageUpdate() ?: return
+        @Suppress("NAME_SHADOWING") val update = update.asBaseMessageUpdate() ?: return
         val roomId = update.data.chat.id
         val message = update.data.asContentMessage() ?: return
         val content = message.content.asTextContent() ?: return

diff --git a/english/src/main/kotlin/by/jprof/telegram/bot/english/UrbanWordOfTheDayUpdateProcessor.kt b/english/src/main/kotlin/by/jprof/telegram/bot/english/UrbanWordOfTheDayUpdateProcessor.kt
@@ -14,9 +14,11 @@ import dev.inmo.tgbotapi.extensions.utils.asContentMessage
 import dev.inmo.tgbotapi.extensions.utils.asTextContent
 import dev.inmo.tgbotapi.types.message.MarkdownV2
 import dev.inmo.tgbotapi.types.update.abstracts.Update
+import dev.inmo.tgbotapi.utils.PreviewFeature
 import java.time.LocalDate
 import org.apache.logging.log4j.LogManager
 
+@OptIn(PreviewFeature::class)
 class UrbanWordOfTheDayUpdateProcessor(
     private val languageRoomDAO: LanguageRoomDAO,
     private val urbanWordOfTheDayDAO: UrbanWordOfTheDayDAO,
@@ -27,7 +29,7 @@ class UrbanWordOfTheDayUpdateProcessor(
     }
 
     override suspend fun process(update: Update) {
-        val update = update.asBaseMessageUpdate() ?: return
+        @Suppress("NAME_SHADOWING") val update = update.asBaseMessageUpdate() ?: return
         val roomId = update.data.chat.id
         val message = update.data.asContentMessage() ?: return
         val content = message.content.asTextContent() ?: return

diff --git a/english/src/main/kotlin/by/jprof/telegram/bot/english/WhatWordUpdateProcessor.kt b/english/src/main/kotlin/by/jprof/telegram/bot/english/WhatWordUpdateProcessor.kt
@@ -11,9 +11,11 @@ import dev.inmo.tgbotapi.extensions.utils.asContentMessage
 import dev.inmo.tgbotapi.extensions.utils.asTextContent
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
 import dev.inmo.tgbotapi.types.update.abstracts.Update
+import dev.inmo.tgbotapi.utils.PreviewFeature
 import io.ktor.utils.io.streams.asInput
 import org.apache.logging.log4j.LogManager
 
+@OptIn(PreviewFeature::class)
 class WhatWordUpdateProcessor(
     private val languageRoomDAO: LanguageRoomDAO,
     private val bot: RequestsExecutor,
@@ -23,7 +25,7 @@ class WhatWordUpdateProcessor(
     }
 
     override suspend fun process(update: Update) {
-        val update = update.asBaseMessageUpdate() ?: return
+        @Suppress("NAME_SHADOWING") val update = update.asBaseMessageUpdate() ?: return
         val roomId = update.data.chat.id
         val message = update.data.asContentMessage() ?: return
         val content = message.content.asTextContent() ?: return

diff --git a/shop/src/main/kotlin/by/jprof/telegram/bot/shop/SupportSuccessfulPaymentUpdateProcessor.kt b/shop/src/main/kotlin/by/jprof/telegram/bot/shop/SupportSuccessfulPaymentUpdateProcessor.kt
@@ -25,22 +25,15 @@ class SupportSuccessfulPaymentUpdateProcessor(
     }
 
     override suspend fun process(update: Update) {
-        logger.info("1")
         val message = update.asMessageUpdate()?.data?.asPossiblyPaymentMessage() ?: return
-        logger.info("2")
         val user = (message as? FromUser)?.user ?: return
-        logger.info("3")
         val payment = (message.paymentInfo as? SuccessfulPaymentEvent)?.payment ?: return
-        logger.info("4")
         val payload = try {
-            logger.info("5")
             json.decodeFromString<Payload>(payment.invoicePayload) as SupportPayload
         } catch (_: Exception) {
-            logger.info("6")
             return
         }
 
-        logger.info("7")
         bot.reply(message, "Thank you for the donation!")
     }
 }
diff --git a/youtube/src/main/kotlin/by/jprof/telegram/bot/youtube/YouTubeUpdateProcessor.kt b/youtube/src/main/kotlin/by/jprof/telegram/bot/youtube/YouTubeUpdateProcessor.kt
@@ -43,7 +43,7 @@ class YouTubeUpdateProcessor(
     companion object {
         private val logger = LogManager.getLogger(YouTubeUpdateProcessor::class.java)!!
         private val linkRegex =
-            "^.*((youtu.be/)|(v/)|(/u/\\w/)|(embed/)|(watch\\?))\\??v?=?([^#&?]*).*".toRegex()
+            "https?://(?:m.)?(?:www\\.)?youtu(?:\\.be/|(?:be-nocookie|be)\\.com/(?:watch|\\w+\\?(?:feature=\\w+.\\w+&)?v=|v/|e/|embed/|user/(?:[\\w#]+/)+))(?<id>[^&#?\\n]+)".toRegex()
         private const val ACCEPTED_DISPLAY_LEN = 500
     }
 
@@ -55,11 +55,9 @@ class YouTubeUpdateProcessor(
     }
 
     private suspend fun processMessage(message: Message) {
-        logger.debug("Processing message: {}", message)
-
         val youTubeVideos = extractYoutubeVideos(message) ?: return
 
-        logger.debug("YouTube videos: {}", youTubeVideos)
+        logger.info("Detected {} YouTube videos: {}", youTubeVideos.size, youTubeVideos)
 
         supervisorScope {
             youTubeVideos
@@ -76,20 +74,17 @@ class YouTubeUpdateProcessor(
                     .mapNotNull {
                         (it as? URLTextSource)?.source ?: (it as? TextLinkTextSource)?.url
                     }
-                    .mapNotNull {
-                        linkRegex.matchEntire(it)?.destructured
+                    .mapNotNull { url ->
+                        linkRegex.matchEntire(url)?.groups?.get("id")?.value?.takeUnless { it.isBlank() }
                     }
-                    .map { (_, _, _, _, _, _, id) -> id }
             }
         }
 
     private suspend fun replyToYouTubeVideo(video: String, message: Message) {
-        logger.debug("YouTube video ID: {}", video)
-
         val response = withContext(Dispatchers.IO) {
             youTube.videos().list(listOf("snippet", "statistics")).setId(listOf(video)).execute()
         }
-        val videoDetails = response.items.first()
+        val videoDetails = response.items.firstOrNull() ?: return
         val snippet = videoDetails.snippet
         val channelId = snippet.channelId