feat(commands): add !upkeep in-game handler (6b)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: HandyS11

src/RustPlusBot.Features.Commands/CommandServiceCollectionExtensions.cs

@@ -50,6 +50,7 @@ public static IServiceCollection AddCommands(this IServiceCollection services)
         services.AddScoped<ICommandHandler, CraftCommandHandler>();
         services.AddScoped<ICommandHandler, ResearchCommandHandler>();
         services.AddScoped<ICommandHandler, DecayCommandHandler>();
+        services.AddScoped<ICommandHandler, UpkeepCommandHandler>();
 
         services.AddScoped<CommandDispatcher>();
         services.AddHostedService<CommandsHostedService>();

src/RustPlusBot.Features.Commands/Handlers/UpkeepCommandHandler.cs

@@ -0,0 +1,36 @@
+using RustPlusBot.Features.Commands.Dispatching;
+using RustPlusBot.Features.Commands.Formatting;
+using RustPlusBot.Features.ItemData;
+using RustPlusBot.Features.ItemData.Lookup;
+using RustPlusBot.Features.ItemData.Naming;
+using RustPlusBot.Localization;
+
+namespace RustPlusBot.Features.Commands.Handlers;
+
+/// <summary>!upkeep — shows a building block's upkeep cost.</summary>
+/// <param name="database">The item database.</param>
+/// <param name="names">Resolves resource ids to names.</param>
+/// <param name="localizer">The reply localizer.</param>
+internal sealed class UpkeepCommandHandler(IItemDatabase database, IItemNameResolver names, ILocalizer localizer)
+    : ICommandHandler
+{
+    /// <inheritdoc />
+    public string Name => "upkeep";
+
+    /// <inheritdoc />
+    public Task<string?> ExecuteAsync(CommandContext context, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(context);
+        var query = string.Join(' ', context.Args);
+        var reply = database.Resolve(query) switch
+        {
+            ItemMatch.Found { Item.Upkeep: not null } f =>
+                localizer.Get("command.upkeep.ok", context.Culture, UpkeepLine.Format(f.Item, names)),
+            ItemMatch.Found f => localizer.Get("command.upkeep.none", context.Culture, f.Item.Name),
+            ItemMatch.Ambiguous a => localizer.Get("command.item.ambiguous", context.Culture,
+                string.Join(", ", a.Candidates.Select(c => c.Name))),
+            _ => localizer.Get("command.item.notfound", context.Culture, query),
+        };
+        return Task.FromResult<string?>(reply);
+    }
+}

src/RustPlusBot.Features.Commands/Help/CommandHelpCatalog.cs

@@ -30,6 +30,7 @@ internal static class CommandHelpCatalog
         new("craft", CommandGroup.ItemDb, "help.craft"),
         new("research", CommandGroup.ItemDb, "help.research"),
         new("decay", CommandGroup.ItemDb, "help.decay"),
+        new("upkeep", CommandGroup.ItemDb, "help.upkeep"),
     ];
 
     /// <summary>The Discord slash commands, in display order.</summary>

src/RustPlusBot.Localization/Strings.fr.resx

@@ -282,6 +282,12 @@
   <data name="command.research.ok" xml:space="preserve">
     <value>{0}</value>
   </data>
+  <data name="command.upkeep.none" xml:space="preserve">
+    <value>{0} n'a pas de coût d'entretien.</value>
+  </data>
+  <data name="command.upkeep.ok" xml:space="preserve">
+    <value>{0}</value>
+  </data>
   <data name="event.cargo.entered" xml:space="preserve">
     <value>🚢 Cargo Ship arrivé en {0}</value>
   </data>
@@ -444,6 +450,9 @@
   <data name="help.unmute" xml:space="preserve">
     <value>Réactiver la sortie du bot vers le jeu.</value>
   </data>
+  <data name="help.upkeep" xml:space="preserve">
+    <value>Coût d'entretien d'un bloc de construction</value>
+  </data>
   <data name="help.uptime" xml:space="preserve">
     <value>Afficher depuis combien de temps le bot fonctionne.</value>
   </data>

src/RustPlusBot.Localization/Strings.resx

@@ -282,6 +282,12 @@
   <data name="command.research.ok" xml:space="preserve">
     <value>{0}</value>
   </data>
+  <data name="command.upkeep.none" xml:space="preserve">
+    <value>{0} has no upkeep cost.</value>
+  </data>
+  <data name="command.upkeep.ok" xml:space="preserve">
+    <value>{0}</value>
+  </data>
   <data name="event.cargo.entered" xml:space="preserve">
     <value>🚢 Cargo Ship entered at {0}</value>
   </data>
@@ -444,6 +450,9 @@
   <data name="help.unmute" xml:space="preserve">
     <value>Resume bot output to the game.</value>
   </data>
+  <data name="help.upkeep" xml:space="preserve">
+    <value>Upkeep cost for a building block</value>
+  </data>
   <data name="help.uptime" xml:space="preserve">
     <value>Show how long the bot has been running.</value>
   </data>

