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

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

Author: HandyS11

src/RustPlusBot.Features.Commands/CommandServiceCollectionExtensions.cs

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

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

@@ -0,0 +1,34 @@
+using RustPlusBot.Features.Commands.Dispatching;
+using RustPlusBot.Features.Commands.Formatting;
+using RustPlusBot.Features.ItemData;
+using RustPlusBot.Features.ItemData.Lookup;
+using RustPlusBot.Localization;
+
+namespace RustPlusBot.Features.Commands.Handlers;
+
+/// <summary>!decay — shows an item's decay time and HP.</summary>
+/// <param name="database">The item database.</param>
+/// <param name="localizer">The reply localizer.</param>
+internal sealed class DecayCommandHandler(IItemDatabase database, ILocalizer localizer)
+    : ICommandHandler
+{
+    /// <inheritdoc />
+    public string Name => "decay";
+
+    /// <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.Decay: not null } f =>
+                localizer.Get("command.decay.ok", context.Culture, DecayLine.Format(f.Item)),
+            ItemMatch.Found f => localizer.Get("command.decay.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

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

src/RustPlusBot.Localization/Strings.fr.resx

@@ -255,6 +255,12 @@
   <data name="command.craft.ok" xml:space="preserve">
     <value>{0}</value>
   </data>
+  <data name="command.decay.none" xml:space="preserve">
+    <value>{0} ne se dégrade pas.</value>
+  </data>
+  <data name="command.decay.ok" xml:space="preserve">
+    <value>{0}</value>
+  </data>
   <data name="command.item.ambiguous" xml:space="preserve">
     <value>Vouliez-vous dire : {0} ?</value>
   </data>
@@ -372,6 +378,9 @@
   <data name="help.group.teamintel" xml:space="preserve">
     <value>Équipe</value>
   </data>
+  <data name="help.decay" xml:space="preserve">
+    <value>Temps de dégradation d'un objet</value>
+  </data>
   <data name="help.item" xml:space="preserve">
     <value>Afficher le nom, l'id, la pile et la disparition d'un objet</value>
   </data>

src/RustPlusBot.Localization/Strings.resx

@@ -255,6 +255,12 @@
   <data name="command.craft.ok" xml:space="preserve">
     <value>{0}</value>
   </data>
+  <data name="command.decay.none" xml:space="preserve">
+    <value>{0} does not decay.</value>
+  </data>
+  <data name="command.decay.ok" xml:space="preserve">
+    <value>{0}</value>
+  </data>
   <data name="command.item.ambiguous" xml:space="preserve">
     <value>Did you mean: {0}?</value>
   </data>
@@ -372,6 +378,9 @@
   <data name="help.group.teamintel" xml:space="preserve">
     <value>Team</value>
   </data>
+  <data name="help.decay" xml:space="preserve">
+    <value>Decay time for an item</value>
+  </data>
   <data name="help.item" xml:space="preserve">
     <value>Look up an item's name, id, stack, and despawn</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(23, handlers.Count);
+        Assert.Equal(24, handlers.Count);
         Assert.Contains(handlers, h => h.Name == "mute");
         Assert.Contains(handlers, h => h.Name == "pop");
         Assert.Contains(handlers, h => h.Name == "time");
@@ -69,6 +69,7 @@ public void Dispatcher_and_handlers_resolve()
         Assert.Contains(handlers, h => h.Name == "small");
         Assert.Contains(handlers, h => h.Name == "large");
         Assert.Contains(handlers, h => h.Name == "afk");
+        Assert.Contains(handlers, h => h.Name == "decay");
         Assert.NotNull(scope.ServiceProvider.GetRequiredService<ServerResolver>());
         Assert.NotNull(scope.ServiceProvider.GetRequiredService<ServerQueryService>());
     }

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

@@ -0,0 +1,52 @@
+using RustPlusBot.Features.Commands.Dispatching;
+using RustPlusBot.Features.Commands.Handlers;
+using RustPlusBot.Features.ItemData;
+using RustPlusBot.Localization;
+
+namespace RustPlusBot.Features.Commands.Tests.Handlers;
+
+public sealed class DecayUpkeepHandlersTests
+{
+    private readonly IItemDatabase _db = new EmbeddedItemDatabase();
+    private readonly ILocalizer _loc = new ResxLocalizer();
+
+    private static CommandContext Ctx(params string[] args) => new(1, Guid.NewGuid(), "en", 99, "Caller", args);
+
+    [Fact]
+    public void Decay_name_is_decay()
+        => Assert.Equal("decay", new DecayCommandHandler(_db, _loc).Name);
+
+    [Fact]
+    public async Task Decay_Found_returnsDecayLine()
+    {
+        var reply = await new DecayCommandHandler(_db, _loc)
+            .ExecuteAsync(Ctx("Stone Barricade"), CancellationToken.None);
+        Assert.Contains("Stone Barricade", reply, StringComparison.Ordinal);
+        Assert.Contains("15m", reply, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task Decay_NoDecayData_returnsNone()
+    {
+        // "Assault Rifle" (id 1545779598) is in the bundle with null decay.
+        var reply = await new DecayCommandHandler(_db, _loc)
+            .ExecuteAsync(Ctx("Assault Rifle"), CancellationToken.None);
+        Assert.Contains("Assault Rifle", reply, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task Decay_NotFound_returnsMessage()
+    {
+        var reply = await new DecayCommandHandler(_db, _loc)
+            .ExecuteAsync(Ctx("zzzzz"), CancellationToken.None);
+        Assert.Contains("zzzzz", reply, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task Decay_French_returnsFrenchNone()
+    {
+        var fr = new CommandContext(1, Guid.NewGuid(), "fr", 99, "Caller", ["Assault Rifle"]);
+        var reply = await new DecayCommandHandler(_db, _loc).ExecuteAsync(fr, CancellationToken.None);
+        Assert.Contains("dégrade", 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 17 registered in-game handler names (see AddCommands / CommandRegistrationTests).</summary>
+    /// <summary>The 18 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",
+        "item", "recycle", "craft", "research", "decay",
     ];
 
     [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(230, EnglishKeys().Count);
+        Assert.Equal(233, EnglishKeys().Count);
     }
 }