Merge pull request #5 from kwsch/master

Pull upstream

Author: Xieon

SysBot.Pokemon.Discord/Commands/Bots/TradeModule.cs

@@ -5,6 +5,7 @@
 using SysBot.Base;
 using System;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace SysBot.Pokemon.Discord;
@@ -50,9 +51,21 @@ public async Task TradeAsync([Summary("Trade Code")] int code, [Summary("Showdow
         content = ReusableActions.StripCodeBlock(content);
         var set = new ShowdownSet(content);
         var template = AutoLegalityWrapper.GetTemplate(set);
-        if (set.InvalidLines.Count != 0)
+        if (set.InvalidLines.Count != 0 || set.Species is 0)
         {
-            var msg = $"Unable to parse Showdown Set:\n{string.Join("\n", set.InvalidLines)}";
+            var sb = new StringBuilder(128);
+            sb.AppendLine("Unable to parse Showdown Set.");
+            if (set.InvalidLines.Count != 0)
+            {
+                sb.AppendLine("Invalid lines detected:\n```");
+                foreach (var line in set.InvalidLines)
+                    sb.AppendLine(line);
+                sb.AppendLine("```");
+            }
+            if (set.Species is 0)
+                sb.AppendLine("Species could not be identified. Check your spelling.");
+
+            var msg = sb.ToString();
             await ReplyAsync(msg).ConfigureAwait(false);
             return;
         }

SysBot.Pokemon.Discord/Helpers/AutoLegalityExtensionsDiscord.cs

@@ -11,7 +11,7 @@ public static class AutoLegalityExtensionsDiscord
 {
     public static async Task ReplyWithLegalizedSetAsync(this ISocketMessageChannel channel, ITrainerInfo sav, ShowdownSet set)
     {
-        if (set.Species <= 0)
+        if (set.Species == 0)
         {
             await channel.SendMessageAsync("Oops! I wasn't able to interpret your message! If you intended to convert something, please double check what you're pasting!").ConfigureAwait(false);
             return;

SysBot.Pokemon/BDSP/BotTrade/PokeTradeBotBS.cs

@@ -279,7 +279,7 @@ private async Task<PokeTradeResult> PerformLinkCodeTrade(SAV8BS sav, PokeTradeDe
 
         var tradePartner = await GetTradePartnerInfo(token).ConfigureAwait(false);
         var trainerNID = GetFakeNID(tradePartner.TrainerName, tradePartner.TrainerID);
-        RecordUtil<PokeTradeBotSWSH>.Record($"Initiating\t{trainerNID:X16}\t{tradePartner.TrainerName}\t{poke.Trainer.TrainerName}\t{poke.Trainer.ID}\t{poke.ID}\t{toSend.EncryptionConstant:X8}");
+        RecordUtil<PokeTradeBotBS>.Record($"Initiating\t{trainerNID:X16}\t{tradePartner.TrainerName}\t{poke.Trainer.TrainerName}\t{poke.Trainer.ID}\t{poke.ID}\t{toSend.EncryptionConstant:X8}");
         Log($"Found Link Trade partner: {tradePartner.TrainerName}-{tradePartner.TID7} (ID: {trainerNID}");
 
         var partnerCheck = await CheckPartnerReputation(this, poke, trainerNID, tradePartner.TrainerName, AbuseSettings, token);

SysBot.Pokemon/LA/BotTrade/PokeTradeBotLA.cs

@@ -272,7 +272,7 @@ private async Task<PokeTradeResult> PerformLinkCodeTrade(SAV8LA sav, PokeTradeDe
 
         var tradePartner = await GetTradePartnerInfo(token).ConfigureAwait(false);
         var trainerNID = await GetTradePartnerNID(TradePartnerNIDOffset, token).ConfigureAwait(false);
-        RecordUtil<PokeTradeBotSWSH>.Record($"Initiating\t{trainerNID:X16}\t{tradePartner.TrainerName}\t{poke.Trainer.TrainerName}\t{poke.Trainer.ID}\t{poke.ID}\t{toSend.EncryptionConstant:X8}");
+        RecordUtil<PokeTradeBotLA>.Record($"Initiating\t{trainerNID:X16}\t{tradePartner.TrainerName}\t{poke.Trainer.TrainerName}\t{poke.Trainer.ID}\t{poke.ID}\t{toSend.EncryptionConstant:X8}");
         Log($"Found Link Trade partner: {tradePartner.TrainerName}-{tradePartner.TID7} (ID: {trainerNID})");
 
         var partnerCheck = await CheckPartnerReputation(this, poke, trainerNID, tradePartner.TrainerName, AbuseSettings, token);

SysBot.Pokemon/SV/BotTrade/PokeTradeBotSV.cs

@@ -326,7 +326,7 @@ private async Task<PokeTradeResult> PerformLinkCodeTrade(SAV9SV sav, PokeTradeDe
 
         var tradePartner = await GetTradePartnerInfo(token).ConfigureAwait(false);
         var trainerNID = await GetTradePartnerNID(TradePartnerNIDOffset, token).ConfigureAwait(false);
-        RecordUtil<PokeTradeBotSWSH>.Record($"Initiating\t{trainerNID:X16}\t{tradePartner.TrainerName}\t{poke.Trainer.TrainerName}\t{poke.Trainer.ID}\t{poke.ID}\t{toSend.EncryptionConstant:X8}");
+        RecordUtil<PokeTradeBotSV>.Record($"Initiating\t{trainerNID:X16}\t{tradePartner.TrainerName}\t{poke.Trainer.TrainerName}\t{poke.Trainer.ID}\t{poke.ID}\t{toSend.EncryptionConstant:X8}");
         Log($"Found Link Trade partner: {tradePartner.TrainerName}-{tradePartner.TID7} (ID: {trainerNID})");
 
         var partnerCheck = await CheckPartnerReputation(this, poke, trainerNID, tradePartner.TrainerName, AbuseSettings, token);