From 4efa6094dc26a0b8a8315cdcbde3d6add571d4e2 Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Sat, 29 Jul 2023 20:47:36 +0300
Subject: [PATCH] Round up the "call lasted for X minutes" value
---
.../Exporting/MessageGroupTemplate.cshtml | 3 ++-
.../Exporting/PlainTextMessageExtensions.cs | 11 +++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml b/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml
index 661bd13a..3a72cd8f 100644
--- a/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml
+++ b/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml
@@ -1,5 +1,6 @@
@using System
@using System.Collections.Generic
+@using System.Globalization
@using System.Linq
@using System.Threading.Tasks
@using DiscordChatExporter.Core.Discord.Data
@@ -99,7 +100,7 @@
}
else if (message.Kind == MessageKind.Call)
{
- started a call that lasted @(((message.CallEndedTimestamp ?? message.Timestamp) - message.Timestamp).TotalMinutes) minutes
+ started a call that lasted @(((message.CallEndedTimestamp ?? message.Timestamp) - message.Timestamp).TotalMinutes.ToString("n0", CultureInfo.InvariantCulture)) minutes
}
else if (message.Kind == MessageKind.ChannelNameChange)
{
diff --git a/DiscordChatExporter.Core/Exporting/PlainTextMessageExtensions.cs b/DiscordChatExporter.Core/Exporting/PlainTextMessageExtensions.cs
index 2f172457..405f3dba 100644
--- a/DiscordChatExporter.Core/Exporting/PlainTextMessageExtensions.cs
+++ b/DiscordChatExporter.Core/Exporting/PlainTextMessageExtensions.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Globalization;
+using System.Linq;
using DiscordChatExporter.Core.Discord.Data;
using DiscordChatExporter.Core.Utils.Extensions;
@@ -19,7 +20,13 @@ internal static class PlainTextMessageExtensions
: "Removed a recipient.",
MessageKind.Call =>
- $"Started a call that lasted {message.CallEndedTimestamp?.Pipe(t => t - message.Timestamp).Pipe(t => (int)t.TotalMinutes) ?? 0} minutes.",
+ $"Started a call that lasted {
+ message
+ .CallEndedTimestamp?
+ .Pipe(t => t - message.Timestamp)
+ .Pipe(t => t.TotalMinutes)
+ .ToString("n0", CultureInfo.InvariantCulture) ?? "0"
+ } minutes.",
MessageKind.ChannelNameChange =>
!string.IsNullOrWhiteSpace(message.Content)