v9.1.16 - Fix trade cancellation notification duplication and update version

NexusRisen · NexusRisen · commit c4dec3609ed5 · 2026-07-22T18:22:57.000-04:00
diff --git a/NUL b/NUL
diff --git a/SysBot.Pokemon.Discord/Helpers/DiscordTradeNotifier.cs b/SysBot.Pokemon.Discord/Helpers/DiscordTradeNotifier.cs
@@ -294,8 +294,8 @@ public void TradeCanceled(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> inf
         StopPeriodicUpdates();
 
         var cancelMessage = TotalBatchTrades > 1
-            ? $"Batch trade canceled: {msg}. All remaining trades have been canceled."
-            : msg.ToString();
+            ? $"Batch trade canceled: {msg.ToUserString()}. All remaining trades have been canceled."
+            : msg.ToUserString();
 
         EmbedHelper.SendTradeCanceledEmbedAsync(Trader, cancelMessage).ConfigureAwait(false);
     }
diff --git a/SysBot.Pokemon.Kook/KookTradeNotifier.cs b/SysBot.Pokemon.Kook/KookTradeNotifier.cs
@@ -77,7 +77,7 @@ public void TradeCanceled(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> inf
         if (routine != null)
             OnFinish?.Invoke(routine);
             
-        Trader.SendTextAsync($"Trade canceled: {msg}").ConfigureAwait(false);
+        Trader.SendTextAsync($"Trade canceled: {msg.ToUserString()}").ConfigureAwait(false);
     }
 
     public void TradeFinished(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info, T result)
diff --git a/SysBot.Pokemon.Stoat/StoatTradeNotifier.cs b/SysBot.Pokemon.Stoat/StoatTradeNotifier.cs
@@ -301,8 +301,8 @@ public void TradeCanceled(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> inf
         StopPeriodicUpdates();
 
         var cancelMessage = TotalBatchTrades > 1
-            ? $"Batch trade canceled: {msg}. All remaining trades have been canceled."
-            : msg.ToString();
+            ? $"Batch trade canceled: {msg.ToUserString()}. All remaining trades have been canceled."
+            : msg.ToUserString();
 
         EmbedHelper.SendTradeCanceledEmbedAsync(_client, UserId, cancelMessage).ConfigureAwait(false);
     }
