Merge pull request #4 from madhead/feature/YouTube

Votes for YouTube videos

Author: madhead

.deploy/lambda/bin/JProfByBotStack.ts

@@ -3,16 +3,21 @@ import 'source-map-support/register';
 import * as cdk from '@aws-cdk/core';
 import { JProfByBotStack } from '../lib/JProfByBotStack';
 
-if (process.env.TELEGRAM_BOT_TOKEN == null) {
-  throw new Error('Undefined TELEGRAM_BOT_TOKEN')
+if (process.env.TOKEN_TELEGRAM_BOT == null) {
+  throw new Error('Undefined TOKEN_TELEGRAM_BOT')
+}
+
+if (process.env.TOKEN_YOUTUBE_API == null) {
+  throw new Error('Undefined TOKEN_YOUTUBE_API')
 }
 
 const app = new cdk.App();
 new JProfByBotStack(
   app,
   'JProfByBotStack',
   {
-    telegramToken: process.env.TELEGRAM_BOT_TOKEN,
+    telegramToken: process.env.TOKEN_TELEGRAM_BOT,
+    youtubeToken: process.env.TOKEN_YOUTUBE_API,
     env: {
       region: 'us-east-1'
     }

.deploy/lambda/lib/JProfByBotStack.ts

@@ -15,6 +15,11 @@ export class JProfByBotStack extends cdk.Stack {
       billingMode: dynamodb.BillingMode.PAY_PER_REQUEST,
       removalPolicy: RemovalPolicy.DESTROY,
     });
+    const youtubeChannelsWhitelistTable = new dynamodb.Table(this, 'jprof-by-bot-table-youtube-channels-whitelist', {
+      tableName: 'jprof-by-bot-table-youtube-channels-whitelist',
+      partitionKey: { name: 'id', type: dynamodb.AttributeType.STRING },
+      billingMode: dynamodb.BillingMode.PAY_PER_REQUEST,
+    });
 
     const lambdaWebhook = new lambda.Function(this, 'jprof-by-bot-lambda-webhook', {
       functionName: 'jprof-by-bot-lambda-webhook',
@@ -26,11 +31,14 @@ export class JProfByBotStack extends cdk.Stack {
       environment: {
         'LOG_THRESHOLD': 'DEBUG',
         'TABLE_VOTES': votesTable.tableName,
-        'TELEGRAM_BOT_TOKEN': props.telegramToken,
+        'TABLE_YOUTUBE_CHANNELS_WHITELIST': youtubeChannelsWhitelistTable.tableName,
+        'TOKEN_TELEGRAM_BOT': props.telegramToken,
+        'TOKEN_YOUTUBE_API': props.youtubeToken,
       },
     });
 
     votesTable.grantReadWriteData(lambdaWebhook);
+    youtubeChannelsWhitelistTable.grantReadData(lambdaWebhook);
 
     const api = new apigateway.RestApi(this, 'jprof-by-bot-api', {
       restApiName: 'jprof-by-bot-api',

.deploy/lambda/lib/JProfByBotStackProps.ts

@@ -2,4 +2,5 @@ import * as cdk from '@aws-cdk/core';
 
 export interface JProfByBotStackProps extends cdk.StackProps {
   readonly telegramToken: string;
+  readonly youtubeToken: string;
 }

.github/workflows/default.yml

@@ -55,6 +55,7 @@ jobs:
           job-id: db-test
           read-only: ${{ github.ref != 'refs/heads/master' }}
       - run: votes/dynamodb/src/test/resources/seed.sh
+      - run: youtube/dynamodb/src/test/resources/seed.sh
       - run: ./gradlew clean dbTest
       - uses: actions/upload-artifact@v2
         if: always()

.github/workflows/deploy.yml

@@ -39,7 +39,8 @@ jobs:
       - run: npx cdk deploy --outputs-file=cdk.out/outputs.json --require-approval=never
         working-directory: .deploy/lambda
         env:
-          TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          TOKEN_TELEGRAM_BOT: ${{ secrets.TOKEN_TELEGRAM_BOT }}
+          TOKEN_YOUTUBE_API: ${{ secrets.TOKEN_YOUTUBE_API }}
       - id: URL
         run: echo "::set-output name=URL::$(jq -r '.JProfByBotStack.URL' cdk.out/outputs.json)"
         working-directory: .deploy/lambda

core/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.bundles.tgbotapi)
+    api(libs.tgbotapi.core)
     implementation(libs.log4j.api)
 
     testImplementation(libs.junit.jupiter.api)

gradle/libs.versions.toml

@@ -14,6 +14,8 @@ tgbotapi = "0.33.3"
 
 jsoup = "1.13.1"
 
+google-api-services-youtube = "v3-rev20210410-1.31.0"
+
 log4j = "2.14.1"
 
 junit5 = "5.7.1"
@@ -34,9 +36,12 @@ jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-datab
 
 tgbotapi-core = { group = "dev.inmo", name = "tgbotapi.core", version.ref = "tgbotapi" }
 tgbotapi-extensions-api = { group = "dev.inmo", name = "tgbotapi.extensions.api", version.ref = "tgbotapi" }
+tgbotapi-extensions-utils = { group = "dev.inmo", name = "tgbotapi.extensions.utils", version.ref = "tgbotapi" }
 
 jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" }
 
+google-api-services-youtube = { group = "com.google.apis", name = "google-api-services-youtube", version.ref = "google-api-services-youtube" }
+
 log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
 log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
 log4j-slf4j-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j-impl", version.ref = "log4j" }

jep/build.gradle.kts

@@ -3,9 +3,12 @@ plugins {
 }
 
 dependencies {
-    api(project(":core"))
-    api(project(":votes"))
-    implementation(project(":votes:tgbotapi-extensions"))
+    api(project.projects.core)
+    api(project.projects.votes)
+    api(project.projects.votes.votingProcessor)
+    api(libs.tgbotapi.core)
+    implementation(project.projects.votes.tgbotapiExtensions)
+    implementation(libs.tgbotapi.extensions.api)
     implementation(libs.log4j.api)
     implementation(libs.jsoup)
 

jep/src/main/kotlin/by/jprof/telegram/bot/jep/JEPUpdateProcessor.kt

@@ -4,13 +4,10 @@ import by.jprof.telegram.bot.core.UpdateProcessor
 import by.jprof.telegram.bot.votes.dao.VotesDAO
 import by.jprof.telegram.bot.votes.model.Votes
 import by.jprof.telegram.bot.votes.tgbotapi_extensions.toInlineKeyboardMarkup
+import by.jprof.telegram.bot.votes.voting_processor.VotingProcessor
 import dev.inmo.tgbotapi.CommonAbstracts.justTextSources
 import dev.inmo.tgbotapi.bot.RequestsExecutor
-import dev.inmo.tgbotapi.extensions.api.answers.answerCallbackQuery
-import dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup.editMessageReplyMarkup
 import dev.inmo.tgbotapi.extensions.api.send.reply
-import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery
-import dev.inmo.tgbotapi.types.CallbackQuery.MessageDataCallbackQuery
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextLinkTextSource
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.URLTextSource
 import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2ParseMode
@@ -26,14 +23,21 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 import org.apache.logging.log4j.LogManager
 
+private fun votesConstructor(votesId: String): Votes = Votes(votesId, listOf("\uD83D\uDC4D", "\uD83D\uDC4E"))
+
 class JEPUpdateProcessor(
     private val jepSummary: JEPSummary,
     private val votesDAO: VotesDAO,
     private val bot: RequestsExecutor,
-) : UpdateProcessor {
+) : VotingProcessor(
+    "JEP",
+    votesDAO,
+    ::votesConstructor,
+    bot,
+), UpdateProcessor {
     companion object {
-        val logger = LogManager.getLogger(JEPUpdateProcessor::class.java)!!
-        val linkRegex = "https?://openjdk\\.java\\.net/jeps/(\\d+)/?".toRegex()
+        private val logger = LogManager.getLogger(JEPUpdateProcessor::class.java)!!
+        private val linkRegex = "https?://openjdk\\.java\\.net/jeps/(\\d+)/?".toRegex()
     }
 
     override suspend fun process(update: Update) {
@@ -57,27 +61,6 @@ class JEPUpdateProcessor(
         }
     }
 
-    private suspend fun processCallbackQuery(callbackQuery: CallbackQuery) {
-        logger.debug("Processing callback query: {}", callbackQuery)
-
-        (callbackQuery as? MessageDataCallbackQuery)?.data?.takeIf { it.startsWith("JEP") }?.let { data ->
-            val (votesId, vote) = data.split(":").takeIf { it.size == 2 } ?: return
-            val fromUserId = callbackQuery.user.id.chatId.toString()
-
-            logger.debug("Tracking {}'s '{}' vote for {}", fromUserId, vote, votesId)
-
-            val votes = votesDAO.get(votesId) ?: votesId.toVotes()
-            val updatedVotes = votes.copy(votes = votes.votes + (fromUserId to vote))
-
-            votesDAO.save(updatedVotes)
-            bot.answerCallbackQuery(callbackQuery)
-            bot.editMessageReplyMarkup(
-                message = callbackQuery.message,
-                replyMarkup = updatedVotes.toInlineKeyboardMarkup()
-            )
-        }
-    }
-
     private fun extractJEPs(message: Message): List<String>? =
         (message as? ContentMessage<*>)?.let { contentMessage ->
             (contentMessage.content as? TextContent)?.let { content ->
@@ -107,7 +90,7 @@ class JEPUpdateProcessor(
             "Cast your vote for *JEP $jep* now ⤵️"
         }
         val votesId = jep.toVotesID()
-        val votes = votesDAO.get(votesId) ?: votesId.toVotes()
+        val votes = votesDAO.get(votesId) ?: votesConstructor(votesId)
 
         bot.reply(
             to = message,
@@ -116,8 +99,4 @@ class JEPUpdateProcessor(
             replyMarkup = votes.toInlineKeyboardMarkup()
         )
     }
-
-    private fun String.toVotesID() = "JEP-$this"
-
-    private fun String.toVotes() = Votes(this, listOf("\uD83D\uDC4D", "\uD83D\uDC4E"))
 }

runners/lambda/build.gradle.kts

@@ -8,7 +8,8 @@ dependencies {
     implementation(libs.koin.core)
     implementation(libs.bundles.tgbotapi)
     implementation(libs.bundles.log4j)
-    implementation(project(":core"))
-    implementation(project(":votes:dynamodb"))
-    implementation(project(":jep"))
+    implementation(project.projects.core)
+    implementation(project.projects.votes.dynamodb)
+    implementation(project.projects.jep)
+    implementation(project.projects.youtube.dynamodb)
 }