v0.2

smaugfm · Oct 31, 2020 · b739a71 · b739a71
1 parent 7ec7bb9
commit b739a71
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "com.github.smaugfm"
-version = "0.1-alpha"
+version = "0.2-alpha"
 
 val myMavenRepoReadUrl: String by project
 val myMavenRepoReadUsername: String by project

diff --git a/src/main/kotlin/com/github/smaugfm/telegram/TransactionActionType.kt b/src/main/kotlin/com/github/smaugfm/telegram/TransactionActionType.kt
@@ -37,8 +37,8 @@ sealed class TransactionActionType {
             }
         }
 
-        fun KClass<out TransactionActionType>.serialize(): String {
-            return this::class.simpleName!!
+        inline fun <reified T : TransactionActionType> serialize(): String {
+            return T::class.simpleName!!
         }
 
         fun KClass<out TransactionActionType>.buttonWord(): String {

diff --git a/src/main/kotlin/com/github/smaugfm/telegram/handlers/CallbackQueryHandler.kt b/src/main/kotlin/com/github/smaugfm/telegram/handlers/CallbackQueryHandler.kt
@@ -47,8 +47,18 @@ class CallbackQueryHandler(
         val updatedText = updateHTMLStatementMessage(updatedTransaction, event.message)
         val updatedMarkup = updateMarkupKeyboard(type, event.message.reply_markup!!)
 
-        with(event.message) {
-            telegram.editMessage(chat.id, message_id, text = updatedText, parseMode = "HTML", markup = updatedMarkup)
+        if (stripHTMLtagsFromMessage(updatedText) != event.message.text ||
+            updatedMarkup != event.message.reply_markup
+        ) {
+            with(event.message) {
+                telegram.editMessage(
+                    chat.id,
+                    message_id,
+                    text = updatedText,
+                    parseMode = "HTML",
+                    markup = updatedMarkup
+                )
+            }
         }
     }
 

diff --git a/src/main/kotlin/com/github/smaugfm/telegram/handlers/Util.kt b/src/main/kotlin/com/github/smaugfm/telegram/handlers/Util.kt
@@ -29,6 +29,11 @@ internal fun formatInlineKeyboard(
     )
 }
 
+internal fun stripHTMLtagsFromMessage(messageText: String): String {
+    val replaceHtml = Regex("<.*?>")
+    return replaceHtml.replace(messageText, "")
+}
+
 internal fun formatHTMLStatementMessage(
     description: String,
     mcc: String,
@@ -71,6 +76,6 @@ internal inline fun <reified T : TransactionActionType> button(pressed: Set<KCla
     with(T::class) {
         InlineKeyboardButton(
             buttonText<T>(this in pressed),
-            callback_data = T::class.serialize()
+            callback_data = serialize<T>()
         )
     }
diff --git a/src/test/kotlin/com/github/smaugfm/telegram/handlers/TelegramHandlerTest.kt b/src/test/kotlin/com/github/smaugfm/telegram/handlers/TelegramHandlerTest.kt
@@ -90,21 +90,21 @@ class TelegramHandlerTest {
                         listOf(
                             InlineKeyboardButton(
                                 "❌категорию",
-                                callback_data = TransactionActionType.Uncategorize::class.serialize()
+                                callback_data = serialize<TransactionActionType.Uncategorize>()
                             ),
                             InlineKeyboardButton(
                                 "\uD83D\uDEABunapprove",
-                                callback_data = TransactionActionType.Unapprove::class.serialize()
+                                callback_data = serialize<TransactionActionType.Unapprove>()
                             ),
                         ),
                         listOf(
                             InlineKeyboardButton(
                                 "➡️невыясненные",
-                                callback_data = TransactionActionType.Unknown::class.serialize()
+                                callback_data = serialize<TransactionActionType.Unknown>()
                             ),
                             InlineKeyboardButton(
                                 "➕payee",
-                                callback_data = TransactionActionType.MakePayee::class.serialize()
+                                callback_data = serialize<TransactionActionType.MakePayee>()
                             ),
                         )
                     )
@@ -113,11 +113,6 @@ class TelegramHandlerTest {
         }
     }
 
-    private fun replaceMessageText(messageText: String): String {
-        val replaceHtml = Regex("<.*?>")
-        return replaceHtml.replace(messageText, "")
-    }
-
     @Test
     fun `Test extractPayeeAndTransactionIdFromMessage`() {
         val payee = "Галинка Савченко"
@@ -126,7 +121,7 @@ class TelegramHandlerTest {
             getMonoResponseAndTransaction(payee, payee, "vasa", id)
 
         val messageText = formatHTMLStatementMessage(monoResponse.statementItem, transaction)
-        val adjustedMessage = replaceMessageText(messageText)
+        val adjustedMessage = stripHTMLtagsFromMessage(messageText)
         val message = mockk<Message> {
             every { text } returns adjustedMessage
             every { entities } returns listOf(
@@ -165,7 +160,7 @@ class TelegramHandlerTest {
             every { id } returns transactionId
         }
 
-        val messageText = replaceMessageText(
+        val messageText = stripHTMLtagsFromMessage(
             formatHTMLStatementMessage(monoResponse.statementItem, transaction)
         )
         val keyboard = formatInlineKeyboard(emptySet())