Prepare for the next Funogram update

Emulsion.Telegram/Funogram.fs

@@ -169,10 +169,12 @@ module MessageConverter =
             else Some (contentType, message.Caption)
 
         let (|ForwardFrom|_|) (message: FunogramMessage) =
-            match message with
-            | { ForwardFrom = Some user } -> Some (getUserDisplayName user)
-            | { ForwardSenderName = Some sender } -> Some sender
-            | { ForwardFromChat = Some chat } -> Some (getChatDisplayName chat)
+            match message.ForwardOrigin with
+            | Some(User { SenderUser = user }) -> Some (getUserDisplayName user)
+            | Some(HiddenUser { SenderUserName = name }) -> Some name
+            // TODO: For the last two, there's AuthorSignature field. Probably we should try using it?
+            | Some(MessageOrigin.Chat { SenderChat = chat }) -> Some (getChatDisplayName chat)
+            | Some(MessageOrigin.Channel { Chat = chat }) -> Some (getChatDisplayName chat)
             | _ -> None
 
         let appendLinkTo text =

Emulsion.Telegram/LinkGenerator.fs

@@ -40,9 +40,9 @@ type private WithId<'T when 'T: (member FileId: string)> = 'T
 type private WithFileName<'T when 'T: (member FileName: string option)> = 'T
 type private WithMimeType<'T when 'T: (member MimeType: string option)> = 'T
 
-let inline private extractFileInfo<'T 
-                        when WithId<'T> 
-                        and WithFileName<'T> 
+let inline private extractFileInfo<'T
+                        when WithId<'T>
+                        and WithFileName<'T>
                         and WithMimeType<'T>>
                         : 'T option -> FileInfo option =
     Option.map(fun file -> {
@@ -51,19 +51,19 @@ let inline private extractFileInfo<'T
         MimeType = file.MimeType
     })
 
-let inline private extractFileInfoWithName<'T 
-                                when WithId<'T> 
-                                and WithMimeType<'T>> 
-                                (fileName: string) 
+let inline private extractFileInfoWithName<'T
+                                when WithId<'T>
+                                and WithMimeType<'T>>
+                                (fileName: string)
                                 : 'T option -> FileInfo option =
     Option.map(fun file -> {
         FileId = file.FileId
         FileName = Some fileName
         MimeType = file.MimeType
     })
 
