Merge pull request #13 from nullinside-development-group/feat/di

Feat/di

Author: ProgrammingByPermutation

src/TwitchStreamingTools/Services/AccountManager.cs

@@ -96,6 +96,7 @@ public void DeleteCredentials() {
     _twitchClient.TwitchUsername = null;
     CredentialsAreValid = false;
     TwitchUsername = null;
+    Configuration.Instance.WriteConfiguration();
 
     OnCredentialsChanged?.Invoke(null);
     OnCredentialsStatusChanged?.Invoke(false);

src/TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs

@@ -1,12 +1,14 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Reactive;
+using System.Threading.Tasks;
 
 using Nullinside.Api.Common.Twitch;
 
 using ReactiveUI;
 
 using TwitchLib.Client.Events;
+using TwitchLib.Client.Interfaces;
 
 using TwitchStreamingTools.Models;
 
@@ -20,6 +22,11 @@ public class ChatViewModel : PageViewModelBase, IDisposable {
   ///   The list of chat names selected in the list.
   /// </summary>
   private ObservableCollection<string> _selectedTwitchChatNames = [];
+  
+  /// <summary>
+  /// The twitch chat client.
+  /// </summary>
+  private ITwitchClientProxy _twitchClient;
 
   /// <summary>
   ///   The current position of the cursor for the text box showing our chat logs, increment to move down.
@@ -39,9 +46,11 @@ public class ChatViewModel : PageViewModelBase, IDisposable {
   /// <summary>
   ///   Initializes a new instance of the <see cref="ChatViewModel" /> class.
   /// </summary>
-  public ChatViewModel() {
+  public ChatViewModel(ITwitchClientProxy twitchClient) {
+    _twitchClient = twitchClient;
     foreach (string channel in Configuration.Instance.TwitchChats ?? []) {
       _selectedTwitchChatNames.Add(channel);
+      _twitchClient.AddMessageCallback(channel, OnChatMessage);
     }
 
     OnAddChat = ReactiveCommand.Create(() => {
@@ -52,22 +61,19 @@ public ChatViewModel() {
 
       _selectedTwitchChatNames.Remove(username);
       _selectedTwitchChatNames.Add(username);
-      TwitchClientProxy.Instance.AddMessageCallback(username, OnChatMessage).Wait();
+      _ = _twitchClient.AddMessageCallback(username, OnChatMessage);
 
       TwitchChatName = null;
       Configuration.Instance.TwitchChats = _selectedTwitchChatNames;
       Configuration.Instance.WriteConfiguration();
     });
 
-    OnRemoveChat = ReactiveCommand.Create<string>(s => {
-      _selectedTwitchChatNames.Remove(s);
-      // todo: disconnect from chat
+    OnRemoveChat = ReactiveCommand.Create<string>(channel => {
+      _selectedTwitchChatNames.Remove(channel);
+      _twitchClient.RemoveMessageCallback(channel, OnChatMessage);
       Configuration.Instance.TwitchChats = _selectedTwitchChatNames;
       Configuration.Instance.WriteConfiguration();
     });
-
-    TwitchClientProxy.Instance.AddInstanceCallback(OnNewTwitchClient);
-    OnNewTwitchClient(TwitchClientProxy.Instance);
   }
 
   /// <inheritdoc />
@@ -121,12 +127,6 @@ public void Dispose() {
     OnRemoveChat.Dispose();
   }
 
-  private void OnNewTwitchClient(TwitchClientProxy chatClient) {
-    foreach (string channel in _selectedTwitchChatNames) {
-      chatClient.AddMessageCallback(channel, OnChatMessage);
-    }
-  }
-
   private void OnChatMessage(OnMessageReceivedArgs msg) {
     if (_selectedTwitchChatNames.Count > 1) {
       TwitchChat = (TwitchChat + $"\n({msg.ChatMessage.Channel}) {msg.ChatMessage.Username}: {msg.ChatMessage.Message}").Trim();

src/TwitchStreamingTools/Views/MainWindow.axaml.cs

@@ -52,17 +52,17 @@ protected override void OnInitialized() {
         return;
       }
 
-      Dispatcher.UIThread.Post(async () => {
 #if !DEBUG
+      Dispatcher.UIThread.Post(async () => {
         var versionWindow = new NewVersionWindow {
           DataContext = new NewVersionWindowViewModel {
             LocalVersion = localVersion
           }
         };
 
         await versionWindow.ShowDialog(this);
-#endif
       });
+#endif
     });
   }
 }