Prepare for the next Funogram update

.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Set up .NET SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: NuGet cache
         uses: actions/cache@v3
         with:

CHANGELOG.md

@@ -4,6 +4,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic
 Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.3] - 2024-02-06
+### Changed
+- **(Requirement update!)** Update to .NET 8.
+
+### Fixed
+- [#190](https://github.com/codingteam/emulsion/issues/190): a quotation message caused the bot to fail the parsing.
+
 ## [2.4.2] - 2023-07-07
 ### Fixed
 - Message archive entries are stored by id in a stable way
@@ -177,4 +184,5 @@ runtime 2.2.
 [2.4.0]: https://github.com/codingteam/emulsion/compare/v2.3.1...v2.4.0
 [2.4.1]: https://github.com/codingteam/emulsion/compare/v2.4.0...v2.4.1
 [2.4.2]: https://github.com/codingteam/emulsion/compare/v2.4.1...v2.4.2
-[Unreleased]: https://github.com/codingteam/emulsion/compare/v2.4.2...HEAD
+[2.4.3]: https://github.com/codingteam/emulsion/compare/v2.4.2...v2.4.3
+[Unreleased]: https://github.com/codingteam/emulsion/compare/v2.4.3...HEAD

Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 
 # Install Node.js 18
 RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
@@ -22,7 +22,7 @@ COPY . ./
 RUN dotnet build Emulsion.MessageArchive.Frontend # required to publish the frontend resources
 RUN dotnet publish Emulsion -c Release -o /app/out
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
 COPY --from=build-env /app/out .
 ENTRYPOINT ["dotnet", "Emulsion.dll"]

Emulsion.ContentProxy/Emulsion.ContentProxy.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

Emulsion.Database/Emulsion.Database.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

Emulsion.MessageArchive.Frontend/Emulsion.MessageArchive.Frontend.proj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Build.NoTargets/3.7.0">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
@@ -19,7 +19,7 @@
         <Exec Command="npm install" />
         <Touch Files="$(IntermediateOutputPath)\npm-build.timestamp" AlwaysCreate="true" />
     </Target>
-    
+
     <Target Name="NpmBuild" BeforeTargets="Build"
             Inputs="@(Content)"
             Outputs="bin\index.html">

Emulsion.Messaging/Emulsion.Messaging.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>

Emulsion.Settings/Emulsion.Settings.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 

Emulsion.Telegram/Emulsion.Telegram.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
@@ -11,8 +11,8 @@
     <Compile Include="Client.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Funogram" Version="2.0.5" />
-    <PackageReference Include="Funogram.Telegram" Version="6.3.0" />
+    <PackageReference Include="Funogram" Version="2.0.10" />
+    <PackageReference Include="Funogram.Telegram" Version="7.0.0.2" />
     <PackageReference Include="Serilog" Version="2.10.0" />
   </ItemGroup>
   <ItemGroup>

Emulsion.Telegram/Funogram.fs

@@ -169,10 +169,11 @@ 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
+            | 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.TestFramework/Emulsion.TestFramework.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <OutputType>Library</OutputType>
   </PropertyGroup>

Emulsion.Tests/Emulsion.Tests.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

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

@@ -2,11 +2,11 @@
 
 open System
 
-open Emulsion.ContentProxy
 open Funogram.Telegram.Types
 open Serilog.Core
 open Xunit
 
+open Emulsion.ContentProxy
 open Emulsion.Database
 open Emulsion.Settings
 open Emulsion.Telegram
@@ -46,7 +46,7 @@ let private messageWithDocument =
         Document = Some {
             FileId = fileId1
             FileUniqueId = fileId1
-            Thumb = None
+            Thumbnail = None
             FileName = None
             MimeType = None
             FileSize = None
@@ -64,23 +64,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 +131,7 @@ let private messageWithAnimatedSticker =
             height = 0,
             isAnimated = true,
             isVideo = false,
-            thumb = photo
+            thumbnail = photo
         )
     }
 
@@ -148,7 +144,7 @@ let private messageWithVideo =
             Width = 0
             Height = 0
             Duration = 0
-            Thumb = None
+            Thumbnail = None
             MimeType = None
             FileSize = None
         }
@@ -172,7 +168,7 @@ let private messageWithVideoNote =
             FileUniqueId = fileId1
             Length = 0
             Duration = 0
-            Thumb = None
+            Thumbnail = None
             FileSize = None
         }
     }

Emulsion.Web/Emulsion.Web.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

Emulsion/Emulsion.fsproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <Version>2.4.2</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>2.4.3</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Logging.fs" />