Upped version to 4.2.12

CHANGELOG.md

@@ -2,7 +2,19 @@
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
-## [4.2.10] - 29.06.202
+## [4.2.12] - 30.06.2022
+
+### Fixed
+
+- Fixed `.trivia --pokemon` showing incorrect pokemons
+
+## [4.2.11] - 29.06.2022
+
+### Fixed
+
+- Fixed `.draw` command 
+
+## [4.2.10] - 29.06.2022
 
 - Fixed currency generation working only once
 

src/NadekoBot.Generators/Command/CommandAttributesGenerator.cs

@@ -64,7 +64,9 @@ public class CmdAttribute : System.Attribute
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
 // #if DEBUG
-//         SpinWait.SpinUntil(() => Debugger.IsAttached);
+//         if (!Debugger.IsAttached)
+//             Debugger.Launch();
+//         // SpinWait.SpinUntil(() => Debugger.IsAttached);
 // #endif
         context.RegisterPostInitializationOutput(static ctx => ctx.AddSource(
             "CmdAttribute.g.cs",
@@ -157,7 +159,9 @@ public class CmdAttribute : System.Attribute
             .Distinct();
         
         var methodModels = methods
-            .Select(x => MethodDeclarationToMethodModel(compilation, x!));
+            .Select(x => MethodDeclarationToMethodModel(compilation, x!))
+            .Where(static x => x is not null)
+            .Cast<MethodModel>();
 
         var groups = methodModels
             .GroupBy(static x => $"{x.Namespace}.{string.Join(".", x.Classes)}");
@@ -177,7 +181,7 @@ public class CmdAttribute : System.Attribute
             var model = new FileModel(
                 methods: elems,
                 ns: elems[0].Namespace,
-                classHierarchy: elems[0].Classes
+                classHierarchy: elems![0].Classes
             );
             
             models.Add(model);
@@ -187,11 +191,21 @@ public class CmdAttribute : System.Attribute
         return models;
     }
 
-    private static MethodModel MethodDeclarationToMethodModel(Compilation comp, MethodDeclarationSyntax decl)
+    private static MethodModel? MethodDeclarationToMethodModel(Compilation comp, MethodDeclarationSyntax decl)
     {
         // SpinWait.SpinUntil(static () => Debugger.IsAttached);
 
-        var semanticModel = comp.GetSemanticModel(decl.SyntaxTree);
+        SemanticModel semanticModel;
+        try
+        {
+            semanticModel = comp.GetSemanticModel(decl.SyntaxTree);
+        }
+        catch
+        {
+            // for some reason this method can throw "Not part of this compilation" argument exception
+            return null;
+        }
+
         var methodModel = new MethodModel(
             @params: decl.ParameterList.Parameters
                 .Where(p => p.Type is not null)

src/NadekoBot/Modules/Gambling/Draw/DrawCommands.cs

@@ -44,7 +44,7 @@ public partial class Gambling
                 var currentCard = cards.Draw();
                 cardObjects.Add(currentCard);
                 var cardName = currentCard.ToString().ToLowerInvariant().Replace(' ', '_');
-                images.Add(Image.Load(await File.ReadAllBytesAsync($"data/images/cards/{cardName}.png")));
+                images.Add(Image.Load(await File.ReadAllBytesAsync($"data/images/cards/{cardName}.jpg")));
             }
 
             using var img = images.Merge();

src/NadekoBot/Modules/Games/Trivia/TriviaQuestionPool.cs

@@ -19,14 +19,14 @@ public class TriviaQuestionPool
         {
             var pokes = await _cache.GetPokemonMapAsync();
 
-            if (pokes is null or { Length: 0 })
+            if (pokes is null or { Count: 0 })
                 return default;
             
             var num = _rng.Next(1, _maxPokemonId + 1);
             return new(new()
             {
                 Question = "Who's That Pokémon?",
-                Answer = pokes[num].Name.ToTitleCase(),
+                Answer = pokes[num].ToTitleCase(),
                 Category = "Pokemon",
                 ImageUrl = $@"https://nadeko.bot/images/pokemon/shadows/{num}.png",
                 AnswerImageUrl = $@"https://nadeko.bot/images/pokemon/real/{num}.png"

src/NadekoBot/Services/ILocalDataCache.cs

@@ -9,5 +9,5 @@ public interface ILocalDataCache
     Task<IReadOnlyDictionary<string, SearchPokemon>> GetPokemonsAsync();
     Task<IReadOnlyDictionary<string, SearchPokemonAbility>> GetPokemonAbilitiesAsync();
     Task<TriviaQuestionModel[]> GetTriviaQuestionsAsync();
-    Task<PokemonNameId[]> GetPokemonMapAsync();
+    Task<IReadOnlyDictionary<int, string>> GetPokemonMapAsync();
 }

src/NadekoBot/Services/Impl/LocalDataCache.cs

@@ -67,11 +67,37 @@ public sealed class LocalDataCache : ILocalDataCache, INService
         => await GetOrCreateCachedDataAsync(_pokemonAbilitiesKey, POKEMON_ABILITIES_FILE);
 
 
-    private static TypedKey<PokemonNameId[]> _pokeMapKey
-        = new("pokemon:ab_map");
+    private static TypedKey<IReadOnlyDictionary<int, string>> _pokeMapKey
+        = new("pokemon:ab_map2"); // 2 because ab_map was storing arrays
 
-    public async Task<PokemonNameId[]?> GetPokemonMapAsync()
-        => await GetOrCreateCachedDataAsync(_pokeMapKey, POKEMON_MAP_PATH);
+    public async Task<IReadOnlyDictionary<int, string>?> GetPokemonMapAsync()
+        => await _cache.GetOrAddAsync(_pokeMapKey,
+            async () =>
+            {
+                var fileName = POKEMON_MAP_PATH;
+                if (!File.Exists(fileName))
+                {
+                    Log.Warning($"{fileName} is missing. Relevant data can't be loaded");
+                    return default;
+                }
+
+                try
+                {
+                    await using var stream = File.OpenRead(fileName);
+                    var arr = await JsonSerializer.DeserializeAsync<PokemonNameId[]>(stream, _opts);
+
+                    return (IReadOnlyDictionary<int, string>?)arr?.ToDictionary(x => x.Id, x => x.Name);
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex,
+                        "Error reading {FileName} file: {ErrorMessage}",
+                        fileName,
+                        ex.Message);
+
+                    return default;
+                }
+            });
 
 
     private static TypedKey<TriviaQuestionModel[]> _triviaKey

src/NadekoBot/Services/Impl/StatsService.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Services;
 
 public sealed class StatsService : IStatsService, IReadyExecutor, INService
 {
-    public const string BOT_VERSION = "4.2.10";
+    public const string BOT_VERSION = "4.2.12";
 
     public string Author
         => "Kwoth#2452";