diff --git a/SysBot.Pokemon.Twitch/Helpers/TwitchTradeNotifier.cs b/SysBot.Pokemon.Twitch/Helpers/TwitchTradeNotifier.cs
@@ -70,7 +70,7 @@ public void SendNotification(PokeRoutineExecutor<T> routine, PokeTradeDetail<T>
         public void TradeCanceled(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info, PokeTradeResult msg)
         {
             OnFinish?.Invoke(routine);
-            var line = $"@{info.Trainer.TrainerName}: Trade canceled, {msg}";
+            var line = $"@{info.Trainer.TrainerName}: Trade canceled, {msg.ToUserString()}";
             LogUtil.LogText(line);
             SendMessage(line, Settings.TradeCanceledDestination);
         }
diff --git a/SysBot.Pokemon.WinForms/SysBot.Pokemon.WinForms.csproj b/SysBot.Pokemon.WinForms/SysBot.Pokemon.WinForms.csproj
@@ -18,7 +18,7 @@
     <Description>Nintendo Switch Pokémon Bot Manager</Description>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <StartupObject>SysBot.Pokemon.WinForms.Program</StartupObject>
-    <Version>9.1.15</Version>
+    <Version>9.1.16</Version>
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/SysBot.Pokemon/BDSP/BotTrade/PokeTradeBotBS.cs b/SysBot.Pokemon/BDSP/BotTrade/PokeTradeBotBS.cs
@@ -648,6 +648,9 @@ private async Task<bool> ExitUnionRoomToOverworld(CancellationToken token)
 
     private void HandleAbortedTrade(PokeTradeDetail<PB8> detail, PokeRoutineType type, uint priority, PokeTradeResult result)
     {
+        if (result == PokeTradeResult.NoTrainerFound)
+            return;
+
         detail.IsProcessing = false;
         if (result.ShouldAttemptRetry() && detail.Type != PokeTradeType.Random && !detail.IsRetry)
         {
@@ -1589,6 +1592,9 @@ void SendCollectedPokemonAndCleanup()
 
     private async Task HandleAbortedBatchTrade(PokeTradeDetail<PB8> detail, PokeRoutineType type, uint priority, PokeTradeResult result, CancellationToken token)
     {
+        if (result == PokeTradeResult.NoTrainerFound)
+            return;
+
         detail.IsProcessing = false;
 
         // Always remove from UsersInQueue on abort
diff --git a/SysBot.Pokemon/Helpers/NexusBot.cs b/SysBot.Pokemon/Helpers/NexusBot.cs
@@ -3,7 +3,7 @@ namespace SysBot.Pokemon.Helpers
     public static class NexusBot
     {
         public static string Name { get; set; } = "NexusBot";
-        public static string Version => "9.1.15";
+        public static string Version => "9.1.16";
         public const string ConfigPath = "config.json";
     }
 }
diff --git a/SysBot.Pokemon/LA/BotTrade/PokeTradeBotLA.cs b/SysBot.Pokemon/LA/BotTrade/PokeTradeBotLA.cs
@@ -264,6 +264,9 @@ private async Task PerformTrade(SAV8LA sav, PokeTradeDetail<PA8> detail, PokeRou
 
     private async Task HandleAbortedBatchTrade(PokeTradeDetail<PA8> detail, PokeRoutineType type, uint priority, PokeTradeResult result, CancellationToken token)
     {
+        if (result == PokeTradeResult.NoTrainerFound)
+            return;
+
         detail.IsProcessing = false;
 
         // Always remove from UsersInQueue on abort
@@ -297,6 +300,9 @@ private async Task HandleAbortedBatchTrade(PokeTradeDetail<PA8> detail, PokeRout
 
     private void HandleAbortedTrade(PokeTradeDetail<PA8> detail, PokeRoutineType type, uint priority, PokeTradeResult result)
     {
+        if (result == PokeTradeResult.NoTrainerFound)
+            return;
+
         detail.IsProcessing = false;
         if (result.ShouldAttemptRetry() && detail.Type != PokeTradeType.Random && !detail.IsRetry)
         {
diff --git a/SysBot.Pokemon/LGPE/BotTrade/PokeTradeBotLGPE.cs b/SysBot.Pokemon/LGPE/BotTrade/PokeTradeBotLGPE.cs
@@ -229,6 +229,9 @@ private async Task PerformTrade(SAV7b sav, PokeTradeDetail<PB7> detail, PokeRout
 
     private void HandleAbortedTrade(PokeTradeDetail<PB7> detail, PokeRoutineType type, uint priority, PokeTradeResult result)
     {
+        if (result == PokeTradeResult.NoTrainerFound)
+            return;
+
         detail.IsProcessing = false;
         if (result.ShouldAttemptRetry() && detail.Type != PokeTradeType.Random && !detail.IsRetry)
         {
diff --git a/SysBot.Pokemon/PLZA/BotTrade/PokeTradeBotPLZA.cs b/SysBot.Pokemon/PLZA/BotTrade/PokeTradeBotPLZA.cs
@@ -1317,7 +1317,6 @@ private async Task<PokeTradeResult> PerformNonBatchTrade(SAV9ZA sav, PokeTradeDe
         {
             // Partner never showed up - their fault, don't requeue
             poke.IsProcessing = false;
-            poke.SendNotification(this, "No trading partner found. Canceling the trade.");
             poke.TradeCanceled(this, PokeTradeResult.NoTrainerFound);
 
             await RecoverToOverworld(token).ConfigureAwait(false);
@@ -1515,6 +1514,9 @@ private async Task<PokeTradeResult> PerformNonBatchTrade(SAV9ZA sav, PokeTradeDe
 
     private async Task HandleAbortedBatchTrade(PokeTradeDetail<PA9> detail, PokeRoutineType type, uint priority, PokeTradeResult result, CancellationToken token)
     {
+        if (result == PokeTradeResult.NoTrainerFound)
+            return;
+
         detail.IsProcessing = false;
 
         // Always remove from UsersInQueue on abort
diff --git a/SysBot.Pokemon/SV/BotTrade/PokeTradeBotSV.cs b/SysBot.Pokemon/SV/BotTrade/PokeTradeBotSV.cs
@@ -1079,7 +1079,6 @@ void SendCollectedPokemonAndCleanup()
                 if (!partnerFound)
                 {
                     poke.IsProcessing = false;
-                    poke.SendNotification(this, "No trading partner found. Canceling the batch trades.");
                     TradeProgressChanged?.Invoke(0);
 
                     poke.TradeCanceled(this, PokeTradeResult.NoTrainerFound);
@@ -1510,7 +1509,6 @@ private async Task<PokeTradeResult> PerformNonBatchTrade(SAV9SV sav, PokeTradeDe
         {
             // Fast-path for no trainer found - handle immediately
             poke.IsProcessing = false;
-            poke.SendNotification(this, "No trading partner found. Canceling the trade.");
             TradeProgressChanged?.Invoke(0);
 
             poke.TradeCanceled(this, PokeTradeResult.NoTrainerFound);
@@ -1715,6 +1713,9 @@ private async Task<PokeTradeResult> PerformNonBatchTrade(SAV9SV sav, PokeTradeDe
 
     private async Task HandleAbortedBatchTrade(PokeTradeDetail<PK9> detail, PokeRoutineType type, uint priority, PokeTradeResult result, CancellationToken token)
     {
+        if (result == PokeTradeResult.NoTrainerFound)
+            return;
+
         detail.IsProcessing = false;
 
         // Always remove from UsersInQueue on abort
diff --git a/SysBot.Pokemon/SWSH/BotTrade/PokeTradeBotSWSH.cs b/SysBot.Pokemon/SWSH/BotTrade/PokeTradeBotSWSH.cs
@@ -621,6 +621,9 @@ private async Task PerformTrade(SAV8SWSH sav, PokeTradeDetail<PK8> detail, PokeR
 
     private async Task HandleAbortedBatchTrade(PokeTradeDetail<PK8> detail, PokeRoutineType type, uint priority, PokeTradeResult result, CancellationToken token)
     {
+        if (result == PokeTradeResult.NoTrainerFound)
+            return;
+
         detail.IsProcessing = false;
 
         // Always remove from UsersInQueue on abort
@@ -654,6 +657,9 @@ private async Task HandleAbortedBatchTrade(PokeTradeDetail<PK8> detail, PokeRout
 
     private void HandleAbortedTrade(PokeTradeDetail<PK8> detail, PokeRoutineType type, uint priority, PokeTradeResult result)
     {
+        if (result == PokeTradeResult.NoTrainerFound)
+            return;
+
         detail.IsProcessing = false;
         if (result.ShouldAttemptRetry() && detail.Type != PokeTradeType.Random && !detail.IsRetry)
         {
diff --git a/SysBot.Pokemon/TradeHub/PokeTradeDetail.cs b/SysBot.Pokemon/TradeHub/PokeTradeDetail.cs
@@ -121,7 +121,11 @@ public PokeTradeDetail(
 
         public void TradeSearching(PokeRoutineExecutor<TPoke> routine) => Notifier.TradeSearching(routine, this);
 
-        public void TradeCanceled(PokeRoutineExecutor<TPoke> routine, PokeTradeResult msg) => Notifier.TradeCanceled(routine, this, msg);
+        public void TradeCanceled(PokeRoutineExecutor<TPoke> routine, PokeTradeResult msg)
+        {
+            IsCanceled = true;
+            Notifier.TradeCanceled(routine, this, msg);
+        }
 
         public virtual void TradeFinished(PokeRoutineExecutor<TPoke> routine, TPoke result)
         {
diff --git a/SysBot.Pokemon/TradeHub/PokeTradeResult.cs b/SysBot.Pokemon/TradeHub/PokeTradeResult.cs
@@ -43,4 +43,17 @@ public enum PokeTradeResult
 public static class PokeTradeResultExtensions
 {
     public static bool ShouldAttemptRetry(this PokeTradeResult t) => t >= PokeTradeResult.RoutineCancel;
+
+    public static string ToUserString(this PokeTradeResult t) => t switch
+    {
+        PokeTradeResult.NoTrainerFound => "No trading partner found. Canceling the trade.",
+        PokeTradeResult.TrainerTooSlow => "Trainer was too slow to respond.",
+        PokeTradeResult.TrainerLeft => "Trainer left the trade.",
+        PokeTradeResult.TrainerOfferCanceledQuick => "Trainer canceled the offer too quickly.",
+        PokeTradeResult.TrainerRequestBad => "Trainer requested an invalid or un-tradable Pokémon.",
+        PokeTradeResult.IllegalTrade => "Illegal Pokémon detected.",
+        PokeTradeResult.SuspiciousActivity => "Suspicious activity detected.",
+        PokeTradeResult.UserCanceled => "Trade was canceled.",
+        _ => t.ToString(),
+    };
 }
diff --git a/SysBot.Tests/QueueTests.cs b/SysBot.Tests/QueueTests.cs
@@ -332,4 +332,54 @@ public override Task RebootAndStop(CancellationToken token)
             detail.IsFavored.Should().Be(true);
         }
     }
+
+    [Fact]
+    public void TradeCanceled_SetsIsCanceled_AndPreventsDuplicateUserCanceled()
+    {
+        var hub = new PokeTradeHub<PK9>(new PokeTradeHubConfig());
+        var info = new TradeQueueInfo<PK9>(hub);
+        int canceledCount = 0;
+        PokeTradeResult? lastResult = null;
+
+        var notifier = new TestNotifier<PK9>
+        {
+            OnCanceled = res =>
+            {
+                canceledCount++;
+                lastResult = res;
+            }
+        };
+
+        var detail = new PokeTradeDetail<PK9>(new PK9 { Species = 1 }, new PokeTradeTrainerInfo("Test"), notifier, PokeTradeType.Specific, 1234);
+        var entry = new TradeEntry<PK9>(detail, 100, PokeRoutineType.LinkTrade, "Test Trade", 1234);
+        info.AddToTradeQueue(entry, entry.UserID);
+
+        // Cancel trade with NoTrainerFound
+        entry.Trade.IsProcessing = false;
+        entry.Trade.TradeCanceled(null!, PokeTradeResult.NoTrainerFound);
+
+        entry.Trade.IsCanceled.Should().BeTrue();
+        canceledCount.Should().Be(1);
+        lastResult.Should().Be(PokeTradeResult.NoTrainerFound);
+
+        // Queue removal should NOT fire a second TradeCanceled with UserCanceled
+        info.Remove(entry);
+        canceledCount.Should().Be(1);
+    }
+
+    private class TestNotifier<T> : IPokeTradeNotifier<T> where T : PKM, new()
+    {
+        public Action<PokeRoutineExecutor<T>>? OnFinish { get; set; }
+        public Action<PokeTradeResult>? OnCanceled { get; set; }
+
+        public void TradeInitialize(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info) { }
+        public void TradeSearching(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info) { }
+        public void TradeCanceled(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info, PokeTradeResult msg) => OnCanceled?.Invoke(msg);
+        public void TradeFinished(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info, T result) { }
+        public void SendNotification(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info, string message) { }
+        public void SendNotification(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info, PokeTradeSummary message) { }
+        public void SendNotification(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info, T result, string message) { }
+        public Task SendInitialQueueUpdate() => Task.CompletedTask;
+        public void UpdateBatchProgress(int currentTradeNumber, T receivedMon, int totalBatchTrades) { }
+    }
 }
diff --git a/release_notes.md b/release_notes.md
@@ -1,8 +1,8 @@
 # Release Notes
 
-## [9.1.15]
-- **Medals System Fix & Integrations**:
-  - Fixed trade count incrementing logic so user trade counts increase strictly upon trade completion (preventing duplicate/premature increments).
-  - Fixed the `$medals` (`$ml`) command to properly display the 0-trade status embed card for new users.
-  - Implemented `$medals` / `$ml` command handling and configuration settings for Stoat and Kook integrations.
-  - Centralized milestone calculation and congratulatory messaging logic in core `SysBot.Pokemon`.
+## [9.1.16]
+- **Trade Notification & Cancellation Fixes**:
+  - Fixed an issue where trade timeouts (such as "No trading partner found") spammed redundant `NoTrainerFound` and false `UserCanceled` notifications.
+  - Set `IsCanceled` state when trades are canceled so queue removal does not emit secondary `UserCanceled` messages.
+  - Formatted `PokeTradeResult` cancellation reasons into human-readable notifications across Discord, Stoat, Twitch, and Kook notifiers.
+  - Added abort checks to batch and single trade routines to prevent duplicate failure notifications.

Original file line number	Diff line number	Diff line change
`@@ -294,8 +294,8 @@ public void TradeCanceled(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> inf`
`294`	`294`	`StopPeriodicUpdates();`
`295`	`295`
`296`	`296`	`var cancelMessage = TotalBatchTrades > 1`
`297`		`- ? $"Batch trade canceled: {msg}. All remaining trades have been canceled."`
`298`		`- : msg.ToString();`
	`297`	`+ ? $"Batch trade canceled: {msg.ToUserString()}. All remaining trades have been canceled."`
	`298`	`+ : msg.ToUserString();`
`299`	`299`
`300`	`300`	`EmbedHelper.SendTradeCanceledEmbedAsync(Trader, cancelMessage).ConfigureAwait(false);`
`301`	`301`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public void TradeCanceled(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> inf`
`77`	`77`	`if (routine != null)`
`78`	`78`	`OnFinish?.Invoke(routine);`
`79`	`79`
`80`		`- Trader.SendTextAsync($"Trade canceled: {msg}").ConfigureAwait(false);`
	`80`	`+ Trader.SendTextAsync($"Trade canceled: {msg.ToUserString()}").ConfigureAwait(false);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public void TradeFinished(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info, T result)`
Original file line number	Diff line number	Diff line change
`@@ -301,8 +301,8 @@ public void TradeCanceled(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> inf`
`301`	`301`	`StopPeriodicUpdates();`
`302`	`302`
`303`	`303`	`var cancelMessage = TotalBatchTrades > 1`
`304`		`- ? $"Batch trade canceled: {msg}. All remaining trades have been canceled."`
`305`		`- : msg.ToString();`
	`304`	`+ ? $"Batch trade canceled: {msg.ToUserString()}. All remaining trades have been canceled."`
	`305`	`+ : msg.ToUserString();`
`306`	`306`
`307`	`307`	`EmbedHelper.SendTradeCanceledEmbedAsync(_client, UserId, cancelMessage).ConfigureAwait(false);`
`308`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void SendNotification(PokeRoutineExecutor<T> routine, PokeTradeDetail<T>`
`70`	`70`	`public void TradeCanceled(PokeRoutineExecutor<T> routine, PokeTradeDetail<T> info, PokeTradeResult msg)`
`71`	`71`	`{`
`72`	`72`	`OnFinish?.Invoke(routine);`
`73`		`- var line = $"@{info.Trainer.TrainerName}: Trade canceled, {msg}";`
	`73`	`+ var line = $"@{info.Trainer.TrainerName}: Trade canceled, {msg.ToUserString()}";`
`74`	`74`	`LogUtil.LogText(line);`
`75`	`75`	`SendMessage(line, Settings.TradeCanceledDestination);`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -648,6 +648,9 @@ private async Task<bool> ExitUnionRoomToOverworld(CancellationToken token)`
`648`	`648`
`649`	`649`	`private void HandleAbortedTrade(PokeTradeDetail<PB8> detail, PokeRoutineType type, uint priority, PokeTradeResult result)`
`650`	`650`	`{`
	`651`	`+ if (result == PokeTradeResult.NoTrainerFound)`
	`652`	`+ return;`
	`653`	`+`
`651`	`654`	`detail.IsProcessing = false;`
`652`	`655`	`if (result.ShouldAttemptRetry() && detail.Type != PokeTradeType.Random && !detail.IsRetry)`
`653`	`656`	`{`
`@@ -1589,6 +1592,9 @@ void SendCollectedPokemonAndCleanup()`
`1589`	`1592`
`1590`	`1593`	`private async Task HandleAbortedBatchTrade(PokeTradeDetail<PB8> detail, PokeRoutineType type, uint priority, PokeTradeResult result, CancellationToken token)`
`1591`	`1594`	`{`
	`1595`	`+ if (result == PokeTradeResult.NoTrainerFound)`
	`1596`	`+ return;`
	`1597`	`+`
`1592`	`1598`	`detail.IsProcessing = false;`
`1593`	`1599`
`1594`	`1600`	`// Always remove from UsersInQueue on abort`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace SysBot.Pokemon.Helpers`
`3`	`3`	`public static class NexusBot`
`4`	`4`	`{`
`5`	`5`	`public static string Name { get; set; } = "NexusBot";`
`6`		`- public static string Version => "9.1.15";`
	`6`	`+ public static string Version => "9.1.16";`
`7`	`7`	`public const string ConfigPath = "config.json";`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,9 @@ private async Task PerformTrade(SAV8LA sav, PokeTradeDetail<PA8> detail, PokeRou`
`264`	`264`
`265`	`265`	`private async Task HandleAbortedBatchTrade(PokeTradeDetail<PA8> detail, PokeRoutineType type, uint priority, PokeTradeResult result, CancellationToken token)`
`266`	`266`	`{`
	`267`	`+ if (result == PokeTradeResult.NoTrainerFound)`
	`268`	`+ return;`
	`269`	`+`
`267`	`270`	`detail.IsProcessing = false;`
`268`	`271`
`269`	`272`	`// Always remove from UsersInQueue on abort`
`@@ -297,6 +300,9 @@ private async Task HandleAbortedBatchTrade(PokeTradeDetail<PA8> detail, PokeRout`
`297`	`300`
`298`	`301`	`private void HandleAbortedTrade(PokeTradeDetail<PA8> detail, PokeRoutineType type, uint priority, PokeTradeResult result)`
`299`	`302`	`{`
	`303`	`+ if (result == PokeTradeResult.NoTrainerFound)`
	`304`	`+ return;`
	`305`	`+`
`300`	`306`	`detail.IsProcessing = false;`
`301`	`307`	`if (result.ShouldAttemptRetry() && detail.Type != PokeTradeType.Random && !detail.IsRetry)`
`302`	`308`	`{`
Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,9 @@ private async Task PerformTrade(SAV7b sav, PokeTradeDetail<PB7> detail, PokeRout`
`229`	`229`
`230`	`230`	`private void HandleAbortedTrade(PokeTradeDetail<PB7> detail, PokeRoutineType type, uint priority, PokeTradeResult result)`
`231`	`231`	`{`
	`232`	`+ if (result == PokeTradeResult.NoTrainerFound)`
	`233`	`+ return;`
	`234`	`+`
`232`	`235`	`detail.IsProcessing = false;`
`233`	`236`	`if (result.ShouldAttemptRetry() && detail.Type != PokeTradeType.Random && !detail.IsRetry)`
`234`	`237`	`{`