Refactor IsTextChannel and IsVoiceChannel to extensions

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -33,7 +33,7 @@ public class ExportAllCommand : ExportCommandBase
             await foreach (var channel in Discord.GetGuildChannelsAsync(guild.Id, cancellationToken))
             {
                 // Skip non-text channels
-                if (!channel.IsTextChannel)
+                if (!channel.Kind.IsText())
                     continue;
 
                 channels.Add(channel);

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -19,7 +19,7 @@ public class ExportDirectMessagesCommand : ExportCommandBase
 
         await console.Output.WriteLineAsync("Fetching channels...");
         var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id, cancellationToken);
-        var textChannels = channels.Where(c => c.IsTextChannel).ToArray();
+        var textChannels = channels.Where(c => c.Kind.IsText()).ToArray();
 
         await base.ExecuteAsync(console, textChannels);
     }

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -4,6 +4,7 @@ using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands;
@@ -27,7 +28,7 @@ public class ExportGuildCommand : ExportCommandBase
 
         await console.Output.WriteLineAsync("Fetching channels...");
         var channels = await Discord.GetGuildChannelsAsync(GuildId, cancellationToken);
-        var textChannels = channels.Where(c => c.IsTextChannel).ToArray();
+        var textChannels = channels.Where(c => c.Kind.IsText()).ToArray();
 
         await base.ExecuteAsync(console, textChannels);
     }

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -5,6 +5,7 @@ using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands;
@@ -27,7 +28,7 @@ public class GetChannelsCommand : TokenCommandBase
         var channels = await Discord.GetGuildChannelsAsync(GuildId, cancellationToken);
 
         var textChannels = channels
-            .Where(c => c.IsTextChannel)
+            .Where(c => c.Kind.IsText())
             .OrderBy(c => c.Category.Position)
             .ThenBy(c => c.Name)
             .ToArray();

DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs

@@ -19,7 +19,7 @@ public class GetDirectMessageChannelsCommand : TokenCommandBase
         var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id, cancellationToken);
 
         var textChannels = channels
-            .Where(c => c.IsTextChannel)
+            .Where(c => c.Kind.IsText())
             .OrderBy(c => c.Category.Position)
             .ThenBy(c => c.Name)
             .ToArray();

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -14,17 +14,8 @@ public partial record Channel(
     ChannelCategory Category,
     string Name,
     int? Position,
-    string? Topic) : IHasId
+    string? Topic
-{
+) : IHasId;
-    public bool IsTextChannel => Kind is
-        ChannelKind.GuildTextChat or
-        ChannelKind.DirectTextChat or
-        ChannelKind.DirectGroupTextChat or
-        ChannelKind.GuildNews or
-        ChannelKind.GuildStore;
-
-    public bool IsVoiceChannel => !IsTextChannel;
-}
 
 public partial record Channel
 {

DiscordChatExporter.Core/Discord/Data/ChannelKind.cs

@@ -12,3 +12,16 @@ public enum ChannelKind
     GuildNews,
     GuildStore
 }
+
+public static class ChannelKindExtensions
+{
+    public static bool IsText(this ChannelKind kind) => kind is
+        ChannelKind.GuildTextChat or
+        ChannelKind.DirectTextChat or
+        ChannelKind.DirectGroupTextChat or
+        ChannelKind.GuildNews or
+        ChannelKind.GuildStore;
+
+    public static bool IsVoice(this ChannelKind kind) => kind is
+        ChannelKind.GuildVoiceChat;
+}

DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs

@@ -158,7 +158,7 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
         else if (mention.Kind == MentionKind.Channel)
         {
             var channel = mention.TargetId?.Pipe(_context.TryGetChannel);
-            var symbol = channel?.IsVoiceChannel == true ? "🔊" : "#";
+            var symbol = channel?.Kind.IsVoice() == true ? "🔊" : "#";
             var name = channel?.Name ?? "deleted-channel";
 
             _buffer

DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/PlainTextMarkdownVisitor.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
@@ -58,7 +59,7 @@ internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
             _buffer.Append($"#{name}");
 
             // Voice channel marker
-            if (channel?.IsVoiceChannel == true)
+            if (channel?.Kind.IsVoice() == true)
                 _buffer.Append(" [voice]");
         }
         else if (mention.Kind == MentionKind.Role)

DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs

@@ -105,7 +105,7 @@ public class DashboardViewModel : PropertyChangedBase
             await foreach (var guild in discord.GetUserGuildsAsync())
             {
                 var channels = await discord.GetGuildChannelsAsync(guild.Id);
-                guildChannelMap[guild] = channels.Where(c => c.IsTextChannel).ToArray();
+                guildChannelMap[guild] = channels.Where(c => c.Kind.IsText()).ToArray();
             }
 
             _discord = discord;