Clean up some error producing code.

Author: Eauldane

Snowcloak/Configuration/Models/AutoRejectCombo.cs

@@ -1,4 +1,7 @@
+using System.Runtime.InteropServices;
+
 namespace Snowcloak.Configuration.Models;
 
 [Serializable]
+[StructLayout(LayoutKind.Sequential)]
 public readonly record struct AutoRejectCombo(byte Race, byte Clan, byte Gender);

Snowcloak/FileCache/FileCacheManager.cs

@@ -353,8 +353,6 @@ private long CalculateTextureVramUsage(string filePath)
 
             foreach (var entry in cleanedPaths)
             {
-                //_logger.LogDebug("Checking {path}", entry.Value);
-
                 if (dict.TryGetValue(entry.Value, out var entity))
                 {
                     var validatedCache = GetValidatedFileCache(entity);
@@ -483,7 +481,6 @@ private void AddHashedFile(FileCacheEntity fileCache)
 
         if (!entries.Exists(u => string.Equals(u.PrefixedFilePath, fileCache.PrefixedFilePath, StringComparison.OrdinalIgnoreCase)))
         {
-            //_logger.LogTrace("Adding to DB: {hash} => {path}", fileCache.Hash, fileCache.PrefixedFilePath);
             entries.Add(fileCache);
         }
     }
@@ -506,7 +503,6 @@ private void AddHashedFile(FileCacheEntity fileCache)
     private FileCacheEntity? GetValidatedFileCache(FileCacheEntity fileCache)
     {
         var resultingFileCache = ReplacePathPrefixes(fileCache);
-        //_logger.LogTrace("Validating {path}", fileCache.PrefixedFilePath);
         resultingFileCache = Validate(resultingFileCache);
         return resultingFileCache;
     }

Snowcloak/Interop/GameModel/MdlFile.cs

@@ -31,23 +31,23 @@ public class MdlFile
     public ushort Unknown9;
 
     // Offsets are stored relative to RuntimeSize instead of file start.
-    public uint[] VertexOffset = [0, 0, 0];
-    public uint[] IndexOffset = [0, 0, 0];
+    public uint[] VertexOffset;
+    public uint[] IndexOffset;
 
-    public uint[] VertexBufferSize = [0, 0, 0];
-    public uint[] IndexBufferSize = [0, 0, 0];
+    public uint[] VertexBufferSize;
+    public uint[] IndexBufferSize;
     public byte LodCount;
     public bool EnableIndexBufferStreaming;
     public bool EnableEdgeGeometry;
 
     public ModelFlags1 Flags1;
     public ModelFlags2 Flags2;
 
-    public VertexDeclarationStruct[] VertexDeclarations = [];
-    public ElementIdStruct[] ElementIds = [];
-    public MeshStruct[] Meshes = [];
+    public VertexDeclarationStruct[] VertexDeclarations;
+    public ElementIdStruct[] ElementIds;
+    public MeshStruct[] Meshes;
     public BoundingBoxStruct[] BoneBoundingBoxes = [];
-    public LodStruct[] Lods = [];
+    public LodStruct[] Lods;
     public ExtraLodStruct[] ExtraLods = [];
 
     public MdlFile(string filePath)

Snowcloak/Services/PairRequestService.cs

@@ -571,14 +571,11 @@ private async Task<bool> UpdateAvailabilitySubscriptionAsync(LocationInfo locati
 
         try
         {
-            if (!_apiController.Value.IsConnected)
+            if (!_apiController.Value.IsConnected && (!force || !await WaitForApiConnectionAsync(_nearbyAvailabilityCts.Token).ConfigureAwait(false)))
             {
-                if (!force || !await WaitForApiConnectionAsync(_nearbyAvailabilityCts.Token).ConfigureAwait(false))
-                {
-                    _pushChannelAvailable = false;
-                    _availabilitySubscriptionActive = false;
-                    return false;
-                }
+                _pushChannelAvailable = false;
+                _availabilitySubscriptionActive = false;
+                return false;
             }
 
             var sendFullSnapshot = forceFullSnapshot || requiresNewSubscription;

Snowcloak/Snowcloak.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Brio.API" Version="3.0.1" />
     <PackageReference Include="Chaos.NaCl.Standard" Version="1.0.0" />
     <PackageReference Include="ElezenTools" Version="15.0.1" />
-    <PackageReference Include="Glamourer.Api" Version="2.8.0" />
+    <PackageReference Include="Glamourer.Api" Version="2.8.1" />
     <PackageReference Include="K4os.Compression.LZ4.Legacy" Version="1.3.8" />
     <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
     <PackageReference Include="MessagePack" Version="3.1.4" />
@@ -29,7 +29,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.58">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.59">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -38,15 +38,15 @@
     <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
     <PackageReference Include="NAudio" Version="2.3.0" />
-    <PackageReference Include="Penumbra.Api" Version="5.13.1" />
+    <PackageReference Include="Penumbra.Api" Version="5.15.1" />
     <PackageReference Include="Snowcloak.API" Version="2.6.0.3" />
     <PackageReference Include="Snowcloak.CacheFile" Version="3.2.1" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="10.25.0.139117">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Management" Version="10.0.7" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.17.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.18.0" />
     <PackageReference Update="DotNet.ReproducibleBuilds" Version="2.0.2" />
     <PackageReference Include="Vortice.DXGI" Version="3.8.3" />
     <PackageReference Include="ZstdSharp.Port" Version="0.8.8" />

Snowcloak/UI/ChatWindow.cs

@@ -1461,7 +1461,7 @@ private void DrawStandardChannelMembers(string channelId)
         var selfRank = GetChannelRoleRank(selfRoles);
 
         foreach (var member in members
-                     .GroupBy(member => member.User.UID)
+                     .GroupBy(member => member.User.UID, StringComparer.Ordinal)
                      .Select(group => group.OrderByDescending(entry => GetChannelRoleRank(entry.Roles)).First())
                      .OrderByDescending(member => GetChannelRoleRank(member.Roles))
                      .ThenBy(member => GetUserDisplayName(member.User), StringComparer.OrdinalIgnoreCase))

Snowcloak/UI/Components/FrostbrandPanel.cs

@@ -410,7 +410,7 @@ private void DrawFilterColumn()
             .Where(kvp => string.IsNullOrWhiteSpace(_homeworldFilterSearch)
                           || kvp.Value.Name.Contains(_homeworldFilterSearch, StringComparison.OrdinalIgnoreCase)
                           || kvp.Value.DataCenterName.Contains(_homeworldFilterSearch, StringComparison.OrdinalIgnoreCase))
-            .GroupBy(kvp => kvp.Value.DataCenterName)
+            .GroupBy(kvp => kvp.Value.DataCenterName, StringComparer.OrdinalIgnoreCase)
             .OrderBy(g => g.Key, StringComparer.Ordinal);
 
         using var homeworldList = ImRaii.Child("FrostbrandHomeworldFilters", new Vector2(0, ImGui.GetTextLineHeightWithSpacing() * 9), true);

Snowcloak/UI/Components/SyncshellMemberLabelUi.cs

@@ -1,6 +1,7 @@
 using Dalamud.Interface;
 using Snowcloak.API.Data;
 using System.Numerics;
+using System.Runtime.InteropServices;
 
 namespace Snowcloak.UI.Components;
 
@@ -160,5 +161,6 @@ public static bool TryGetLabelPresentation(string label, out FontAwesomeIcon ico
         }
     }
 
+    [StructLayout(LayoutKind.Sequential)]
     private readonly record struct LabelStyle(FontAwesomeIcon Icon, Vector4 Color, int Priority);
 }

Snowcloak/UI/VenueRegistryWindow.cs

@@ -264,9 +264,7 @@ private static string FormatVenueLabel(VenueRegistryEntryDto entry)
         var listed = entry.IsListed ? "Listed" : "Unlisted";
         return string.Format(CultureInfo.InvariantCulture, "{0} ({1})", name, listed);
     }
-
-    // TODO: Move this to ElezenTools maybe? Other devs might use different string formats tho
-    // Decide then make it a reusable function instead of copy pasting
+    
     private string FormatHousingLocation(string associatedHousing)
     {
         if (!TryParseHousingLocation(associatedHousing, out var location))

Snowcloak/WebAPI/AccountRegistrationService.cs

@@ -50,7 +50,7 @@ public sealed record PatreonLoginResult
     private readonly DalamudUtilService _dalamudUtilService;
     private readonly TokenProvider _tokenProvider;
 
-    private string GenerateSecretKey()
+    private static string GenerateSecretKey()
     {
         return Convert.ToHexString(SHA256.HashData(RandomNumberGenerator.GetBytes(64)));
     }