tests/RustPlusBot.Features.Commands.Tests/CommandRegistrationTests.cs

@@ -51,7 +51,7 @@ public void Dispatcher_and_handlers_resolve()
         using var scope = provider.CreateScope();
         Assert.NotNull(scope.ServiceProvider.GetRequiredService<CommandDispatcher>());
         var handlers = scope.ServiceProvider.GetServices<ICommandHandler>().ToList();
-        Assert.Equal(24, handlers.Count);
+        Assert.Equal(25, handlers.Count);
         Assert.Contains(handlers, h => h.Name == "mute");
         Assert.Contains(handlers, h => h.Name == "pop");
         Assert.Contains(handlers, h => h.Name == "time");
@@ -70,6 +70,7 @@ public void Dispatcher_and_handlers_resolve()
         Assert.Contains(handlers, h => h.Name == "large");
         Assert.Contains(handlers, h => h.Name == "afk");
         Assert.Contains(handlers, h => h.Name == "decay");
+        Assert.Contains(handlers, h => h.Name == "upkeep");
         Assert.NotNull(scope.ServiceProvider.GetRequiredService<ServerResolver>());
         Assert.NotNull(scope.ServiceProvider.GetRequiredService<ServerQueryService>());
     }

tests/RustPlusBot.Features.Commands.Tests/Handlers/DecayUpkeepHandlersTests.cs

@@ -1,6 +1,7 @@
 using RustPlusBot.Features.Commands.Dispatching;
 using RustPlusBot.Features.Commands.Handlers;
 using RustPlusBot.Features.ItemData;
+using RustPlusBot.Features.ItemData.Naming;
 using RustPlusBot.Localization;
 
 namespace RustPlusBot.Features.Commands.Tests.Handlers;
@@ -9,6 +10,7 @@ public sealed class DecayUpkeepHandlersTests
 {
     private readonly IItemDatabase _db = new EmbeddedItemDatabase();
     private readonly ILocalizer _loc = new ResxLocalizer();
+    private readonly IItemNameResolver _names = new ItemDatabaseNameResolver(new EmbeddedItemDatabase());
 
     private static CommandContext Ctx(params string[] args) => new(1, Guid.NewGuid(), "en", 99, "Caller", args);
 
@@ -49,4 +51,33 @@ public async Task Decay_French_returnsFrenchNone()
         var reply = await new DecayCommandHandler(_db, _loc).ExecuteAsync(fr, CancellationToken.None);
         Assert.Contains("dégrade", reply, StringComparison.Ordinal);
     }
+
+    [Fact]
+    public void Upkeep_name_is_upkeep()
+        => Assert.Equal("upkeep", new UpkeepCommandHandler(_db, _names, _loc).Name);
+
+    [Fact]
+    public async Task Upkeep_Found_returnsUpkeepLine()
+    {
+        var reply = await new UpkeepCommandHandler(_db, _names, _loc)
+            .ExecuteAsync(Ctx("Wooden Door"), CancellationToken.None);
+        Assert.Contains("Wooden Door", reply, StringComparison.Ordinal);
+        Assert.Contains("upkeep", reply, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task Upkeep_NoUpkeepData_returnsNone()
+    {
+        var reply = await new UpkeepCommandHandler(_db, _names, _loc)
+            .ExecuteAsync(Ctx("Assault Rifle"), CancellationToken.None);
+        Assert.Contains("Assault Rifle", reply, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task Upkeep_French_returnsFrenchNone()
+    {
+        var fr = new CommandContext(1, Guid.NewGuid(), "fr", 99, "Caller", ["Assault Rifle"]);
+        var reply = await new UpkeepCommandHandler(_db, _names, _loc).ExecuteAsync(fr, CancellationToken.None);
+        Assert.Contains("entretien", reply, StringComparison.Ordinal);
+    }
 }

tests/RustPlusBot.Features.Commands.Tests/Help/CommandHelpCatalogTests.cs

@@ -5,12 +5,12 @@ namespace RustPlusBot.Features.Commands.Tests.Help;
 
 public sealed class CommandHelpCatalogTests
 {
-    /// <summary>The 18 registered in-game handler names (see AddCommands / CommandRegistrationTests).</summary>
+    /// <summary>The 19 registered in-game handler names (see AddCommands / CommandRegistrationTests).</summary>
     private static readonly string[] HandlerNames =
     [
         "mute", "unmute", "uptime", "pop", "wipe", "time",
         "online", "offline", "team", "steamid", "alive", "afk", "prox",
-        "item", "recycle", "craft", "research", "decay",
+        "item", "recycle", "craft", "research", "decay", "upkeep",
     ];
 
     [Fact]

tests/RustPlusBot.Localization.Tests/StringsResourceParityTests.cs

@@ -42,6 +42,6 @@ public void English_covers_every_french_key()
     [Fact]
     public void Catalog_has_expected_key_count()
     {
-        Assert.Equal(233, EnglishKeys().Count);
+        Assert.Equal(236, EnglishKeys().Count);
     }
 }