From c0ea57e9b1ccf09df5cfe024b29815cae2f36bbf Mon Sep 17 00:00:00 2001
From: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
Date: Tue, 13 Feb 2024 19:13:38 +0200
Subject: [PATCH] Shorten error messages for when attempting to export a period
with no messages (#1201)
---
.../Exporting/ChannelExporter.cs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/DiscordChatExporter.Core/Exporting/ChannelExporter.cs b/DiscordChatExporter.Core/Exporting/ChannelExporter.cs
index dc60c1dc..805e6b56 100644
--- a/DiscordChatExporter.Core/Exporting/ChannelExporter.cs
+++ b/DiscordChatExporter.Core/Exporting/ChannelExporter.cs
@@ -20,8 +20,8 @@ public class ChannelExporter(DiscordClient discord)
if (request.Channel.Kind == ChannelKind.GuildForum)
{
throw new DiscordChatExporterException(
- $"Channel '{request.Channel.Name}' (#{request.Channel.Id}) "
- + $"of guild '{request.Guild.Name}' (#{request.Guild.Id}) "
+ $"Channel '{request.Channel.Name}' "
+ + $"of guild '{request.Guild.Name}' "
+ $"is a forum and cannot be exported directly. "
+ "You need to pull its threads and export them individually."
);
@@ -31,8 +31,8 @@ public class ChannelExporter(DiscordClient discord)
if (request.Channel.IsEmpty)
{
throw new DiscordChatExporterException(
- $"Channel '{request.Channel.Name}' (#{request.Channel.Id}) "
- + $"of guild '{request.Guild.Name}' (#{request.Guild.Id}) "
+ $"Channel '{request.Channel.Name}' "
+ + $"of guild '{request.Guild.Name}' "
+ $"does not contain any messages."
);
}
@@ -41,8 +41,8 @@ public class ChannelExporter(DiscordClient discord)
if (request.After is not null && !request.Channel.MayHaveMessagesAfter(request.After.Value))
{
throw new DiscordChatExporterException(
- $"Channel '{request.Channel.Name}' (#{request.Channel.Id}) "
- + $"of guild '{request.Guild.Name}' (#{request.Guild.Id}) "
+ $"Channel '{request.Channel.Name}' "
+ + $"of guild '{request.Guild.Name}' "
+ $"does not contain any messages within the specified period."
);
}
@@ -54,8 +54,8 @@ public class ChannelExporter(DiscordClient discord)
)
{
throw new DiscordChatExporterException(
- $"Channel '{request.Channel.Name}' (#{request.Channel.Id}) "
- + $"of guild '{request.Guild.Name}' (#{request.Guild.Id}) "
+ $"Channel '{request.Channel.Name}' "
+ + $"of guild '{request.Guild.Name}' "
+ $"does not contain any messages within the specified period."
);
}