quality logging

Turbulence.Core/ViewModels/Design/DesignLogViewModel.cs

@@ -0,0 +1,19 @@
+namespace Turbulence.Core.ViewModels.Design
+{
+    public class DesignLogViewModel : LogViewModel
+    {
+        public DesignLogViewModel()
+        {
+            Logs.AddRange(new string[]
+            {
+                "[CDN] Request 1",
+                "[API] Request 2",
+            });
+        }
+
+        public override void Refresh()
+        {
+            Logs.Add($"[REFRESH] New Request {Logs.Count}");
+        }
+    }
+}

Turbulence.Core/ViewModels/LogViewModel.cs

@@ -0,0 +1,22 @@
+using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.Input;
+using Turbulence.Discord.Services;
+
+namespace Turbulence.Core.ViewModels;
+
+public partial class LogViewModel : ViewModelBase
+{
+    private readonly ILogger _logger = Ioc.Default.GetService<ILogger>()!;
+    public ObservableList<string> Logs { get; } = new();
+
+    public LogViewModel()
+    {
+        Refresh();
+    }
+
+    [RelayCommand]
+    public virtual void Refresh()
+    {
+        Logs.ReplaceAll(_logger.GetLogs());
+    }
+}

Turbulence.Desktop/LogWindow.axaml

@@ -0,0 +1,32 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:Turbulence.Core.ViewModels;assembly=Turbulence.Core"
+        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="500"
+        Width="600" Height="500"
+        MinWidth="600" MinHeight="500"
+        WindowStartupLocation="CenterOwner"
+        x:Class="Turbulence.Desktop.LogWindow"
+        x:DataType="vm:LogViewModel"
+        Title="Logs"
+        Background="#313338">
+    <Window.DataContext>
+        <vm:LogViewModel />
+    </Window.DataContext>
+    <DockPanel>
+        <Menu DockPanel.Dock="Top" Background="#23272A">
+            <MenuItem Header="Refresh" Command="{Binding RefreshCommand}" />
+            <!--TODO: add filter-->
+        </Menu>
+        <ScrollViewer>
+            <ItemsControl ItemsSource="{Binding Logs}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding .}" />
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+    </DockPanel>
+</Window>

Turbulence.Desktop/LogWindow.axaml.cs

@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Turbulence.Core.ViewModels.Design;
+
+namespace Turbulence.Desktop;
+
+public partial class LogWindow : Window
+{
+    public LogWindow()
+    {
+        InitializeComponent();
+        if (Design.IsDesignMode)
+        {
+            // Workaround to fix design data context getting overwritten
+            DataContext = new DesignLogViewModel();
+        }
+    }
+}

Turbulence.Desktop/MainWindow.axaml

@@ -14,10 +14,11 @@
         <vm:MainWindowViewModel />
     </Window.DataContext>
     <DockPanel>
-        <Menu DockPanel.Dock="Top" Background="#23272a">
+        <Menu DockPanel.Dock="Top" Background="#23272A">
             <MenuItem Header="_File">
                 <MenuItem Header="_Connect" Click="OnConnect" />
                 <MenuItem Header="_Settings" Click="OnSettings" />
+                <MenuItem Header="_Open Logs" Click="OnLogs" />
                 <MenuItem Header="_Open Dev Tools" Click="OnDevTools" IsVisible="{Binding IsDebug}" />
                 <Separator />
                 <MenuItem Header="_Exit" Click="OnExit" />

Turbulence.Desktop/MainWindow.axaml.cs

@@ -10,6 +10,7 @@ namespace Turbulence.Desktop;
 public partial class MainWindow : Window
 {
     private SettingsWindow? _settingsWindow;
+    private LogWindow? _logWindow;
     private MainWindowViewModel _vm;
     public MainWindow()
     {
@@ -29,6 +30,13 @@ public async void OnSettings(object? _1, RoutedEventArgs _2)
         _settingsWindow = new SettingsWindow();
         await _settingsWindow.ShowDialog(this);
     }
+
+    public async void OnLogs(object? _1, RoutedEventArgs _2)
+    {
+        // TODO: instead show as a independent window?
+        _logWindow = new LogWindow();
+        await _logWindow.ShowDialog(this);
+    }
 
     public void OnDevTools(object? _1, RoutedEventArgs _2)
     {

Turbulence.Desktop/Program.axaml.cs

@@ -31,6 +31,7 @@ private static AppBuilder BuildAvaloniaApp()
                 .AddSingleton<IPlatformClient, Client>()
                 .AddSingleton<ICache, Cache>()
                 .AddSingleton<ITypingStorage, TypingStorage>()
+                .AddSingleton<ILogger, Logger>()
                 .BuildServiceProvider();
         Ioc.Default.ConfigureServices(provider);
 

Turbulence.Desktop/SettingsWindow.axaml.cs

@@ -1,12 +1,11 @@
 using Avalonia.Controls;
 
-namespace Turbulence.Desktop
+namespace Turbulence.Desktop;
+
+public partial class SettingsWindow : Window
 {
-    public partial class SettingsWindow : Window
+    public SettingsWindow()
     {
-        public SettingsWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }

Turbulence.Discord/Api.cs

@@ -8,7 +8,6 @@
 using Turbulence.Discord.Models.DiscordGateway;
 using Turbulence.Discord.Models.DiscordGuild;
 using Turbulence.Discord.Models.DiscordUser;
-using Turbulence.Discord.Services;
 
 namespace Turbulence.Discord;
 

Turbulence.Discord/Client.cs

@@ -40,6 +40,8 @@ public class Client : IPlatformClient
         private static readonly HttpClient CdnClient = new();
 
         private readonly ICache _cache = Ioc.Default.GetService<ICache>()!;
+        private readonly ILogger? _logger = Ioc.Default.GetService<ILogger>();
+
         private ClientWebSocket WebSocket { get; set; }
         private const string UserAgent = "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/116.0"; // idk where to move this
 
@@ -441,7 +443,8 @@ public async Task<byte[]> GetAvatarAsync(User user, int size = 128)
             {
                 avatar = await Api.GetAvatarAsync(CdnClient, user, size);
             }
-
+            _logger?.Log($"[CDN] Requested avatar for user {user.Id}");
+
             _cache.SetAvatar(user.Id, size, avatar);
             return avatar;
         }
@@ -455,7 +458,8 @@ public async Task<byte[]> GetEmojiAsync(Emoji emoji, int size = 32)
                 return img;
 
             img = await Api.GetEmojiAsync(CdnClient, emoji, size);
-
+            _logger?.Log($"[CDN] Requested emoji with ID {emoji.Id}");
+
             _cache.SetEmoji(emoji.Id, size, img);
             return img;
         }

Turbulence.Discord/Services/Logger.cs

@@ -0,0 +1,26 @@
+namespace Turbulence.Discord.Services;
+
+public interface ILogger
+{
+    public void Log(string message);
+    public IEnumerable<string> GetLogs();
+}
+
+
+public class Logger : ILogger
+{
+    //TODO: add logging severity/level
+    //TODO: add logging type
+    //TODO: add timestamp
+    private readonly List<string> _log = new();
+
+    public IEnumerable<string> GetLogs()
+    {
+        return _log;
+    }
+
+    public void Log(string message)
+    {
+        _log.Add(message);
+    }
+}