Merge pull request #4 from asundukov/asundukov-path-1-add-image-sizes-to-inline-photo

add image sizes to inline photo

Author: asundukov

kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/Photo.kt

@@ -16,11 +16,11 @@ class Photo internal constructor(
     }
 
     fun large(): PhotoSize {
-        return photoSizes.maxBy { it.width }!!
+        return photoSizes.maxBy { it.data.width }!!
     }
 
     fun small(): PhotoSize {
-        return photoSizes.minBy { it.width }!!
+        return photoSizes.minBy { it.data.width }!!
     }
 
 }

kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/PhotoData.kt

@@ -0,0 +1,7 @@
+package io.cutebot.telegram.bot.model
+
+data class PhotoData (
+        val width: Int,
+        val height: Int,
+        val size: Long?
+)

kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/bot/model/PhotoSize.kt

@@ -9,8 +9,6 @@ class PhotoSize internal constructor(
         token: String
 ): FileItem(api, token, tgPhotoSize) {
 
-    val width: Int = tgPhotoSize.width
-    val height: Int = tgPhotoSize.height
-    val size: Int? = tgPhotoSize.fileSize
+    val data: PhotoData = PhotoData(tgPhotoSize.width, tgPhotoSize.height, tgPhotoSize.fileSize)
 
 }

kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/inline/TgInlineQueryResultPhoto.kt

@@ -15,12 +15,24 @@ class TgInlineQueryResultPhoto (
         @field: JsonProperty("thumb_url")
         val thumbUrl: String,
 
+        @field: JsonProperty("photo_width")
+        val photoWidth: Int,
+
+        @field: JsonProperty("photo_height")
+        val photoHeight: Int,
+
         @field: JsonProperty
         val title: String = "",
 
+        @field: JsonProperty
+        val caption: String? = null,
+
         @field: JsonProperty
         val description: String? = null,
 
+        @field: JsonProperty("parse_mode")
+        val parseMode: String = "HTML",
+
         @field: JsonProperty("input_message_content")
         val inputMessageContent: TgInputMessageContent? = null,
 

kotlin-telegram-framework/src/main/kotlin/io/cutebot/telegram/client/model/photo/TgPhotoSize.kt

@@ -14,7 +14,7 @@ class TgPhotoSize (
         val height: Int,
 
         @field: JsonProperty("file_size")
-        val fileSize: Int?,
+        val fileSize: Long?,
 
         fileId: String,