-let inline private extractFileInfoWithNameAndMimeType<'T when WithId<'T>> 
-                                        (fileName: string) 
+let inline private extractFileInfoWithNameAndMimeType<'T when WithId<'T>>
+                                        (fileName: string)
                                         (mimeType: string)
                                         : 'T option -> FileInfo option =
     Option.map(fun file -> {
@@ -89,14 +89,14 @@ let private extractStickerFileInfo: Sticker option -> FileInfo option =
     Option.bind(fun sticker ->
         if sticker.IsAnimated then
             // We cannot to preview Telegram's .tgs stickers in browser, so return thumbnail
-            extractFileInfoWithNameAndMimeType "sticker.webp" "image/webp" sticker.Thumb
+            extractFileInfoWithNameAndMimeType "sticker.webp" "image/webp" sticker.Thumbnail
         elif sticker.IsVideo then
             extractFileInfoWithNameAndMimeType "sticker.webm" "video/webm" (Some sticker)
         else
             extractFileInfoWithNameAndMimeType "sticker.webp" "image/webp" (Some sticker)
     )
 
-let private getFileInfos(message: FunogramMessage): FileInfo seq = 
+let private getFileInfos(message: FunogramMessage): FileInfo seq =
     Seq.choose id <| seq {
         extractFileInfo message.Document
         extractFileInfo message.Audio

Emulsion.Tests/Telegram/FunogramTests.fs

@@ -54,7 +54,11 @@ let private createReplyMessage from text replyTo : Funogram.Telegram.Types.Messa
 let private createForwardedMessage from (forwarded: Funogram.Telegram.Types.Message) =
     { defaultMessage with
         From = Some from
-        ForwardFrom = forwarded.From
+        ForwardOrigin =
+            forwarded.From
+            |> Option.map (
+                fun u -> User(MessageOriginUser.Create(``type`` = "user", date = forwarded.Date, senderUser = u))
+            )
         Text = forwarded.Text }
 
 let private createStickerMessage from (emoji: string option) =
@@ -83,17 +87,13 @@ let private createPhoto() = [|
     }
 |]
 
-let private createAnimation(): Animation = {
-    FileId = ""
-    FileUniqueId = ""
-    Width = 0
-    Height = 0
-    Duration = 0
-    Thumb = None
-    FileName = None
-    MimeType = None
-    FileSize = None
-}
+let private createAnimation() = Animation.Create(
+    fileId = "",
+    fileUniqueId = "",
+    width = 0L,
+    height = 0L,
+    duration = 0L
+)
 
 let private createMessageWithCaption from caption =
     { defaultMessage with
@@ -356,7 +356,15 @@ module ReadMessageTests =
     [<Fact>]
     let forwardFromHiddenUser(): unit =
         let message = { createEmptyMessage forwardingUser with
-                            ForwardSenderName = Some "Hidden user"
+                            ForwardOrigin = Some(
+                                HiddenUser(
+                                    MessageOriginHiddenUser.Create(
+                                        ``type`` = "hidden_user",
+                                        date = DateTime.MinValue,
+                                        senderUserName = "Hidden user"
+                                    )
+                                )
+                            )
                             Text = Some "test" }
 
         Assert.Equal(
@@ -367,7 +375,15 @@ module ReadMessageTests =
     [<Fact>]
     let forwardFromChat(): unit =
         let message = { createEmptyMessage forwardingUser with
-                            ForwardFromChat = Some currentChat
+                            ForwardOrigin = Some(
+                                MessageOrigin.Chat(
+                                    MessageOriginChat.Create(
+                                        ``type`` = "chat",
+                                        date = DateTime.MinValue,
+                                        senderChat = currentChat
+                                    )
+                                )
+                            )
                             Text = Some "test" }
 
         Assert.Equal(

Emulsion.Tests/Telegram/LinkGeneratorTests.fs

@@ -4,12 +4,10 @@ open System
 
 open Emulsion.ContentProxy
 open Funogram.Telegram.Types
-open Serilog.Core
 open Xunit
 
 open Emulsion.Database
 open Emulsion.Settings
-open Emulsion.Telegram
 open Emulsion.TestFramework
 
 let private hostingSettings = {
@@ -46,7 +44,7 @@ let private messageWithDocument =
         Document = Some {
             FileId = fileId1
             FileUniqueId = fileId1
-            Thumb = None
+            Thumbnail = None
             FileName = None
             MimeType = None
             FileSize = None
@@ -64,23 +62,19 @@ let private messageWithAudio =
             Title = None
             MimeType = None
             FileSize = None
-            Thumb = None
+            Thumbnail = None
         }
     }
 
 let private messageWithAnimation =
     { messageTemplate with
-        Animation = Some {
-            FileId = fileId1
-            FileUniqueId = fileId1
-            Width = 0
-            Height = 0
-            Duration = 0
-            Thumb = None
-            FileName = None
-            MimeType = None
-            FileSize = None
-        }
+        Animation = Some <| Animation.Create(
+            fileId = fileId1,
+            fileUniqueId = fileId1,
+            width = 0L,
+            height = 0L,
+            duration = 0L
+        )
     }
 
 let private messageWithPhoto =
@@ -135,7 +129,7 @@ let private messageWithAnimatedSticker =
             height = 0,
             isAnimated = true,
             isVideo = false,
-            thumb = photo
+            thumbnail = photo
         )
     }
 
@@ -148,7 +142,7 @@ let private messageWithVideo =
             Width = 0
             Height = 0
             Duration = 0
-            Thumb = None
+            Thumbnail = None
             MimeType = None
             FileSize = None
         }
@@ -172,7 +166,7 @@ let private messageWithVideoNote =
             FileUniqueId = fileId1
             Length = 0
             Duration = 0
-            Thumb = None
+            Thumbnail = None
             FileSize = None
         }
     }