Update version

Fixes #137

Changelog.md

@@ -1,3 +1,7 @@
+### v2.9.1 (10-Feb-2019)
+
+- Fixed an issue where some of the last messages in a channel would sometimes not get exported.
+
 ### v2.9 (09-Feb-2019)
 
 - Added categories to channel list in GUI. Channels are now also grouped by category.

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net461</TargetFramework>
-        <Version>2.9</Version>
+        <Version>2.9.1</Version>
         <Company>Tyrrrz</Company>
         <Copyright>Copyright (c) 2017-2018 Alexey Golub</Copyright>
         <ApplicationIcon>..\favicon.ico</ApplicationIcon>

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net461</TargetFramework>
-        <Version>2.9</Version>
+        <Version>2.9.1</Version>
     </PropertyGroup>
 
     <ItemGroup>

DiscordChatExporter.Core/Services/DataService.cs

@@ -41,10 +41,15 @@ namespace DiscordChatExporter.Core.Services
                         : new AuthenticationHeaderValue(token.Value);
 
                     // Add parameters
-                    foreach (var parameter in parameters)
+                    foreach (var parameter in parameters.ExceptBlank())
                     {
                         var key = parameter.SubstringUntil("=");
                         var value = parameter.SubstringAfter("=");
+
+                        // Skip empty values
+                        if (value.IsBlank())
+                            continue;
+
                         request.RequestUri = request.RequestUri.SetQueryParameter(key, value);
                     }
 
@@ -123,13 +128,9 @@ namespace DiscordChatExporter.Core.Services
         {
             var result = new List<Message>();
 
-            // Get the snowflakes for the selected range
-            var firstId = from != null ? from.Value.ToSnowflake() : "0";
-            var lastId = to != null ? to.Value.ToSnowflake() : DateTime.MaxValue.ToSnowflake();
-
             // Get the last message
             var response = await GetApiResponseAsync(token, "channels", $"{channelId}/messages",
-                "limit=1", $"before={lastId}");
+                "limit=1", $"before={to?.ToSnowflake()}");
             var lastMessage = response.Select(ParseMessage).FirstOrDefault();
 
             // If the last message doesn't exist or it's outside of range - return
@@ -140,7 +141,7 @@ namespace DiscordChatExporter.Core.Services
             }
 
             // Get other messages
-            var offsetId = firstId;
+            var offsetId = from?.ToSnowflake() ?? "0";
             while (true)
             {
                 // Get message batch

DiscordChatExporter.Gui/Properties/AssemblyInfo.cs

@@ -3,5 +3,5 @@
 [assembly: AssemblyTitle("DiscordChatExporter")]
 [assembly: AssemblyCompany("Tyrrrz")]
 [assembly: AssemblyCopyright("Copyright (c) 2017-2018 Alexey Golub")]
-[assembly: AssemblyVersion("2.9")]
+[assembly: AssemblyVersion("2.9.1")]
-[assembly: AssemblyFileVersion("2.9")]
+[assembly: AssemblyFileVersion("2.9.1")]