Merge pull request #7 from asundukov/asundukov-path-4-extend-user-model

asundukov · web-flow · commit c00404683451 · 2020-10-06T20:40:15.000+03:00
Asundukov path 4 extend user model
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/Bot.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/Bot.kt
@@ -1,6 +1,6 @@
 package io.cutebot.telegram.bot
 
-import io.cutebot.telegram.bot.model.RawMessage
+import io.cutebot.telegram.bot.model.message.RawMessage
 import io.cutebot.telegram.client.model.TgBotCommands
 import io.cutebot.telegram.client.model.TgChosenInlineResult
 import io.cutebot.telegram.client.model.inline.TgAnswerInlineQuery
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/BotSettings.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/BotSettings.kt
@@ -0,0 +1,7 @@
+package io.cutebot.telegram.bot
+
+import io.cutebot.telegram.bot.model.settings.ChatMessagesStrategy
+
+data class BotSettings(
+     val chatMessagesStrategy: ChatMessagesStrategy = ChatMessagesStrategy.IGNORE
+)
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/CommandsStatefulBot.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/CommandsStatefulBot.kt
@@ -4,7 +4,7 @@ import io.cutebot.telegram.bot.block.BotBlock
 import io.cutebot.telegram.bot.command.Command
 import io.cutebot.telegram.bot.commandextractor.CommandExtractor
 import io.cutebot.telegram.bot.commandextractor.DefaultCommandExtractor
-import io.cutebot.telegram.bot.model.RawMessage
+import io.cutebot.telegram.bot.model.message.RawMessage
 import io.cutebot.telegram.client.model.TgBotCommand
 import io.cutebot.telegram.client.model.TgBotCommands
 import io.cutebot.telegram.interaction.model.ChatAnswer
