asundukov path. add more handle types

Andrey Sundukov · Andrey Sundukov · commit eb4bc8007dd8 · 2020-10-11T16:26:36.000+03:00
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/StatefulBot.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/StatefulBot.kt
@@ -1,12 +1,19 @@
 package io.cutebot.telegram.bot
 
 import io.cutebot.telegram.bot.block.BotBlock
+import io.cutebot.telegram.bot.model.Location
+import io.cutebot.telegram.bot.model.message.AudioMessage
+import io.cutebot.telegram.bot.model.message.ContactMessage
+import io.cutebot.telegram.bot.model.message.VoiceMessage
 import io.cutebot.telegram.bot.model.message.DocumentMessage
+import io.cutebot.telegram.bot.model.message.LocationMessage
 import io.cutebot.telegram.bot.model.message.PhotoMessage
 import io.cutebot.telegram.bot.model.message.RawMessage
 import io.cutebot.telegram.bot.model.message.TextMessage
 import io.cutebot.telegram.bot.model.message.VideoMessage
+import io.cutebot.telegram.bot.model.message.VideoNoteMessage
 import io.cutebot.telegram.bot.model.settings.ChatMessagesStrategy
+import io.cutebot.telegram.client.model.TgVenue
 import io.cutebot.telegram.interaction.model.ChatAnswer
 
 abstract class StatefulBot(
@@ -44,6 +51,36 @@ abstract class StatefulBot(
             return currentBlock.getAnswer()
         }
 
+        if (message.videoNote != null) {
+            currentBlock = currentBlock.handleVideoNote(VideoNoteMessage(message, message.videoNote))
+            return currentBlock.getAnswer()
+        }
+
+        if (message.voice != null) {
+            currentBlock = currentBlock.handleVoice(VoiceMessage(message, message.voice))
+            return currentBlock.getAnswer()
+        }
+
+        if (message.audio != null) {
+            currentBlock = currentBlock.handleAudio(AudioMessage(message, message.audio))
+            return currentBlock.getAnswer()
+        }
+
+        if (message.contact != null) {
+            currentBlock = currentBlock.handleContact(ContactMessage(message, message.contact))
+            return currentBlock.getAnswer()
+        }
+
+        if (message.location != null) {
+            val venue = TgVenue(
+                    location = message.location,
+                    title = "",
+                    address = ""
+            )
+            currentBlock = currentBlock.handleLocation(LocationMessage(message, venue))
+            return currentBlock.getAnswer()
+        }
+
         return ChatAnswer.noAnswer()
     }
 
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/block/BotBlock.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/block/BotBlock.kt
@@ -1,9 +1,15 @@
 package io.cutebot.telegram.bot.block
 
+import io.cutebot.telegram.bot.model.Location
+import io.cutebot.telegram.bot.model.message.AudioMessage
+import io.cutebot.telegram.bot.model.message.ContactMessage
 import io.cutebot.telegram.bot.model.message.DocumentMessage
+import io.cutebot.telegram.bot.model.message.LocationMessage
 import io.cutebot.telegram.bot.model.message.PhotoMessage
 import io.cutebot.telegram.bot.model.message.TextMessage
 import io.cutebot.telegram.bot.model.message.VideoMessage
