From e22e1c03fb7a214116f36d85259a0395197094c6 Mon Sep 17 00:00:00 2001
From: Oleksii Holub <Oleksii.Holub@3shape.com>
Date: Wed, 19 Dec 2018 17:15:54 +0200
Subject: [PATCH] Cleanup

---
 DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs |  6 ++++--
 DiscordChatExporter.Cli/Verbs/GetChannelsVerb.cs |  7 ++++---
 .../Verbs/GetDirectMessageChannelsVerb.cs        |  5 ++++-
 DiscordChatExporter.Cli/Verbs/GetGuildsVerb.cs   |  5 ++++-
 .../ViewModels/RootViewModel.cs                  | 16 +++++++++++-----
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs b/DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs
index 95daf9d..da7d6ea 100644
--- a/DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs
+++ b/DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs
@@ -34,9 +34,11 @@ namespace DiscordChatExporter.Cli.Verbs
             // Get channels
             var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId);
 
+            // Filter and order channels
+            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
+
             // Loop through channels
-            foreach (var channel in channels.Where(c => c.Type.IsEither(ChannelType.GuildTextChat))
-                .OrderBy(c => c.Name))
+            foreach (var channel in channels)
             {
                 try
                 {
diff --git a/DiscordChatExporter.Cli/Verbs/GetChannelsVerb.cs b/DiscordChatExporter.Cli/Verbs/GetChannelsVerb.cs
index 69e7ed8..fff1561 100644
--- a/DiscordChatExporter.Cli/Verbs/GetChannelsVerb.cs
+++ b/DiscordChatExporter.Cli/Verbs/GetChannelsVerb.cs
@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Verbs.Options;
 using DiscordChatExporter.Core.Models;
 using DiscordChatExporter.Core.Services;
-using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Cli.Verbs
 {
@@ -23,9 +22,11 @@ namespace DiscordChatExporter.Cli.Verbs
             // Get channels
             var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId);
 
+            // Filter and order channels
+            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
+
             // Print result
-            foreach (var channel in channels.Where(c => c.Type.IsEither(ChannelType.GuildTextChat))
-                .OrderBy(c => c.Name))
+            foreach (var channel in channels)
                 Console.WriteLine($"{channel.Id} | {channel.Name}");
         }
     }
diff --git a/DiscordChatExporter.Cli/Verbs/GetDirectMessageChannelsVerb.cs b/DiscordChatExporter.Cli/Verbs/GetDirectMessageChannelsVerb.cs
index 6731d01..9c78d93 100644
--- a/DiscordChatExporter.Cli/Verbs/GetDirectMessageChannelsVerb.cs
+++ b/DiscordChatExporter.Cli/Verbs/GetDirectMessageChannelsVerb.cs
@@ -21,8 +21,11 @@ namespace DiscordChatExporter.Cli.Verbs
             // Get channels
             var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken());
 
+            // Order channels
+            channels = channels.OrderBy(c => c.Name).ToArray();
+
             // Print result
-            foreach (var channel in channels.OrderBy(c => c.Name))
+            foreach (var channel in channels)
                 Console.WriteLine($"{channel.Id} | {channel.Name}");
         }
     }
diff --git a/DiscordChatExporter.Cli/Verbs/GetGuildsVerb.cs b/DiscordChatExporter.Cli/Verbs/GetGuildsVerb.cs
index 79fa4ad..fe57c24 100644
--- a/DiscordChatExporter.Cli/Verbs/GetGuildsVerb.cs
+++ b/DiscordChatExporter.Cli/Verbs/GetGuildsVerb.cs
@@ -21,8 +21,11 @@ namespace DiscordChatExporter.Cli.Verbs
             // Get guilds
             var guilds = await dataService.GetUserGuildsAsync(Options.GetToken());
 
+            // Order guilds
+            guilds = guilds.OrderBy(g => g.Name).ToArray();
+
             // Print result
-            foreach (var guild in guilds.OrderBy(g => g.Name))
+            foreach (var guild in guilds)
                 Console.WriteLine($"{guild.Id} | {guild.Name}");
         }
     }
diff --git a/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs b/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
index b37ab96..fd0d57b 100644
--- a/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
+++ b/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
@@ -137,9 +137,13 @@ namespace DiscordChatExporter.Gui.ViewModels
 
                 // Get DM channels
                 {
-                    var channels = await _dataService.GetDirectMessageChannelsAsync(token);
                     var guild = Guild.DirectMessages;
-                    _guildChannelsMap[guild] = channels.OrderBy(c => c.Name).ToArray();
+                    var channels = await _dataService.GetDirectMessageChannelsAsync(token);
+
+                    // Order channels
+                    channels = channels.OrderBy(c => c.Name).ToArray();
+
+                    _guildChannelsMap[guild] = channels;
                 }
 
                 // Get guild channels
@@ -148,9 +152,11 @@ namespace DiscordChatExporter.Gui.ViewModels
                     foreach (var guild in guilds)
                     {
                         var channels = await _dataService.GetGuildChannelsAsync(token, guild.Id);
-                        _guildChannelsMap[guild] = channels.Where(c => c.Type == ChannelType.GuildTextChat)
-                            .OrderBy(c => c.Name)
-                            .ToArray();
+
+                        // Filter and order channels
+                        channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
+
+                        _guildChannelsMap[guild] = channels;
                     }
                 }