Cleanup

Mainly on Language because that was a *mess* (Still is but not something that will hunt my dreams...)

Author: Azyyyyyy

src/MultiRPC/Assets/Language/en-gb.json

@@ -257,5 +257,8 @@
   "FailedToGetOldProfiles": "We failed to get your profiles from V5!",
   "FailedToGetOldData": "We failed to get your configuration and profiles from V5!",
   "AcrylicEffect": "Acrylic effect",
-  "ButtonWarn": "We see that you added buttons to your rich presence (nice choice btw ;P)\r\nHere's your notice that in discord's desktop client, your own buttons will not be clickable but others users will be able to just fine :D"
+  "ButtonWarn": "We see that you added buttons to your rich presence (nice choice btw ;P)\r\nHere's your notice that in discord's desktop client, your own buttons will not be clickable but others users will be able to just fine :D",
+  "UnknownValidationReason": "Unknown validation reason",
+  "Profile": "Profile",
+  "MultiRPCThemes": "MultiRPC Themes"
 }

src/MultiRPC/Commands/TrayCommand.cs

@@ -6,13 +6,13 @@
 
 namespace MultiRPC.Commands;
 
-class TrayCommand : ICommand
+internal class TrayCommand : ICommand
 {
     public bool CanExecute(object? _) => true;
 
     public void Execute(object? _)
     {
-        var mainWin = ((App)Application.Current).DesktopLifetime!.MainWindow!;
+        var mainWin = App.MainWindow;
         switch (mainWin.WindowState)
         {
             case WindowState.Normal:

src/MultiRPC/ControlValidation.cs

@@ -50,7 +50,7 @@ public string Result
                 return;
             }
 
-            var error = check?.ReasonWhy ?? "Unknown validation reason";
+            var error = check?.ReasonWhy ?? Language.GetText(LanguageText.UnknownValidationReason);
             _logging.Error(error);
             throw new DataValidationException(error);
         }

src/MultiRPC/Theming/JsonConverter/ColourJsonConverter.cs renamed to src/MultiRPC/Converters/ColourJsonConverter.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Globalization;
 using System.Text.Json;
-using Avalonia.Media;
 using System.Text.Json.Serialization;
+using Avalonia.Media;
 
-namespace MultiRPC.Theming.JsonConverter;
+namespace MultiRPC.Converters;
 
 public class ColourJsonConverter : JsonConverter<Color>
 {
@@ -13,14 +13,14 @@ public override Color Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe
         var s = reader.GetString();
         if (string.IsNullOrWhiteSpace(s))
         {
-            throw new Exception();
+            throw new JsonException("We should of been given an string when reading the colour!");
         }
 
         return Color.FromArgb(byte.Parse(s[1..3], NumberStyles.HexNumber), byte.Parse(s[3..5], NumberStyles.HexNumber), byte.Parse(s[5..7], NumberStyles.HexNumber), byte.Parse(s[7..9], NumberStyles.HexNumber));
     }
 
     public override void Write(Utf8JsonWriter writer, Color value, JsonSerializerOptions options)
     {
-        writer.WriteStringValue($"#{value.ToUint32():x8}");
+        writer.WriteStringValue("#" + value.ToUint32().ToString(":x8"));
     }
 }

src/MultiRPC/Converters/StatusConverter.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Runtime.Serialization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using MultiRPC.Discord;
+
+namespace MultiRPC.Converters;
+
+public class StatusConverter : JsonConverter<DiscordStatus>
+{
+    public override DiscordStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var status = reader.GetString();
+        return status switch
+        {
+            "operational" => DiscordStatus.Operational,
+            "degraded_performance" => DiscordStatus.Degraded,
+            "partial_outage" => DiscordStatus.PartialOutage,
+            "major_outage" => DiscordStatus.MajorOutage,
+            _ => throw new InvalidDataContractException()
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, DiscordStatus value, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
+    }
+}

src/MultiRPC/Theming/JsonConverter/VersionJsonConverter.cs renamed to src/MultiRPC/Converters/VersionJsonConverter.cs

@@ -4,7 +4,7 @@
 using System.Text.Json.Serialization;
 using SemVersion;
 
