Shop

.deploy/lambda/lib/JProfByBotStack.ts

@@ -3,6 +3,8 @@ import {Construct} from 'constructs';
 import * as apigateway from 'aws-cdk-lib/aws-apigateway';
 import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
 import * as lambda from 'aws-cdk-lib/aws-lambda';
+import {Architecture} from 'aws-cdk-lib/aws-lambda';
+import * as secrets from 'aws-cdk-lib/aws-secretsmanager';
 import * as sfn from 'aws-cdk-lib/aws-stepfunctions';
 import * as tasks from 'aws-cdk-lib/aws-stepfunctions-tasks';
 import * as ses from 'aws-cdk-lib/aws-ses';
@@ -13,6 +15,14 @@ export class JProfByBotStack extends cdk.Stack {
     constructor(scope: Construct, id: string, props: JProfByBotStackProps) {
         super(scope, id, props);
 
+        const secretPaymentProviderTokens = new secrets.Secret(this, 'jprof-by-bot-secret-payment-provider-tokens', {
+            secretName: 'jprof-by-bot-secret-payment-provider-tokens',
+            secretObjectValue: {
+                1: cdk.SecretValue.unsafePlainText('test'),
+                2: cdk.SecretValue.unsafePlainText('production'),
+            }
+        });
+
         const votesTable = new dynamodb.Table(this, 'jprof-by-bot-table-votes', {
             tableName: 'jprof-by-bot-table-votes',
             partitionKey: {name: 'id', type: dynamodb.AttributeType.STRING},
@@ -103,7 +113,8 @@ 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: {
-                'LOG_THRESHOLD': 'DEBUG',
+                '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,
             },
@@ -123,13 +134,20 @@ export class JProfByBotStack extends cdk.Stack {
         });
 
         const layerLibGL = new lambda.LayerVersion(this, 'jprof-by-bot-lambda-layer-libGL', {
+            layerVersionName: 'libGL',
             code: lambda.Code.fromAsset('layers/libGL.zip'),
-            compatibleRuntimes: [lambda.Runtime.JAVA_11],
+            compatibleArchitectures: [Architecture.X86_64],
         });
         const layerLibfontconfig = new lambda.LayerVersion(this, 'jprof-by-bot-lambda-layer-libfontconfig', {
+            layerVersionName: 'libfontconfig',
             code: lambda.Code.fromAsset('layers/libfontconfig.zip'),
-            compatibleRuntimes: [lambda.Runtime.JAVA_11],
+            compatibleArchitectures: [Architecture.X86_64],
         });
+        const layerParametersAndSecretsLambdaExtension = lambda.LayerVersion.fromLayerVersionArn(
+            this,
+            'jprof-by-bot-lambda-layer-parametersAndSecretsLambdaExtension',
+            'arn:aws:lambda:us-east-1:177933569100:layer:AWS-Parameters-and-Secrets-Lambda-Extension:2'
+        )
 
         const lambdaWebhookTimeout = cdk.Duration.seconds(29);
         const lambdaWebhook = new lambda.Function(this, 'jprof-by-bot-lambda-webhook', {
@@ -138,15 +156,17 @@ export class JProfByBotStack extends cdk.Stack {
             layers: [
                 layerLibGL,
                 layerLibfontconfig,
+                layerParametersAndSecretsLambdaExtension,
             ],
             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: {
-                'LOG_THRESHOLD': 'DEBUG',
+                '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,
                 'TABLE_KOTLIN_MENTIONS': kotlinMentionsTable.tableName,
@@ -177,7 +197,8 @@ 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: {
-                'LOG_THRESHOLD': 'DEBUG',
+                '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,
                 'TOKEN_TELEGRAM_BOT': props.telegramToken,
@@ -198,6 +219,8 @@ export class JProfByBotStack extends cdk.Stack {
             ],
         });
 
+        secretPaymentProviderTokens.grantRead(lambdaWebhook);
+
         votesTable.grantReadWriteData(lambdaWebhook);
 
         youtubeChannelsWhitelistTable.grantReadData(lambdaWebhook);

README.adoc

@@ -12,7 +12,9 @@ Official Telegram bot of Java Professionals BY community.
 * Converts some currencies to EUR and USD
 * Posts scheduled messages from this repo's `posts` branch
 * Expands LeetCode links
+* Tells users' local times
 * Regulates our English Rooms & teaches us new English words
+* Sells pins and custom statuses 🤑
 
 So, it just brings some fun and interactivity in our chat.
 

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
+            }
         }
     }
 }

core/src/main/kotlin/by/jprof/telegram/bot/core/UpdateProcessingPipeline.kt

@@ -23,7 +23,7 @@ class UpdateProcessingPipeline(
                 processors
                     .map {
                         launch(exceptionHandler(it)) {
-                            logger.debug("Processing update with ${it::class.simpleName}")
+                            logger.trace("Processing update with ${it::class.simpleName}")
                             it.process(update)
                         }
                     }

deploy.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+source .env &&
+./gradlew clean shadowJar &&
+pushd .deploy/lambda &&
+npm install &&
+cdk deploy --outputs-file=cdk.out/outputs.json --require-approval=never &&
+popd

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)

english/src/main/kotlin/by/jprof/telegram/bot/english/ExplainerUpdateProcessor.kt

@@ -28,6 +28,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
@@ -36,6 +37,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,
@@ -47,7 +49,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
@@ -60,7 +62,7 @@ class ExplainerUpdateProcessor(
 
         val emphasizedWords = extractEmphasizedWords(content)
 
-        logger.debug("Emphasized words: $emphasizedWords")
+        logger.info("Emphasized words: $emphasizedWords")
 
         val explanations = fetchExplanations(emphasizedWords)
 
@@ -151,7 +153,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) {

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

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

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

gradle/libs.versions.toml

@@ -37,6 +37,7 @@ aws-lambda-java-events = { group = "com.amazonaws", name = "aws-lambda-java-even
 aws-lambda-java-core = { group = "com.amazonaws", name = "aws-lambda-java-core", version.ref = "aws-lambda-java-core" }
 aws-lambda-java-log4j2 = { group = "com.amazonaws", name = "aws-lambda-java-log4j2", version.ref = "aws-lambda-java-log4j2" }
 dynamodb = { group = "software.amazon.awssdk", name = "dynamodb", version.ref = "awssdk" }
+secretsmanager = { group = "software.amazon.awssdk", name = "secretsmanager", version.ref = "awssdk" }
 sfn = { group = "software.amazon.awssdk", name = "sfn", version.ref = "awssdk" }
 
 koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }

kotlin/src/main/kotlin/by/jprof/telegram/bot/kotlin/KotlinMentionsUpdateProcessor.kt

@@ -50,7 +50,7 @@ class KotlinMentionsUpdateProcessor(
             else -> return
         }
 
-        logger.info("Kotlin mentioned!")
+        logger.debug("Kotlin mentioned!")
 
         val now = Instant.now()
         val user = (message as? FromUserMessage)?.user ?: return
@@ -128,6 +128,6 @@ class KotlinMentionsUpdateProcessor(
             replyToMessageId = message.messageId,
         )
 
-        logger.info("Kotlin mention reported!")
+        logger.debug("Kotlin mention reported!")
     }
 }

launchers/lambda/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
 
 dependencies {
     implementation(libs.bundles.aws.lambda)
+    implementation(libs.secretsmanager)
     implementation(libs.koin.core)
     implementation(libs.tgbotapi)
     implementation(libs.bundles.log4j)
@@ -28,4 +29,6 @@ dependencies {
     implementation(project.projects.english.urbanWordOfTheDay.dynamodb)
     implementation(project.projects.english.urbanDictionary)
     implementation(project.projects.english.dictionaryapiDev)
+    implementation(project.projects.shop.provider)
+    implementation(project.projects.shop)
 }

launchers/lambda/src/main/kotlin/by/jprof/telegram/bot/launchers/lambda/JProf.kt

@@ -7,6 +7,7 @@ import by.jprof.telegram.bot.launchers.lambda.config.dictionaryApiDevModule
 import by.jprof.telegram.bot.launchers.lambda.config.envModule
 import by.jprof.telegram.bot.launchers.lambda.config.jsonModule
 import by.jprof.telegram.bot.launchers.lambda.config.pipelineModule
+import by.jprof.telegram.bot.launchers.lambda.config.secretsModule
 import by.jprof.telegram.bot.launchers.lambda.config.sfnModule
 import by.jprof.telegram.bot.launchers.lambda.config.telegramModule
 import by.jprof.telegram.bot.launchers.lambda.config.urbanDictionaryModule
@@ -45,6 +46,7 @@ class JProf : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2HTTPResponse>, K
     init {
         startKoin {
             modules(
+                secretsModule,
                 envModule,
                 databaseModule,
                 jsonModule,
@@ -64,10 +66,11 @@ class JProf : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2HTTPResponse>, K
 
     override fun handleRequest(input: APIGatewayV2HTTPEvent, context: Context): APIGatewayV2HTTPResponse {
         logger.debug("Incoming request: {}", input)
+        logger.info(input.body)
 
         val update = json.decodeFromString(UpdateDeserializationStrategy, input.body ?: return OK)
 
-        logger.debug("Parsed update: {}", update)
+        logger.info("{}", update)
 
         pipeline.process(update)
 

launchers/lambda/src/main/kotlin/by/jprof/telegram/bot/launchers/lambda/config/env.kt

@@ -1,7 +1,13 @@
 package by.jprof.telegram.bot.launchers.lambda.config
 
+import by.jprof.telegram.bot.shop.provider.ChatProviderTokens
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
+import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient
+
+private const val SECRET_PAYMENT_PROVIDER_TOKENS = "jprof-by-bot-secret-payment-provider-tokens"
 
 const val TOKEN_TELEGRAM_BOT = "TOKEN_TELEGRAM_BOT"
 const val TOKEN_YOUTUBE_API = "TOKEN_YOUTUBE_API"
@@ -42,4 +48,14 @@ val envModule = module {
     single(named(TIMEOUT)) {
         System.getenv(TIMEOUT)!!.toLong()
     }
+
+    single<ChatProviderTokens> {
+        val json: Json = get()
+        val secrets: SecretsManagerClient = get()
+        val secret = secrets.getSecretValue {
+            it.secretId(SECRET_PAYMENT_PROVIDER_TOKENS)
+        }
+
+        json.decodeFromString(secret.secretString())
+    }
 }