🐛 wicked markdown (#140)

* 🐛 wicked markdown

* ✅ fixing tests

Author: Simon Naumov

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.2.4] - 19.04.2022
+
+### Fixed
+
+- Escaping markdown in messages
+- Chat logging
+
 ## [1.2.3] - 19.04.2022
 
 ### Fixed
@@ -86,7 +93,7 @@
 
 ### Fixed
 
--   Heroku Continious deployment build fixed
+-   Heroku Continuous deployment build fixed
 
 ## [1.0.2] - 16.10.2020
 
@@ -123,6 +130,8 @@
 -   Implicit party pulling
 -   Rude mode
 
+[1.2.4]: https://github.com/pool-party/pull-party-bot/compare/v1.2.3...v1.2.4
+[1.2.3]: https://github.com/pool-party/pull-party-bot/compare/v1.2.2...v1.2.3
 [1.2.2]: https://github.com/pool-party/pull-party-bot/compare/v1.2.1...v1.2.2
 [1.2.1]: https://github.com/pool-party/pull-party-bot/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/pool-party/pull-party-bot/compare/v1.1.0.2...v1.2.0

Procfile

@@ -1 +1 @@
-web: java -jar build/libs/pull-party-bot-1.2.2.jar
+web: java -jar build/libs/pull-party-bot-1.2.4.jar

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "org.pool-party"
-version = "1.2.2"
+version = "1.2.4"
 
 repositories {
     maven("https://jitpack.io")
@@ -75,4 +75,6 @@ tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = "1.8"
     kotlinOptions.freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi"
     kotlinOptions.freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
+    kotlinOptions.freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
+    kotlinOptions.freeCompilerArgs += "-Xcontext-receivers"
 }

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/Callback.kt