-namespace MultiRPC.Theming.JsonConverter;
+namespace MultiRPC.Converters;
 
 public class VersionJsonConverter : JsonConverter<SemanticVersion>
 {
@@ -15,10 +15,10 @@ public class VersionJsonConverter : JsonConverter<SemanticVersion>
             var versionS = reader.GetString();
             if (string.IsNullOrWhiteSpace(versionS))
             {
-                throw new Exception();
+                throw new JsonException("We was given an empty string when reading the version!");
             }
 
-            //This allows us to use Version strings nicely
+            //This allows us to use Version strings in a way that work for us
             var lastDot = versionS.LastIndexOf('.');
             if (versionS.Count(x => x == '.') == 3)
             {
@@ -29,12 +29,12 @@ public class VersionJsonConverter : JsonConverter<SemanticVersion>
             {
                 return version;
             }
-            throw new Exception();
+            throw new JsonException("Wasn't able to make an SemanticVersion out of the string given! (" + versionS + ")");
         }
 
         if (reader.TokenType != JsonTokenType.StartObject)
         {
-            throw new Exception();
+            throw new JsonException("We haven't been given an old styled version!");
         }
         reader.Read();
 

src/MultiRPC/Discord/DiscordStatusChecker.cs

@@ -1,7 +1,5 @@
-using System.Net.Http;
-using System.Net.Http.Json;
+using System.Net.Http.Json;
 using System.Threading.Tasks;
-using MultiRPC.Discord.Status;
 using MultiRPC.Extensions;
 using MultiRPC.UI;
 
@@ -19,22 +17,13 @@ public static class DiscordStatusChecker
 {
     public static async Task<DiscordStatus> GetStatus()
     {
-        var response = await App.HttpClient.GetResponseMessage("https://discordstatus.com/api/v2/components.json");
+        var response = await App.HttpClient.GetResponseMessageAsync("https://discordstatus.com/api/v2/components.json");
         if (response is null || !response.IsSuccessStatusCode)
         {
             return DiscordStatus.MajorOutage;
         }
 
-        var data = await response.Content.ReadFromJsonAsync(DataContext.Default.Data);
-        var status = data?.Components[0].Status switch
-        {
-            "operational" => DiscordStatus.Operational,
-            "degraded_performance" => DiscordStatus.Degraded,
-            "partial_outage" => DiscordStatus.PartialOutage,
-            "major_outage" => DiscordStatus.MajorOutage,
-            _ => DiscordStatus.MajorOutage
-        };
-
-        return status;
+        var data = await response.Content.ReadFromJsonAsync(StatusContext.Default.Status);
+        return data?.Components[0].Status ?? DiscordStatus.MajorOutage;
     }
 }

src/MultiRPC/Discord/IDChecker.cs

@@ -19,7 +19,7 @@ public static class IDChecker
     public static async Task<(bool Successful, string? ResultMessage)> Check(long id) 
     {
         var responseMessage =
-            await App.HttpClient.GetResponseMessage($"https://discordapp.com/api/v6/oauth2/applications/{id}/rpc");
+            await App.HttpClient.GetResponseMessageAsync($"https://discordapp.com/api/v6/oauth2/applications/{id}/rpc");
 
         if (responseMessage is null or { IsSuccessStatusCode: false })
         {

src/MultiRPC/Discord/ProfileAssetsManager.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -43,18 +42,9 @@ public static ProfileAssetsManager GetOrAddManager(long id)
 
     public DiscordAsset[]? GetAssets()
     {
-        HttpResponseMessage response;
-        try
-        {
-            response = App.HttpClient.Send(new HttpRequestMessage(HttpMethod.Get, _baseUrl));
-            if (response is not { IsSuccessStatusCode: true })
-            {
-                return null;
-            }
-        }
-        catch (Exception e)
+        var response = App.HttpClient.GetResponseMessage(_baseUrl);
+        if (response is not { IsSuccessStatusCode: true })
         {
-            //TODO: Log
             return null;
         }
 
@@ -69,7 +59,7 @@ public static ProfileAssetsManager GetOrAddManager(long id)
             return _lazyAssets.Value;
         }
 
-        var response = await App.HttpClient.GetResponseMessage(_baseUrl);
+        var response = await App.HttpClient.GetResponseMessageAsync(_baseUrl);
         if (response is not { IsSuccessStatusCode: true })
         {
             return null;

src/MultiRPC/Discord/Status/Component.cs renamed to src/MultiRPC/Discord/Status.cs

@@ -1,8 +1,9 @@
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 #pragma warning disable CS8618
-
 using System.Text.Json.Serialization;
-namespace MultiRPC.Discord.Status;
+using MultiRPC.Converters;
+
+namespace MultiRPC.Discord;
 
 /*public class Page
 {
@@ -30,8 +31,8 @@ public class Component
     [JsonPropertyName("name")]
     public string Name { get; init; }*/
 
-    [JsonPropertyName("status")]
-    public string Status { get; set; }
+    [JsonPropertyName("status"), JsonConverter(typeof(StatusConverter))]
+    public DiscordStatus Status { get; set; }
 
     /*[JsonPropertyName("created_at")]
     public DateTime CreatedAt { get; init; }
@@ -67,7 +68,7 @@ public class Component
     public string[] Components { get; init; }*/
 }
 
-public class Data
+public class Status
 {
     //[JsonPropertyName("page")]
     //public Page Page { get; init; }
@@ -76,5 +77,5 @@ public class Data
     public Component[] Components { get; set; }
 }
 
-[JsonSerializable(typeof(Data))]
-public partial class DataContext : JsonSerializerContext { }
+[JsonSerializable(typeof(Status))]
+public partial class StatusContext : JsonSerializerContext { }