Update to Bot API v7

src/Funogram.Generator/Helpers.fs

@@ -25,6 +25,7 @@ let typeMap =
     "Float number", "float"
     "InlineKeyboardMarkup or ReplyKeyboardMarkup or ReplyKeyboardRemove or ForceReply", "Markup"
     "array of Messages", "Message[]"
+    "array of MessageId", "MessageId[]"
     "InputMediaAudio, InputMediaDocument, InputMediaPhoto and InputMediaVideo", "InputMedia"
     "Message or True", "EditMessageResult"
   ] |> Map.ofList

src/Funogram.Generator/Types/TypesParser.fs

@@ -47,7 +47,11 @@ let private splitCaseNameAndType (typeName: string) (nameAndType: string) =
     | "InputMessageContent" -> "Input"
     | _ -> typeName
 
-  try nameAndType.Substring(typeName.Length) with | _ -> "ERROR!"
+  match typeName, nameAndType with
+  | "MaybeInaccessibleMessage", "Message" -> "Message"
+  | "MaybeInaccessibleMessage", "InaccessibleMessage" -> "InaccessibleMessage"
+  | _ ->
+    try nameAndType.Substring(typeName.Length) with | _ -> "ERROR!"
 
 let private isValidTypeNode (typeNodeInfo: ApiTypeNodeInfo) =
   let name = Helpers.innerText typeNodeInfo.TypeName

src/Funogram.Telegram/Api.fs

@@ -2,6 +2,7 @@
 module Funogram.Telegram.Api
 
 open Funogram.Telegram
+open Funogram.Telegram.Types
 open Types
 
 let deleteWebhookBase () =
@@ -15,7 +16,7 @@ let sendMessageByChatName chatName text = Req.SendMessage.Make(ChatId.String cha
 
 let sendMessageMarkup chatId text replyMarkup = Req.SendMessage.Make(ChatId.Int chatId, text, replyMarkup = replyMarkup)
 
-let sendMessageReply chatId text replyToMessageId = Req.SendMessage.Make(ChatId.Int chatId, text, replyToMessageId = replyToMessageId)
+let sendMessageReply chatId text replyToMessageId = Req.SendMessage.Make(ChatId.Int chatId, text, replyParameters = ReplyParameters.Create replyToMessageId)
 
 let forwardMessage chatId fromChatId messageId = Req.ForwardMessage.Make(ChatId.Int chatId, ChatId.Int fromChatId, messageId)
 

src/Funogram.Telegram/Bot.fs

@@ -107,7 +107,7 @@ let private runBot config me updateArrived updatesArrived =
       async {
         try
           let! updatesResult =
-            Req.GetUpdates.Make(offset, ?limit = config.Limit, ?timeout = config.Timeout)
+            Req.GetUpdates.Make(offset, ?limit = config.Limit, ?timeout = config.Timeout, ?allowedUpdates = (config.AllowedUpdates |> Option.map Seq.toArray))
             |> bot
 
           match updatesResult with

src/Funogram.Tests/Constants.fs

@@ -10,7 +10,14 @@ module Constants =
 
   let testDate = System.DateTime(2117, 05, 28, 12, 47, 51, DateTimeKind.Utc)
   let testDateUnix = 4651649271L
-
+  let testForwardOrigin = MessageOrigin.HiddenUser(
+                            MessageOriginHiddenUser.Create(
+                              ``type`` = "hidden_user",
+                              date = testDate,
+                              senderUserName = "test user"
+                            )
+                          )
+
   let jsonTestObj = { Type = "italic"; Offset = 0L; Length = 100L; Url = Some("http://github.com"); User = None; Language = None; CustomEmojiId = None }
   let jsonTestObjString = """{"type":"italic","offset":0,"length":100,"url":"http://github.com"}"""
   let jsonTestObjResultString = """{"ok":true,"result":{"type":"italic","offset":0,"length":100,"url":"http://github.com","user":null,"language":null} }"""
@@ -35,12 +42,13 @@ module Constants =
   let testMaskPosition = { MaskPosition.Point = MaskPoint.Eyes; XShift = 0.0; YShift = 0.0; Scale = 0.0 }
   let jsonTestMaskPosition = """{"point":"eyes","x_shift":0,"y_shift":0,"scale":0}"""
   let jsonTestMaskPositionResult = ok jsonTestMaskPosition
+
+
+  let jsonMessageForwardDate = Message.Create(1L, testDate, jsonTestChat, text = "abc", forwardOrigin = testForwardOrigin)
 
-  let jsonMessageForwardDate = Message.Create(1L, testDate, jsonTestChat, text = "abc", forwardDate = testDate)
-
-  let jsonMessageForward = Message.Create(1L, testDate, jsonTestChat, forwardDate = testDate, text = "abc")
+  let jsonMessageForward = Message.Create(1L, testDate, jsonTestChat, forwardOrigin = testForwardOrigin, text = "abc")
 
-  let jsonMessageForwardDateString = sprintf """{"message_id":1,"date":%i,"chat":{"id":1,"type":"group","title":"Test group"},"forward_date":%i,"text":"abc"}""" testDateUnix testDateUnix    
+  let jsonMessageForwardDateString = sprintf """{"message_id":1,"date":%i,"chat":{"id":1,"type":"group","title":"Test group"},"forward_origin":{"type":"hidden_user","date":%i,"sender_user_name":"test user"},"text":"abc"}""" testDateUnix testDateUnix
   let jsonMessageForwardDateApiString = ok jsonMessageForwardDateString
 
   let paramsDictionary =

src/examples/Funogram.TestBot/Commands/TextMessages.fs

@@ -15,14 +15,14 @@ let testNoWebpageAndNotification config chatId =
     ChatId.Int chatId,
     "@Dolfik! See http://fsharplang.ru - Russian F# Community",
     disableNotification = true,
-    disableWebPagePreview = true
+    linkPreviewOptions = LinkPreviewOptions.Create(isDisabled = true)
   ) |> bot config
 
 let testReply (ctx: UpdateContext) config (chatId: int64) =
   Req.SendMessage.Make(
     chatId,
     "That's message with reply!",
-    replyToMessageId = ctx.Update.Message.Value.MessageId
+    replyParameters = ReplyParameters.Create(messageId = ctx.Update.Message.Value.MessageId)
   ) |> bot config
 
 let testForwardMessage (ctx: UpdateContext) config (chatId: int64) =