+import io.cutebot.telegram.bot.model.message.VideoNoteMessage
+import io.cutebot.telegram.bot.model.message.VoiceMessage
 import io.cutebot.telegram.interaction.model.ChatAnswer
 
 interface BotBlock {
@@ -14,5 +20,9 @@ interface BotBlock {
     fun handlePhoto(message: PhotoMessage): BotBlock
     fun handleDocument(message: DocumentMessage): BotBlock
     fun handleVideo(message: VideoMessage): BotBlock
-
+    fun handleVideoNote(message: VideoNoteMessage): BotBlock
+    fun handleVoice(message: VoiceMessage): BotBlock
+    fun handleContact(message: ContactMessage): BotBlock
+    fun handleLocation(message: LocationMessage): BotBlock
+    fun handleAudio(message: AudioMessage): BotBlock
 }
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/block/BotTextBlock.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/block/BotTextBlock.kt
@@ -1,8 +1,13 @@
 package io.cutebot.telegram.bot.block
 
+import io.cutebot.telegram.bot.model.message.AudioMessage
+import io.cutebot.telegram.bot.model.message.ContactMessage
 import io.cutebot.telegram.bot.model.message.DocumentMessage
+import io.cutebot.telegram.bot.model.message.LocationMessage
 import io.cutebot.telegram.bot.model.message.PhotoMessage
 import io.cutebot.telegram.bot.model.message.VideoMessage
+import io.cutebot.telegram.bot.model.message.VideoNoteMessage
+import io.cutebot.telegram.bot.model.message.VoiceMessage
 
 interface BotTextBlock: BotBlock {
     override fun handlePhoto(message: PhotoMessage): BotBlock {
@@ -16,4 +21,25 @@ interface BotTextBlock: BotBlock {
     override fun handleVideo(message: VideoMessage): BotBlock {
         return this
     }
-}
+
+    override fun handleVideoNote(message: VideoNoteMessage): BotBlock {
+        return this
+    }
+
+    override fun handleVoice(message: VoiceMessage): BotBlock {
+        return this
+    }
+
+    override fun handleAudio(message: AudioMessage): BotBlock {
+        return this
+    }
+
+    override fun handleContact(message: ContactMessage): BotBlock {
+        return this
+    }
+
+    override fun handleLocation(message: LocationMessage): BotBlock {
+        return this
+    }
+
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Audio.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Audio.kt
@@ -0,0 +1,14 @@
+package io.cutebot.telegram.bot.model
+
+import io.cutebot.telegram.client.TelegramApi
+import io.cutebot.telegram.client.model.TgAudio
+
+class Audio(
+        audio: TgAudio,
+        telegramApi: TelegramApi,
+        botToken: String
+): Voice(audio, telegramApi, botToken) {
+    val thumb = audio.thumb?.let { PhotoSize(audio.thumb, telegramApi, botToken) }
+    val title = audio.title
+    val performer = audio.performer
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Contact.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Contact.kt
@@ -0,0 +1,17 @@
+package io.cutebot.telegram.bot.model
+
+import io.cutebot.telegram.client.model.TgContact
+
+class Contact internal constructor(
+        tgContact: TgContact
+) {
+    val phoneNumber = tgContact.phoneNumber
+
+    val firstName = tgContact.firstName
+
+    val lastName = tgContact.lastName ?: ""
+
+    val userId = tgContact.userId
+
+    val vcard = tgContact.vcard
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Location.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Location.kt
@@ -0,0 +1,19 @@
+package io.cutebot.telegram.bot.model
+
+import io.cutebot.telegram.client.model.TgVenue
+
+class Location internal constructor(
+        tgVenue: TgVenue
+) {
+    val longitude = tgVenue.location.longitude
+
+    val latitude = tgVenue.location.latitude
+
+    val address = tgVenue.address
+
+    val title = tgVenue.title
+
+    val foursquareId = tgVenue.foursquareId
+
+    val foursquareType = tgVenue.foursquareType
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/VideoNote.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/VideoNote.kt
@@ -0,0 +1,15 @@
+package io.cutebot.telegram.bot.model
+
+import io.cutebot.telegram.client.TelegramApi
+import io.cutebot.telegram.client.model.TgVideoNote
+
+class VideoNote internal constructor(
+        tgVideoNote: TgVideoNote,
+        api: TelegramApi,
+        token: String
+): FileItem(api, token, tgVideoNote) {
+    val fileSize: Int? = tgVideoNote.fileSize
+    val length: Int = tgVideoNote.length
+    val duration: Int = tgVideoNote.duration
+    val thumb: PhotoSize? = tgVideoNote.thumb?.let { PhotoSize(it, api,token) }
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Voice.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Voice.kt
@@ -0,0 +1,14 @@
+package io.cutebot.telegram.bot.model
+
+import io.cutebot.telegram.client.TelegramApi
+import io.cutebot.telegram.client.model.TgVoice
+
+open class Voice internal constructor(
+        tgVoice: TgVoice,
+        api: TelegramApi,
+        token: String
+): FileItem(api, token, tgVoice) {
+    val fileSize: Int? = tgVoice.fileSize
+    val duration: Int = tgVoice.duration
+    val mimeType: String? = tgVoice.mimeType
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/AudioMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/AudioMessage.kt
@@ -0,0 +1,8 @@
+package io.cutebot.telegram.bot.model.message
+
+import io.cutebot.telegram.bot.model.Audio
+import io.cutebot.telegram.client.model.TgAudio
+
+class AudioMessage(message: RawMessage, audio: TgAudio): Message(message) {
+    val audio: Audio = Audio(audio, message.telegramApi, message.botToken)
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/ContactMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/ContactMessage.kt
@@ -0,0 +1,11 @@
+package io.cutebot.telegram.bot.model.message
+
+import io.cutebot.telegram.bot.model.Contact
+import io.cutebot.telegram.client.model.TgContact
+
+class ContactMessage(
+        message: RawMessage,
+        contact: TgContact
+): Message(message) {
+    val contact: Contact = Contact(contact)
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/DocumentMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/DocumentMessage.kt
@@ -1,7 +1,6 @@
 package io.cutebot.telegram.bot.model.message
 
 import io.cutebot.telegram.bot.model.Document
-import io.cutebot.telegram.bot.model.Message
 import io.cutebot.telegram.client.model.TgDocument
 
 class DocumentMessage(
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/LocationMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/LocationMessage.kt
@@ -0,0 +1,11 @@
+package io.cutebot.telegram.bot.model.message
+
+import io.cutebot.telegram.bot.model.Location
+import io.cutebot.telegram.client.model.TgVenue
+
+class LocationMessage(
+        message: RawMessage,
+        venue: TgVenue
+): Message(message) {
+    val location: Location = Location(venue)
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/Message.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/Message.kt
@@ -1,14 +1,13 @@
-package io.cutebot.telegram.bot.model
+package io.cutebot.telegram.bot.model.message
 
-import io.cutebot.telegram.bot.model.message.DocumentMessage
-import io.cutebot.telegram.bot.model.message.PhotoMessage
-import io.cutebot.telegram.bot.model.message.RawMessage
-import io.cutebot.telegram.bot.model.message.TextMessage
+import io.cutebot.telegram.bot.model.Chat
+import io.cutebot.telegram.bot.model.User
 import io.cutebot.telegram.client.TelegramApi
 import io.cutebot.telegram.client.model.TgMessage
 import java.util.Calendar
 
 abstract class Message internal constructor(message: RawMessage) {
+    val id: Long = message.messageId
     val date: Calendar = Calendar.getInstance()
     val user: User? = User.create(message.from)
     val chat: Chat = Chat.create(message.chat)
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/PhotoMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/PhotoMessage.kt
@@ -1,6 +1,5 @@
 package io.cutebot.telegram.bot.model.message
 
-import io.cutebot.telegram.bot.model.Message
 import io.cutebot.telegram.bot.model.Photo
 import io.cutebot.telegram.client.model.photo.TgPhotoSize
 
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/RawMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/RawMessage.kt
@@ -1,11 +1,17 @@
 package io.cutebot.telegram.bot.model.message
 
 import io.cutebot.telegram.client.TelegramApi
+import io.cutebot.telegram.client.model.TgAudio
 import io.cutebot.telegram.client.model.TgChat
+import io.cutebot.telegram.client.model.TgContact
 import io.cutebot.telegram.client.model.TgDocument
+import io.cutebot.telegram.client.model.TgLocation
 import io.cutebot.telegram.client.model.TgMessage
 import io.cutebot.telegram.client.model.TgUser
+import io.cutebot.telegram.client.model.TgVenue
 import io.cutebot.telegram.client.model.TgVideo
+import io.cutebot.telegram.client.model.TgVideoNote
+import io.cutebot.telegram.client.model.TgVoice
 import io.cutebot.telegram.client.model.photo.TgPhotoSize
 
 class RawMessage(
@@ -33,4 +39,10 @@ class RawMessage(
     val photo: List<TgPhotoSize>? = tgMessage.photo
     val document: TgDocument? = tgMessage.document
     val video: TgVideo? = tgMessage.video
+    val videoNote: TgVideoNote? = tgMessage.videoNote
+    val voice: TgVoice? = tgMessage.voice
+    val audio: TgAudio? = tgMessage.audio
+    val contact: TgContact? = tgMessage.contact
+    val location: TgLocation? = tgMessage.location
+    val venue: TgVenue? = tgMessage.venue
 }
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/TextMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/TextMessage.kt
@@ -1,7 +1,5 @@
 package io.cutebot.telegram.bot.model.message
 
-import io.cutebot.telegram.bot.model.Message
-
 class TextMessage(
         message: RawMessage,
         val text: String
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/VideoMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/VideoMessage.kt
@@ -1,6 +1,5 @@
 package io.cutebot.telegram.bot.model.message
 
-import io.cutebot.telegram.bot.model.Message
 import io.cutebot.telegram.bot.model.Video
 import io.cutebot.telegram.client.model.TgVideo
 
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/VideoNoteMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/VideoNoteMessage.kt
@@ -0,0 +1,11 @@
+package io.cutebot.telegram.bot.model.message
+
+import io.cutebot.telegram.bot.model.VideoNote
+import io.cutebot.telegram.client.model.TgVideoNote
+
+class VideoNoteMessage(
+        message: RawMessage,
+        tgVideoNote: TgVideoNote
+): Message(message) {
+    val videoNote: VideoNote = VideoNote(tgVideoNote, message.telegramApi, message.botToken)
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/VoiceMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/message/VoiceMessage.kt
@@ -0,0 +1,8 @@
+package io.cutebot.telegram.bot.model.message
+
+import io.cutebot.telegram.bot.model.Voice
+import io.cutebot.telegram.client.model.TgVoice
+
+class VoiceMessage(message: RawMessage, voice: TgVoice): Message(message) {
+    val voice: Voice = Voice(voice, message.telegramApi, message.botToken)
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/TelegramApi.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/TelegramApi.kt
@@ -5,6 +5,7 @@ import io.cutebot.telegram.client.model.TgBotCommands
 import io.cutebot.telegram.client.model.TgChat
 import io.cutebot.telegram.client.model.TgChatAction
 import io.cutebot.telegram.client.model.TgFilePath
+import io.cutebot.telegram.client.model.TgForwardMessage
 import io.cutebot.telegram.client.model.TgMessage
 import io.cutebot.telegram.client.model.TgResponseUpdate
 import io.cutebot.telegram.client.model.TgSendAnimation
@@ -141,6 +142,11 @@ class TelegramApi(
         return objectMapper.readValue(response.content, TgResponseMessage::class.java).result!!
     }
 
+    fun forwardMessage(token: String, forwardMessage: TgForwardMessage): TgMessage {
+        val response = postMethod(token, forwardMessage, "forwardMessage")
+        return objectMapper.readValue(response.content, TgResponseMessage::class.java).result!!
+    }
+
     fun setCommands(token: String, tgCommands: TgBotCommands) {
         postMethod(token, tgCommands, "setMyCommands")
     }
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgAudio.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgAudio.kt
@@ -0,0 +1,28 @@
+package io.cutebot.telegram.client.model
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
+import io.cutebot.telegram.client.model.photo.TgPhotoSize
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+class TgAudio (
+        @field: JsonProperty("title")
+        val title: String?,
+
+        @field: JsonProperty("performer")
+        val performer: String?,
+
+        @field: JsonProperty
+        val thumb: TgPhotoSize?,
+
+        fileSize: Int?,
+
+        mimeType: String?,
+
+        duration: Int,
+
+        fileId: String,
+
+        fileUniqueId: String
+
+): TgVoice(fileSize, mimeType, duration, fileId, fileUniqueId)
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgContact.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgContact.kt
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgForwardMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgForwardMessage.kt
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgLocation.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgLocation.kt
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgMessage.kt
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgVenue.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgVenue.kt
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgVideoNote.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgVideoNote.kt
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgVoice.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgVoice.kt
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/response/TgResponse.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/response/TgResponse.kt
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/response/TgResponseMessage.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/response/TgResponseMessage.kt
diff --git a/samples/photo-bot/src/main/kotlin/io/cutebot/telegram/samples/photo/DefaultBlock.kt b/samples/photo-bot/src/main/kotlin/io/cutebot/telegram/samples/photo/DefaultBlock.kt
