From 659c499bd0444daba8a7e868d376d1868eab2282 Mon Sep 17 00:00:00 2001
From: Oleksii Holub <Oleksii.Holub@3shape.com>
Date: Fri, 1 Feb 2019 15:33:06 +0200
Subject: [PATCH] Small clenaup

---
 .../ViewModels/Components/ChannelViewModel.cs              | 7 ++++++-
 .../ViewModels/Components/GuildViewModel.cs                | 7 ++++++-
 .../ViewModels/Dialogs/ExportSetupViewModel.cs             | 2 +-
 DiscordChatExporter.Gui/ViewModels/RootViewModel.cs        | 4 ++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/DiscordChatExporter.Gui/ViewModels/Components/ChannelViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Components/ChannelViewModel.cs
index dd0230fd..f92786b7 100644
--- a/DiscordChatExporter.Gui/ViewModels/Components/ChannelViewModel.cs
+++ b/DiscordChatExporter.Gui/ViewModels/Components/ChannelViewModel.cs
@@ -3,10 +3,15 @@ using Stylet;
 
 namespace DiscordChatExporter.Gui.ViewModels.Components
 {
-    public class ChannelViewModel : PropertyChangedBase
+    public partial class ChannelViewModel : PropertyChangedBase
     {
         public Channel Model { get; set; }
 
         public string Category { get; set; }
     }
+
+    public partial class ChannelViewModel
+    {
+        public static implicit operator Channel(ChannelViewModel viewModel) => viewModel.Model;
+    }
 }
\ No newline at end of file
diff --git a/DiscordChatExporter.Gui/ViewModels/Components/GuildViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Components/GuildViewModel.cs
index 40949c00..f5c04480 100644
--- a/DiscordChatExporter.Gui/ViewModels/Components/GuildViewModel.cs
+++ b/DiscordChatExporter.Gui/ViewModels/Components/GuildViewModel.cs
@@ -4,10 +4,15 @@ using Stylet;
 
 namespace DiscordChatExporter.Gui.ViewModels.Components
 {
-    public class GuildViewModel : PropertyChangedBase
+    public partial class GuildViewModel : PropertyChangedBase
     {
         public Guild Model { get; set; }
 
         public IReadOnlyList<ChannelViewModel> Channels { get; set; }
     }
+
+    public partial class GuildViewModel
+    {
+        public static implicit operator Guild(GuildViewModel viewModel) => viewModel.Model;
+    }
 }
\ No newline at end of file
diff --git a/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs
index 8f3ecc87..9bee0a98 100644
--- a/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs
+++ b/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs
@@ -60,7 +60,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
                 To = From;
 
             // Generate default file name
-            var defaultFileName = ExportHelper.GetDefaultExportFileName(SelectedFormat, Guild.Model, Channel.Model, From, To);
+            var defaultFileName = ExportHelper.GetDefaultExportFileName(SelectedFormat, Guild, Channel, From, To);
 
             // Prompt for output file path
             var ext = SelectedFormat.GetFileExtension();
diff --git a/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs b/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
index 64c7926d..61b6539f 100644
--- a/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
+++ b/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
@@ -260,8 +260,8 @@ namespace DiscordChatExporter.Gui.ViewModels
                 var progressHandler = new Progress<double>(p => Progress = p);
 
                 // Get chat log
-                var chatLog = await _dataService.GetChatLogAsync(token, dialog.Guild.Model, dialog.Channel.Model,
-                    dialog.From, dialog.To, progressHandler);
+                var chatLog = await _dataService.GetChatLogAsync(token, dialog.Guild, dialog.Channel, dialog.From,
+                    dialog.To, progressHandler);
 
                 // Export
                 _exportService.ExportChatLog(chatLog, dialog.FilePath, dialog.SelectedFormat,