@@ -30,7 +30,7 @@ interface Callback {
 class CallbackDispatcher(val callbacks: Map<CallbackAction, Callback>) : Interaction {
 
     override fun onMessage(bot: Bot) = bot.onCallbackQuery {
-        loggingError(bot) {
+        bot.loggingError {
             logger.info { "callback ${it.from.username}@${it.message?.chat?.title}: ${it.data}" }
 
             val callbackData = it.data?.let { Json.decodeFromString<CallbackData>(it) } ?: return@loggingError

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/Command.kt

@@ -55,7 +55,7 @@ abstract class AbstractCommand(
             "${LocalDateTime.now()} $command <- ${message.from?.username}@${message.chat.title}: \"${message.text}\""
         }
 
-        val nanoseconds = loggingError(bot) {
+        val nanoseconds = bot.loggingError {
             measureNanoTime { bot.action(message, args) }
         }
 

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/EveryMessageInteraction.kt

@@ -11,7 +11,7 @@ interface EveryMessageInteraction {
 class EveryMessageProcessor(private val interactions: List<EveryMessageInteraction>) : Interaction {
 
     override fun onMessage(bot: Bot) = bot.onMessage { message ->
-        loggingError(bot) {
+        bot.loggingError {
             interactions.forEach { it.onMessage(bot, message) }
         }
     }

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/Handlers.kt

@@ -23,6 +23,7 @@ import com.github.pool_party.pull_party_bot.commands.handlers.callback.PingCallb
 import com.github.pool_party.pull_party_bot.commands.messages.onError
 import com.github.pool_party.pull_party_bot.database.dao.ChatDaoImpl
 import com.github.pool_party.pull_party_bot.database.dao.PartyDaoImpl
+import mu.KotlinLogging
 
 fun Bot.initHandlers() {
 
@@ -65,10 +66,21 @@ fun Bot.initHandlers() {
     setMyCommands(commands.map { it.toBotCommand() })
 }
 
-suspend fun <T> loggingError(bot: Bot, action: suspend () -> T): T =
+private val logger = KotlinLogging.logger { }
+
+suspend fun <T> Bot.loggingError(action: suspend () -> T): T =
     try {
         action()
-    } catch (e: Throwable) {
-        bot.sendMessageLogging(Configuration.DEVELOP_CHAT_ID, onError(e)).join()
-        throw e
+    } catch (throwable: Throwable) {
+        processThrowable(throwable)
     }
+
+private fun Bot.processThrowable(throwable: Throwable): Nothing {
+    val (prefix, reason) =
+        if (throwable is SendingMessageException) "${throwable.action}: " to throwable.reason else "" to throwable
+
+    logger.error { "$prefix${reason.message}:\n${reason.stackTraceToString()}" }
+    sendMessage(Configuration.DEVELOP_CHAT_ID, onError(reason).escapeSpecial(), "MarkdownV2").join()
+
+    throw reason
+}

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/MessageUtils.kt

@@ -8,13 +8,15 @@ import java.util.concurrent.CompletableFuture
 
 private val logger = KotlinLogging.logger { }
 
-fun <T> CompletableFuture<T>.logging(prefix: String = ""): CompletableFuture<T> = handleAsync { value, throwable ->
-    if (throwable != null) {
-        logger.error { "$prefix: ${throwable.message}:\n${throwable.stackTraceToString()}" }
-        throw throwable
+class SendingMessageException(val action: String, val reason: Throwable) : RuntimeException()
+
+context(Bot)
+fun <T> CompletableFuture<T>.logging(action: String = ""): T =
+    try {
+        join()
+    } catch (throwable: Throwable) {
+        throw SendingMessageException(action, throwable)
     }
-    value
-}
 
 private fun String.escape(symbols: String) = replace("[$symbols]".toRegex()) { "\\${it.groupValues[0]}" }
 
@@ -27,18 +29,18 @@ fun Bot.sendMessageLogging(
     text: String,
     markup: ReplyKeyboard? = null,
     replyTo: Long? = null
-): CompletableFuture<out Message> {
+): Message {
     logger.debug { "Sending '$text'" }
     return sendMessage(chatId, text.escapeSpecial(), "MarkdownV2", replyTo = replyTo, markup = markup)
         .logging("Failed to send message \"$text\"")
 }
 
-fun Bot.deleteMessageLogging(chatId: Long, messageId: Long): CompletableFuture<out Boolean> {
+fun Bot.deleteMessageLogging(chatId: Long, messageId: Long): Boolean {
     logger.debug { "Deleting message $chatId/$messageId" }
     return deleteMessage(chatId, messageId).logging("Failed to delete message $chatId/$messageId")
 }
 
-fun Bot.answerCallbackQueryLogging(id: String, text: String? = null): CompletableFuture<out Boolean> {
+fun Bot.answerCallbackQueryLogging(id: String, text: String? = null): Boolean {
     logger.debug { "Answering callback query $id" }
     return answerCallbackQuery(id, text).logging("Answering callback query $id")
 }

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/handlers/ListCommand.kt

@@ -120,15 +120,15 @@ class ListCommand(private val partyDao: PartyDao, chatDao: ChatDao) :
             if (currentString.length + line.length + 1 < Configuration.MESSAGE_LENGTH) {
                 currentString.append("\n").append(line)
             } else {
-                sendCaseMessage(chatId, currentString.toString()).join()
+                sendCaseMessage(chatId, currentString.toString())
                 currentString = StringBuilder(line)
             }
         }
 
         if (emptySequence) {
             sendMessageLogging(chatId, onEmptyMessage)
         } else {
-            sendCaseMessage(chatId, currentString.toString()).join()
+            sendCaseMessage(chatId, currentString.toString())
         }
     }
 

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/handlers/PullPartyCommands.kt

@@ -10,6 +10,7 @@ import com.github.pool_party.pull_party_bot.commands.CallbackAction
 import com.github.pool_party.pull_party_bot.commands.CallbackData
 import com.github.pool_party.pull_party_bot.commands.EveryMessageInteraction
 import com.github.pool_party.pull_party_bot.commands.deleteMessageLogging
+import com.github.pool_party.pull_party_bot.commands.escapeMarkdown
 import com.github.pool_party.pull_party_bot.commands.messages.HELP_PARTY
 import com.github.pool_party.pull_party_bot.commands.messages.ON_ADMINS_PARTY_FAIL
 import com.github.pool_party.pull_party_bot.commands.messages.ON_PARTY_EMPTY
@@ -97,7 +98,7 @@ private suspend fun Bot.handleParty(
         .distinct()
         .joinToString(" ")
 
-    if (res.isNotBlank()) sendMessageLogging(chatId, res, replyTo = message.message_id)
+    if (res.isNotBlank()) sendMessageLogging(chatId, res.escapeMarkdown(), replyTo = message.message_id)
 
     if (failed.isEmpty()) return
 
@@ -136,7 +137,7 @@ private suspend fun Bot.handleParty(
                 }
                 .toList()
         )
-    ).join()
+    )
 
     delay(Configuration.STALE_PING_SECONDS * 1000L)