From 5d0694918572281ba0ac2a00915691406bf5f2ef Mon Sep 17 00:00:00 2001
From: MidoriKami <9083275+MidoriKami@users.noreply.github.com>
Date: Mon, 18 Sep 2023 12:00:49 -0700
Subject: [PATCH] Set CommandInfo InternalName when adding to CommandManager
 via PluginScopedService

---
 Dalamud/Game/Command/CommandInfo.cs                  |  1 -
 Dalamud/Game/Command/CommandManager.cs               | 12 ++++++++++++
 .../Windows/PluginInstaller/PluginInstallerWindow.cs |  4 +---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Dalamud/Game/Command/CommandInfo.cs b/Dalamud/Game/Command/CommandInfo.cs
index 9b559599a..bc0250a66 100644
--- a/Dalamud/Game/Command/CommandInfo.cs
+++ b/Dalamud/Game/Command/CommandInfo.cs
@@ -15,7 +15,6 @@ public sealed class CommandInfo
     public CommandInfo(HandlerDelegate handler)
     {
         this.Handler = handler;
-        this.LoaderAssemblyName = Assembly.GetCallingAssembly()?.GetName()?.Name;
     }
 
     /// <summary>
diff --git a/Dalamud/Game/Command/CommandManager.cs b/Dalamud/Game/Command/CommandManager.cs
index 118d210e2..218b89676 100644
--- a/Dalamud/Game/Command/CommandManager.cs
+++ b/Dalamud/Game/Command/CommandManager.cs
@@ -9,6 +9,7 @@ using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Logging.Internal;
+using Dalamud.Plugin.Internal.Types;
 using Dalamud.Plugin.Services;
 
 namespace Dalamud.Game.Command;
@@ -177,7 +178,17 @@ internal class CommandManagerPluginScoped : IDisposable, IServiceType, ICommandM
     private readonly CommandManager commandManagerService = Service<CommandManager>.Get();
 
     private readonly List<string> pluginRegisteredCommands = new();
+    private readonly LocalPlugin pluginInfo;
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CommandManagerPluginScoped"/> class.
+    /// </summary>
+    /// <param name="localPlugin">Info for the plugin that requests this service.</param>
+    public CommandManagerPluginScoped(LocalPlugin localPlugin)
+    {
+        this.pluginInfo = localPlugin;
+    }
+    
     /// <inheritdoc/>
     public ReadOnlyDictionary<string, CommandInfo> Commands => this.commandManagerService.Commands;
     
@@ -205,6 +216,7 @@ internal class CommandManagerPluginScoped : IDisposable, IServiceType, ICommandM
     {
         if (!this.pluginRegisteredCommands.Contains(command))
         {
+            info.LoaderAssemblyName = this.pluginInfo.InternalName;
             if (this.commandManagerService.AddHandler(command, info))
             {
                 this.pluginRegisteredCommands.Add(command);
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
index e5d3c147b..dcbdced28 100644
--- a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
@@ -15,7 +15,6 @@ using Dalamud.Game.Command;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
 using Dalamud.Interface.Internal.Notifications;
-using Dalamud.Interface.Style;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.Windowing;
@@ -2227,8 +2226,7 @@ internal class PluginInstallerWindow : Window, IDisposable
             {
                 var commands = commandManager.Commands
                                              .Where(cInfo => 
-                                                        cInfo.Value != null &&
-                                                        cInfo.Value.ShowInHelp &&
+                                                        cInfo.Value is { ShowInHelp: true } &&
                                                         cInfo.Value.LoaderAssemblyName == plugin.Manifest.InternalName)
                                              .ToArray();