@@ -21,7 +21,9 @@ abstract class CommandsStatefulBot(
             .toMap()
 
     override fun handleMessage(message: RawMessage): ChatAnswer {
-        if (message.text != null && commandExtractor.isCommand(message.text)) {
+        if (message.text != null
+                && message.from != null && message.from.id == message.chat.id
+                && commandExtractor.isCommand(message.text)) {
             val (command, query) = commandExtractor.extractCommand(message.text)
 
             val commandBlock = commandsMap[command]
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/SimpleTextBot.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/SimpleTextBot.kt
@@ -1,6 +1,6 @@
 package io.cutebot.telegram.bot
 
-import io.cutebot.telegram.bot.model.RawMessage
+import io.cutebot.telegram.bot.model.message.RawMessage
 import io.cutebot.telegram.client.model.TgChat
 import io.cutebot.telegram.client.model.TgUser
 import io.cutebot.telegram.interaction.model.ChatAnswer
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,21 +1,29 @@
 package io.cutebot.telegram.bot
 
 import io.cutebot.telegram.bot.block.BotBlock
-import io.cutebot.telegram.bot.model.DocumentMessage
-import io.cutebot.telegram.bot.model.PhotoMessage
-import io.cutebot.telegram.bot.model.RawMessage
-import io.cutebot.telegram.bot.model.TextMessage
+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.message.VideoMessage
+import io.cutebot.telegram.bot.model.settings.ChatMessagesStrategy
 import io.cutebot.telegram.interaction.model.ChatAnswer
 
 abstract class StatefulBot(
-        protected var currentBlock: BotBlock
+        protected var currentBlock: BotBlock,
+        private val botSettings: BotSettings = BotSettings()
 ): Bot {
 
     override fun handleMessage(message: RawMessage): ChatAnswer {
         return chatAnswer(message)
     }
 
     internal fun chatAnswer(message: RawMessage): ChatAnswer {
+        if (botSettings.chatMessagesStrategy == ChatMessagesStrategy.IGNORE
+                && message.from != null && message.from.id != message.chat.id) {
+            return ChatAnswer.noAnswer()
+        }
+
         if (message.text != null) {
             currentBlock = currentBlock.handleText(TextMessage(message, message.text))
             return currentBlock.getAnswer()
@@ -31,6 +39,11 @@ abstract class StatefulBot(
             return currentBlock.getAnswer()
         }
 
+        if (message.video != null) {
+            currentBlock = currentBlock.handleVideo(VideoMessage(message, message.video))
+            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,8 +1,9 @@
 package io.cutebot.telegram.bot.block
 
-import io.cutebot.telegram.bot.model.DocumentMessage
-import io.cutebot.telegram.bot.model.PhotoMessage
-import io.cutebot.telegram.bot.model.TextMessage
+import io.cutebot.telegram.bot.model.message.DocumentMessage
+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.interaction.model.ChatAnswer
 
 interface BotBlock {
@@ -12,5 +13,6 @@ interface BotBlock {
     fun handleText(message: TextMessage): BotBlock
     fun handlePhoto(message: PhotoMessage): BotBlock
     fun handleDocument(message: DocumentMessage): BotBlock
+    fun handleVideo(message: VideoMessage): 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,7 +1,8 @@
 package io.cutebot.telegram.bot.block
 
-import io.cutebot.telegram.bot.model.DocumentMessage
-import io.cutebot.telegram.bot.model.PhotoMessage
+import io.cutebot.telegram.bot.model.message.DocumentMessage
+import io.cutebot.telegram.bot.model.message.PhotoMessage
+import io.cutebot.telegram.bot.model.message.VideoMessage
 
 interface BotTextBlock: BotBlock {
     override fun handlePhoto(message: PhotoMessage): BotBlock {
@@ -11,4 +12,8 @@ interface BotTextBlock: BotBlock {
     override fun handleDocument(message: DocumentMessage): BotBlock {
         return this
     }
+
+    override fun handleVideo(message: VideoMessage): BotBlock {
+        return this
+    }
 }
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/block/DoNothingBotBlock.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/block/DoNothingBotBlock.kt
@@ -1,6 +1,6 @@
 package io.cutebot.telegram.bot.block
 
-import io.cutebot.telegram.bot.model.TextMessage
+import io.cutebot.telegram.bot.model.message.TextMessage
 import io.cutebot.telegram.interaction.model.ChatAnswer
 
 class DoNothingBotBlock: BotTextBlock {
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/command/Command.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/command/Command.kt
@@ -1,7 +1,7 @@
 package io.cutebot.telegram.bot.command
 
 import io.cutebot.telegram.bot.block.BotBlock
-import io.cutebot.telegram.bot.model.RawMessage
+import io.cutebot.telegram.bot.model.message.RawMessage
 
 interface Command {
     /**
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/command/RedirectCommand.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/command/RedirectCommand.kt
@@ -1,7 +1,7 @@
 package io.cutebot.telegram.bot.command
 
 import io.cutebot.telegram.bot.block.BotBlock
-import io.cutebot.telegram.bot.model.RawMessage
+import io.cutebot.telegram.bot.model.message.RawMessage
 
 class RedirectCommand(
         private val botBlock: BotBlock,
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Message.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Message.kt
@@ -1,5 +1,9 @@
 package io.cutebot.telegram.bot.model
 
+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.client.TelegramApi
 import io.cutebot.telegram.client.model.TgMessage
 import java.util.Calendar
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/User.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/User.kt
@@ -5,6 +5,10 @@ import io.cutebot.telegram.client.model.TgUser
 class User private constructor(tgUser: TgUser) {
 
     val id = tgUser.id
+    val firstName = tgUser.firstName
+    val lastName = tgUser.lastName
+    val userName = tgUser.userName
+    val languageCode = tgUser.languageCode
 
     companion object {
         fun create(tgUser: TgUser?): User? {
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Video.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Video.kt
@@ -0,0 +1,17 @@
+package io.cutebot.telegram.bot.model
+
+import io.cutebot.telegram.client.TelegramApi
+import io.cutebot.telegram.client.model.TgVideo
+
+class Video internal constructor(
+        tgVideo: TgVideo,
+        api: TelegramApi,
+        token: String
+): FileItem(api, token, tgVideo) {
+    val mimeType: String? = tgVideo.mimeType
+    val fileSize: Int? = tgVideo.fileSize
+    val width: Int = tgVideo.width
+    val height: Int = tgVideo.height
+    val duration: Int = tgVideo.duration
+    val thumb: PhotoSize? = tgVideo.thumb?.let { PhotoSize(it, api,token) }
+}
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,10 +1,13 @@
-package io.cutebot.telegram.bot.model
+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(
         message: RawMessage,
         tgDocument: TgDocument
 ): Message(message) {
     val document: Document = Document(tgDocument, message.telegramApi, message.botToken)
+    val message = message.caption ?: ""
 }
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,10 +1,13 @@
-package io.cutebot.telegram.bot.model
+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
 
 class PhotoMessage(
         message: RawMessage,
         photos: List<TgPhotoSize>
 ): Message(message) {
     val photo: Photo = Photo(photos, message.telegramApi, message.botToken)
+    val message: String = message.caption ?: ""
 }
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,10 +1,11 @@
-package io.cutebot.telegram.bot.model
+package io.cutebot.telegram.bot.model.message
 
 import io.cutebot.telegram.client.TelegramApi
 import io.cutebot.telegram.client.model.TgChat
 import io.cutebot.telegram.client.model.TgDocument
 import io.cutebot.telegram.client.model.TgMessage
 import io.cutebot.telegram.client.model.TgUser
+import io.cutebot.telegram.client.model.TgVideo
 import io.cutebot.telegram.client.model.photo.TgPhotoSize
 
 class RawMessage(
@@ -31,4 +32,5 @@ class RawMessage(
     val caption: String? = tgMessage.caption
     val photo: List<TgPhotoSize>? = tgMessage.photo
     val document: TgDocument? = tgMessage.document
+    val video: TgVideo? = tgMessage.video
 }
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,4 +1,6 @@
-package io.cutebot.telegram.bot.model
+package io.cutebot.telegram.bot.model.message
+
+import io.cutebot.telegram.bot.model.Message
 
 class TextMessage(
         message: RawMessage,
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
@@ -0,0 +1,13 @@
+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
+
+class VideoMessage(
+        message: RawMessage,
+        tgVideo: TgVideo
+): Message(message) {
+    val video: Video = Video(tgVideo, message.telegramApi, message.botToken)
+    val message: String = message.caption ?: ""
+}
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/settings/ChatMessagesStrategy.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/settings/ChatMessagesStrategy.kt
@@ -0,0 +1,6 @@
+package io.cutebot.telegram.bot.model.settings
+
+enum class ChatMessagesStrategy {
+    IGNORE,
+    ALL
+}
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
@@ -57,10 +57,13 @@ data class TgMessage (
         @field: JsonProperty("caption")
         val caption: String?,
 
+        @field: JsonProperty("document")
+        val document: TgDocument?,
+
         @field: JsonProperty("photo")
         val photo: List<TgPhotoSize>?,
 
-        @field: JsonProperty("document")
-        val document: TgDocument?
+        @field: JsonProperty("video")
+        val video: TgVideo?
 
 )
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgVideo.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/TgVideo.kt
@@ -0,0 +1,30 @@
+package io.cutebot.telegram.client.model
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import io.cutebot.telegram.client.model.photo.TgPhotoSize
+
+class TgVideo (
+        @field: JsonProperty("file_size")
+        val fileSize: Int?,
+
+        @field: JsonProperty("mime_type")
+        val mimeType: String?,
+
+        @field: JsonProperty
+        val thumb: TgPhotoSize?,
+
+        @field: JsonProperty
+        val width: Int,
+
+        @field: JsonProperty
+        val height: Int,
+
+        @field: JsonProperty
+        val duration: Int,
+
+        fileId: String,
+
+        fileUniqueId: String
+
+): TgFile(fileId, fileUniqueId)
+
diff --git a/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/interaction/LongPollProcess.kt b/kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/interaction/LongPollProcess.kt
@@ -1,7 +1,7 @@
 package io.cutebot.telegram.interaction
 
 import io.cutebot.telegram.bot.Bot
-import io.cutebot.telegram.bot.model.RawMessage
+import io.cutebot.telegram.bot.model.message.RawMessage
 import io.cutebot.telegram.client.TelegramApi
 import io.cutebot.telegram.exception.BotGetUpdatesConflictException
 import io.cutebot.telegram.exception.TgBotNotFoundException
diff --git a/samples/inline-bot/src/main/kotlin/io/cutebot/telegram/samples/inline/InlineBot.kt b/samples/inline-bot/src/main/kotlin/io/cutebot/telegram/samples/inline/InlineBot.kt
@@ -2,7 +2,7 @@ package io.cutebot.telegram.samples.inline
 
 
 import io.cutebot.telegram.bot.Bot
-import io.cutebot.telegram.bot.model.RawMessage
+import io.cutebot.telegram.bot.model.message.RawMessage
 import io.cutebot.telegram.client.model.TgChosenInlineResult
 import io.cutebot.telegram.client.model.inline.TgAnswerInlineQuery
 import io.cutebot.telegram.client.model.inline.TgInlineQuery
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
@@ -1,9 +1,10 @@
 package io.cutebot.telegram.samples.photo
 
 import io.cutebot.telegram.bot.block.BotBlock
-import io.cutebot.telegram.bot.model.DocumentMessage
-import io.cutebot.telegram.bot.model.PhotoMessage
-import io.cutebot.telegram.bot.model.TextMessage
+import io.cutebot.telegram.bot.model.message.DocumentMessage
+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.interaction.model.ChatAnswer
 import java.io.File
 
@@ -32,4 +33,9 @@ class DefaultBlock(
         return this
     }
 
+    override fun handleVideo(message: VideoMessage): BotBlock {
+        receivedFile = message.video.getFile()
+        return this
+    }
+
 }
diff --git a/samples/stateful-bot/src/main/kotlin/io/cutebot/telegram/samples/statefulbot/block/HomeBlock.kt b/samples/stateful-bot/src/main/kotlin/io/cutebot/telegram/samples/statefulbot/block/HomeBlock.kt
@@ -2,7 +2,7 @@ package io.cutebot.telegram.samples.statefulbot.block
 
 import io.cutebot.telegram.bot.block.BotBlock
 import io.cutebot.telegram.bot.block.BotTextBlock
-import io.cutebot.telegram.bot.model.TextMessage
+import io.cutebot.telegram.bot.model.message.TextMessage
 import io.cutebot.telegram.client.model.keyboard.builder.ReplyKeyboardSimpleBuilder
 import io.cutebot.telegram.interaction.model.ChatAnswer
 import io.cutebot.telegram.samples.statefulbot.Hero
diff --git a/samples/stateful-bot/src/main/kotlin/io/cutebot/telegram/samples/statefulbot/block/OfficeBlock.kt b/samples/stateful-bot/src/main/kotlin/io/cutebot/telegram/samples/statefulbot/block/OfficeBlock.kt
@@ -2,7 +2,7 @@ package io.cutebot.telegram.samples.statefulbot.block
 
 import io.cutebot.telegram.bot.block.BotBlock
 import io.cutebot.telegram.bot.block.BotTextBlock
-import io.cutebot.telegram.bot.model.TextMessage
+import io.cutebot.telegram.bot.model.message.TextMessage
 import io.cutebot.telegram.client.model.keyboard.builder.ReplyKeyboardSimpleBuilder
 import io.cutebot.telegram.interaction.model.ChatAnswer
 import io.cutebot.telegram.samples.statefulbot.Hero
diff --git a/samples/stateful-bot/src/main/kotlin/io/cutebot/telegram/samples/statefulbot/block/StartBlock.kt b/samples/stateful-bot/src/main/kotlin/io/cutebot/telegram/samples/statefulbot/block/StartBlock.kt
@@ -2,7 +2,7 @@ package io.cutebot.telegram.samples.statefulbot.block
 
 import io.cutebot.telegram.bot.block.BotBlock
 import io.cutebot.telegram.bot.block.BotTextBlock
-import io.cutebot.telegram.bot.model.TextMessage
+import io.cutebot.telegram.bot.model.message.TextMessage
 import io.cutebot.telegram.client.model.keyboard.builder.ReplyKeyboardSimpleBuilder
 import io.cutebot.telegram.interaction.model.ChatAnswer
 import io.cutebot.telegram.samples.statefulbot.Hero
